* srv.h: Move to include/srv.h.

* http.c (send_request): Pass in srvtag...  (http_open): ...from here.
This commit is contained in:
David Shaw 2009-04-06 03:18:07 +00:00
parent 9b6deeddaf
commit 2933e3d094
4 changed files with 17 additions and 4 deletions

View File

@ -1,3 +1,7 @@
2009-04-05 David Shaw <dshaw@jabberwocky.com>
* srv.h: Move from util/srv.h.
2009-04-02 David Shaw <dshaw@jabberwocky.com>
* http.h: Allow passing srvtag to http_open and

View File

@ -1,3 +1,10 @@
2009-04-05 David Shaw <dshaw@jabberwocky.com>
* srv.h: Move to include/srv.h.
* http.c (send_request): Pass in srvtag...
(http_open): ...from here.
2009-04-02 David Shaw <dshaw@jabberwocky.com>
* http.c (connect_server): free (rather than xfree) the result of

View File

@ -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)
{