diff options
| -rw-r--r-- | include/ChangeLog | 4 | ||||
| -rw-r--r-- | include/srv.h (renamed from util/srv.h) | 0 | ||||
| -rw-r--r-- | util/ChangeLog | 7 | ||||
| -rw-r--r-- | util/http.c | 10 |
4 files changed, 17 insertions, 4 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 1d149b448..bb16d383f 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,7 @@ +2009-04-05 David Shaw <[email protected]> + + * srv.h: Move from util/srv.h. + 2009-04-02 David Shaw <[email protected]> * http.h: Allow passing srvtag to http_open and diff --git a/util/srv.h b/include/srv.h index fdd568a5f..fdd568a5f 100644 --- a/util/srv.h +++ b/include/srv.h diff --git a/util/ChangeLog b/util/ChangeLog index 7f675b508..f44e45977 100644 --- a/util/ChangeLog +++ b/util/ChangeLog @@ -1,3 +1,10 @@ +2009-04-05 David Shaw <[email protected]> + + * srv.h: Move to include/srv.h. + + * http.c (send_request): Pass in srvtag... + (http_open): ...from here. + 2009-04-02 David Shaw <[email protected]> * http.c (connect_server): free (rather than xfree) the result of diff --git a/util/http.c b/util/http.c index 3fcce9278..5e025b658 100644 --- a/util/http.c +++ b/util/http.c @@ -68,7 +68,8 @@ static int remove_escapes( byte *string ); static int insert_escapes( byte *buffer, const byte *string, const byte *special ); static URI_TUPLE parse_tuple( byte *string ); -static int send_request( HTTP_HD hd, const char *auth, const char *proxy ); +static int send_request( HTTP_HD hd, const char *auth, const char *proxy, + const char *srvtag); static byte *build_rel_path( PARSED_URI uri ); static int parse_response( HTTP_HD hd ); @@ -165,7 +166,7 @@ http_open( HTTP_HD hd, HTTP_REQ_TYPE reqtype, const char *url, rc = parse_uri( &hd->uri, url ); if( !rc ) { - rc = send_request( hd, auth, proxy ); + rc = send_request( hd, auth, proxy, srvtag ); if( !rc ) { hd->fp_write = iobuf_sockopen( hd->sock , "w" ); if( hd->fp_write ) @@ -519,7 +520,8 @@ parse_tuple( byte *string ) * Returns 0 if the request was successful */ static int -send_request( HTTP_HD hd, const char *auth, const char *proxy ) +send_request( HTTP_HD hd, const char *auth, const char *proxy, + const char *srvtag ) { const byte *server; byte *request, *p; @@ -556,7 +558,7 @@ send_request( HTTP_HD hd, const char *auth, const char *proxy ) release_parsed_uri( uri ); } else - hd->sock = connect_server( server, port, hd->flags, hd->uri->scheme ); + hd->sock = connect_server( server, port, hd->flags, srvtag ); if(auth || hd->uri->auth) { |