httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@apache.org
Subject cvs commit: httpd-2.0/server protocol.c scoreboard.c
Date Sun, 19 Aug 2001 16:01:05 GMT
dougm       01/08/19 09:01:05

  Modified:    include  httpd.h
               modules/aaa mod_auth_digest.c
               modules/dav/main util.c
               modules/loggers mod_log_config.c
               modules/mappers mod_alias.c
               modules/test mod_test_util_uri.c
               server   protocol.c scoreboard.c
  Log:
  adjust to apr_uri_ rename
  
  Revision  Changes    Path
  1.161     +1 -1      httpd-2.0/include/httpd.h
  
  Index: httpd.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/httpd.h,v
  retrieving revision 1.160
  retrieving revision 1.161
  diff -u -r1.160 -r1.161
  --- httpd.h	2001/08/16 18:07:06	1.160
  +++ httpd.h	2001/08/19 16:01:01	1.161
  @@ -793,7 +793,7 @@
       /** ST_MODE set to zero if no such file */
       apr_finfo_t finfo;
       /** components of uri, dismantled */
  -    apr_uri_components parsed_uri;
  +    apr_uri_t parsed_uri;
   
       /* Various other config info which may change with .htaccess files
        * These are config vectors, with one void* pointer for each module
  
  
  
  1.51      +5 -5      httpd-2.0/modules/aaa/mod_auth_digest.c
  
  Index: mod_auth_digest.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_auth_digest.c,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- mod_auth_digest.c	2001/08/15 21:11:57	1.50
  +++ mod_auth_digest.c	2001/08/19 16:01:03	1.51
  @@ -236,7 +236,7 @@
       apr_time_t             nonce_time;
       enum hdr_sts          auth_hdr_sts;
       const char           *raw_request_uri;
  -    apr_uri_components    *psd_request_uri;
  +    apr_uri_t    *psd_request_uri;
       int                   needed_auth;
       client_entry         *client;
   } digest_header_rec;
  @@ -1514,8 +1514,8 @@
   }
   
   
  -static void copy_uri_components(apr_uri_components *dst, 
  -                                apr_uri_components *src, request_rec *r) {
  +static void copy_uri_components(apr_uri_t *dst, 
  +                                apr_uri_t *src, request_rec *r) {
       if (src->scheme && src->scheme[0] != '\0')
   	dst->scheme = src->scheme;
       else
  @@ -1624,10 +1624,10 @@
   	/* Hmm, the simple match didn't work (probably a proxy modified the
   	 * request-uri), so lets do a more sophisticated match
   	 */
  -	apr_uri_components r_uri, d_uri;
  +	apr_uri_t r_uri, d_uri;
   
   	copy_uri_components(&r_uri, resp->psd_request_uri, r);
  -	if (apr_uri_parse_components(r->pool, resp->uri, &d_uri) != APR_SUCCESS) {
  +	if (apr_uri_parse(r->pool, resp->uri, &d_uri) != APR_SUCCESS) {
   	    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
   			  "Digest: invalid uri <%s> in Authorization header",
   			  resp->uri);
  
  
  
  1.33      +5 -5      httpd-2.0/modules/dav/main/util.c
  
  Index: util.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/dav/main/util.c,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- util.c	2001/08/19 15:52:58	1.32
  +++ util.c	2001/08/19 16:01:04	1.33
  @@ -189,12 +189,12 @@
       dav_lookup_result result = { 0 };
       const char *scheme;
       apr_port_t port;
  -    apr_uri_components comp;
  +    apr_uri_t comp;
       char *new_file;
       const char *domain;
   
       /* first thing to do is parse the URI into various components */
  -    if (apr_uri_parse_components(r->pool, uri, &comp) != APR_SUCCESS) {
  +    if (apr_uri_parse(r->pool, uri, &comp) != APR_SUCCESS) {
   	result.err.status = HTTP_BAD_REQUEST;
   	result.err.desc = "Invalid syntax in Destination URI.";
   	return result;
  @@ -288,7 +288,7 @@
          the current request. Therefore, we can use ap_sub_req_lookup_uri() */
   
       /* reconstruct a URI as just the path */
  -    new_file = apr_uri_unparse_components(r->pool, &comp, APR_URI_UNP_OMITSITEPART);
  +    new_file = apr_uri_unparse(r->pool, &comp, APR_URI_UNP_OMITSITEPART);
   
       /*
        * Lookup the URI and return the sub-request. Note that we use the
  @@ -542,7 +542,7 @@
       const char *uri = NULL;	/* scope of current production; NULL=no-tag */
       size_t uri_len = 0;
       dav_if_header *ih = NULL;
  -    apr_uri_components parsed_uri;
  +    apr_uri_t parsed_uri;
       const dav_hooks_locks *locks_hooks = DAV_GET_HOOKS_LOCKS(r);
       enum {no_tagged, tagged, unknown} list_type = unknown;
       int condition;
  @@ -566,7 +566,7 @@
               
               /* 2518 specifies this must be an absolute URI; just take the
                * relative part for later comparison against r->uri */
  -            if (apr_uri_parse_components(r->pool, uri, &parsed_uri) != APR_SUCCESS)
{
  +            if (apr_uri_parse(r->pool, uri, &parsed_uri) != APR_SUCCESS) {
                   return dav_new_error(r->pool, HTTP_BAD_REQUEST,
                                        DAV_ERR_IF_TAGGED,
                                        "Invalid URI in tagged If-header.");
  
  
  
  1.66      +1 -1      httpd-2.0/modules/loggers/mod_log_config.c
  
  Index: mod_log_config.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/loggers/mod_log_config.c,v
  retrieving revision 1.65
  retrieving revision 1.66
  diff -u -r1.65 -r1.66
  --- mod_log_config.c	2001/07/26 18:40:27	1.65
  +++ mod_log_config.c	2001/08/19 16:01:04	1.66
  @@ -344,7 +344,7 @@
   	     * (note also that r->the_request contains the unmodified request)
   	     */
       return (r->parsed_uri.password) ? apr_pstrcat(r->pool, r->method, " ",
  -					 apr_uri_unparse_components(r->pool, &r->parsed_uri, 0),
  +					 apr_uri_unparse(r->pool, &r->parsed_uri, 0),
   					 r->assbackwards ? NULL : " ", r->protocol, NULL)
   					: r->the_request;
   }
  
  
  
  1.30      +2 -2      httpd-2.0/modules/mappers/mod_alias.c
  
  Index: mod_alias.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_alias.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- mod_alias.c	2001/05/22 01:31:08	1.29
  +++ mod_alias.c	2001/08/19 16:01:04	1.30
  @@ -335,8 +335,8 @@
   		    found = ap_pregsub(r->pool, p->real, r->uri,
   				    p->regexp->re_nsub + 1, regm);
   		    if (found && doesc) {
  -                        apr_uri_components uri;
  -                        apr_uri_parse_components(r->pool, found, &uri);
  +                        apr_uri_t uri;
  +                        apr_uri_parse(r->pool, found, &uri);
   			found = ap_escape_uri(r->pool, uri.path);
                           if (uri.query) {
                               found = apr_pstrcat(r->pool, found, "?", uri.query, NULL);
  
  
  
  1.14      +2 -2      httpd-2.0/modules/test/mod_test_util_uri.c
  
  Index: mod_test_util_uri.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/test/mod_test_util_uri.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- mod_test_util_uri.c	2001/08/15 21:11:58	1.13
  +++ mod_test_util_uri.c	2001/08/19 16:01:05	1.14
  @@ -142,7 +142,7 @@
       apr_pool_t *sub;
       char *input_uri;
       char *strp;
  -    apr_uri_components result;
  +    apr_uri_t result;
       unsigned expect;
       int status;
       unsigned failures;
  @@ -208,7 +208,7 @@
   	*strp = 0;
   
   	apr_pool_sub_make(&sub, r->pool, NULL);
  -	status = apr_uri_parse_components(sub, input_uri, &result);
  +	status = apr_uri_parse(sub, input_uri, &result);
   	if (status == APR_SUCCESS) {
   #define CHECK(f)							\
   	    if ((expect & T_##f)					\
  
  
  
  1.41      +2 -2      httpd-2.0/server/protocol.c
  
  Index: protocol.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/protocol.c,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- protocol.c	2001/08/16 14:05:00	1.40
  +++ protocol.c	2001/08/19 16:01:05	1.41
  @@ -325,11 +325,11 @@
       r->unparsed_uri = apr_pstrdup(r->pool, uri);
   
       if (r->method_number == M_CONNECT) {
  -	status = apr_uri_parse_hostinfo_components(r->pool, uri, &r->parsed_uri);
  +	status = apr_uri_parse_hostinfo(r->pool, uri, &r->parsed_uri);
       }
       else {
   	/* Simple syntax Errors in URLs are trapped by parse_uri_components(). */
  -	status = apr_uri_parse_components(r->pool, uri, &r->parsed_uri);
  +	status = apr_uri_parse(r->pool, uri, &r->parsed_uri);
       }
   
       if (status == APR_SUCCESS) {
  
  
  
  1.35      +1 -1      httpd-2.0/server/scoreboard.c
  
  Index: scoreboard.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/scoreboard.c,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- scoreboard.c	2001/08/19 15:52:59	1.34
  +++ scoreboard.c	2001/08/19 16:01:05	1.35
  @@ -321,7 +321,7 @@
   	    } else {
   		/* Don't reveal the password in the server-status view */
   		    apr_cpystrn(ws->request, apr_pstrcat(r->pool, r->method, " ",
  -					       apr_uri_unparse_components(r->pool, &r->parsed_uri, APR_URI_UNP_OMITPASSWORD),
  +					       apr_uri_unparse(r->pool, &r->parsed_uri, APR_URI_UNP_OMITPASSWORD),
   					       r->assbackwards ? NULL : " ", r->protocol, NULL),
   				       sizeof(ws->request));
   	    }
  
  
  

Mime
View raw message