diff options
Diffstat (limited to 'util')
-rw-r--r-- | util/ChangeLog | 9 | ||||
-rw-r--r-- | util/http.c | 6 |
2 files changed, 12 insertions, 3 deletions
diff --git a/util/ChangeLog b/util/ChangeLog index 63d932d77..5e69e7cb4 100644 --- a/util/ChangeLog +++ b/util/ChangeLog @@ -1,5 +1,14 @@ +2001-04-23 Werner Koch <[email protected]> + + * http.c (http_wait_response): Implement new flag to inhibit the + TCP shutdown. + 2001-04-20 Werner Koch <[email protected]> + * http.c (http_start_data): Use write_server and not the iobuf + stuff. I wonder why we are at all using write_server - shouldn't + it be handled by iobuf? + * strgutil.c (set_native_charset): Allow utf-8 by introducing the new no_translation variable. (native_to_utf8): Handle no_translation. diff --git a/util/http.c b/util/http.c index e61f20972..7cb782c04 100644 --- a/util/http.c +++ b/util/http.c @@ -150,8 +150,7 @@ void http_start_data( HTTP_HD hd ) { if( !hd->in_data ) { - iobuf_put( hd->fp_write, '\r' ); - iobuf_put( hd->fp_write, '\n' ); + write_server (hd->sock, "\r\n", 2); hd->in_data = 1; } } @@ -173,7 +172,8 @@ http_wait_response( HTTP_HD hd, unsigned int *ret_status ) iobuf_ioctl (hd->fp_write, 1, 1, NULL); /* keep the socket open */ iobuf_close (hd->fp_write); hd->fp_write = NULL; - shutdown( hd->sock, 1 ); + if ( !(hd->flags & HTTP_FLAG_NO_SHUTDOWN) ) + shutdown( hd->sock, 1 ); hd->in_data = 0; hd->fp_read = iobuf_sockopen( hd->sock , "r" ); |