httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-1.3/src/modules/standard mod_actions.c mod_alias.c mod_dir.c mod_include.c mod_negotiation.c mod_rewrite.c
Date Fri, 01 Jan 1999 17:18:03 GMT
rse         99/01/01 09:18:03

  Modified:    src      CHANGES
               src/include ap_mmn.h httpd.h
               src/main http_request.c util.c util_script.c
               src/modules/standard mod_actions.c mod_alias.c mod_dir.c
                        mod_include.c mod_negotiation.c mod_rewrite.c
  Log:
  Renamed the API macro escape_uri() to ap_escape_uri() which was
  forgotten (because it was a macro) in the symbol renaming process.
  
  Revision  Changes    Path
  1.1186    +4 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1185
  retrieving revision 1.1186
  diff -u -r1.1185 -r1.1186
  --- CHANGES	1999/01/01 17:03:09	1.1185
  +++ CHANGES	1999/01/01 17:17:54	1.1186
  @@ -1,4 +1,8 @@
   Changes with Apache 1.3.4
  + 
  +  *) Renamed the macro escape_uri() to ap_escape_uri() which was
  +     forgotten (because it was a macro) in the symbol renaming process.
  +     [Ralf S. Engelschall]
   
     *) Fix some inconsistencies related to the scopes of directives. The only
        user visible change is that the directives `UseCanonicalName' and
  
  
  
  1.15      +2 -1      apache-1.3/src/include/ap_mmn.h
  
  Index: ap_mmn.h
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/include/ap_mmn.h,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ap_mmn.h	1998/12/29 09:46:15	1.14
  +++ ap_mmn.h	1999/01/01 17:17:57	1.15
  @@ -192,10 +192,11 @@
    *                                    -- added ap_single_module_init()
    * 19981229             - mod_negotiation overhaul -- added ap_make_etag()
    *                        and added vlist_validator to request_rec.
  + * 19990101             - renamed macro escape_uri() to ap_escape_uri()
    */
   
   #ifndef MODULE_MAGIC_NUMBER_MAJOR
  -#define MODULE_MAGIC_NUMBER_MAJOR 19981229
  +#define MODULE_MAGIC_NUMBER_MAJOR 19990101
   #endif
   #define MODULE_MAGIC_NUMBER_MINOR 0                     /* 0...n */
   #define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR	/* backward compat */
  
  
  
  1.255     +1 -1      apache-1.3/src/include/httpd.h
  
  Index: httpd.h
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v
  retrieving revision 1.254
  retrieving revision 1.255
  diff -u -r1.254 -r1.255
  --- httpd.h	1998/12/29 09:46:15	1.254
  +++ httpd.h	1999/01/01 17:17:57	1.255
  @@ -943,7 +943,7 @@
   API_EXPORT(void) ap_getparents(char *name);
   API_EXPORT(char *) ap_escape_path_segment(pool *p, const char *s);
   API_EXPORT(char *) ap_os_escape_path(pool *p, const char *path, int partial);
  -#define escape_uri(ppool,path) ap_os_escape_path(ppool,path,1)
  +#define ap_escape_uri(ppool,path) ap_os_escape_path(ppool,path,1)
   API_EXPORT(char *) ap_escape_html(pool *p, const char *s);
   API_EXPORT(char *) ap_construct_server(pool *p, const char *hostname,
   				    unsigned port, const request_rec *r);
  
  
  
  1.139     +1 -1      apache-1.3/src/main/http_request.c
  
  Index: http_request.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/http_request.c,v
  retrieving revision 1.138
  retrieving revision 1.139
  diff -u -r1.138 -r1.139
  --- http_request.c	1998/12/29 09:46:17	1.138
  +++ http_request.c	1999/01/01 17:17:58	1.139
  @@ -717,7 +717,7 @@
           ap_parse_uri(rnew, new_file);
       else {
           udir = ap_make_dirstr_parent(rnew->pool, r->uri);
  -        udir = escape_uri(rnew->pool, udir);    /* re-escape it */
  +        udir = ap_escape_uri(rnew->pool, udir);    /* re-escape it */
           ap_parse_uri(rnew, ap_make_full_path(rnew->pool, udir, new_file));
       }
   
  
  
  
  1.142     +1 -1      apache-1.3/src/main/util.c
  
  Index: util.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/util.c,v
  retrieving revision 1.141
  retrieving revision 1.142
  diff -u -r1.141 -r1.142
  --- util.c	1998/12/02 00:00:07	1.141
  +++ util.c	1999/01/01 17:17:58	1.142
  @@ -1253,7 +1253,7 @@
       return copy;
   }
   
  -/* escape_uri is now a macro for os_escape_path */
  +/* ap_escape_uri is now a macro for os_escape_path */
   
   API_EXPORT(char *) ap_escape_html(pool *p, const char *s)
   {
  
  
  
  1.136     +1 -1      apache-1.3/src/main/util_script.c
  
  Index: util_script.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/util_script.c,v
  retrieving revision 1.135
  retrieving revision 1.136
  diff -u -r1.135 -r1.136
  --- util_script.c	1998/11/01 08:45:29	1.135
  +++ util_script.c	1999/01/01 17:17:59	1.136
  @@ -396,7 +396,7 @@
   	 */
   	request_rec *pa_req;
   
  -	pa_req = ap_sub_req_lookup_uri(escape_uri(r->pool, r->path_info), r);
  +	pa_req = ap_sub_req_lookup_uri(ap_escape_uri(r->pool, r->path_info), r);
   
   	if (pa_req->filename) {
   #ifdef WIN32
  
  
  
  1.30      +1 -1      apache-1.3/src/modules/standard/mod_actions.c
  
  Index: mod_actions.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_actions.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- mod_actions.c	1998/11/08 09:51:12	1.29
  +++ mod_actions.c	1999/01/01 17:18:00	1.30
  @@ -197,7 +197,7 @@
       if (script == NULL)
   	return DECLINED;
   
  -    ap_internal_redirect_handler(ap_pstrcat(r->pool, script, escape_uri(r->pool,
  +    ap_internal_redirect_handler(ap_pstrcat(r->pool, script, ap_escape_uri(r->pool,
   			  r->uri), r->args ? "?" : NULL, r->args, NULL), r);
       return OK;
   }
  
  
  
  1.39      +1 -1      apache-1.3/src/modules/standard/mod_alias.c
  
  Index: mod_alias.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_alias.c,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- mod_alias.c	1998/08/25 09:15:36	1.38
  +++ mod_alias.c	1999/01/01 17:18:00	1.39
  @@ -305,7 +305,7 @@
   		    found = ap_pregsub(r->pool, p->real, r->uri,
   				    p->regexp->re_nsub + 1, regm);
   		    if (found && doesc) {
  -			found = escape_uri(r->pool, found);
  +			found = ap_escape_uri(r->pool, found);
   		    }
   		}
   		else {
  
  
  
  1.52      +3 -3      apache-1.3/src/modules/standard/mod_dir.c
  
  Index: mod_dir.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_dir.c,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- mod_dir.c	1998/08/25 09:15:37	1.51
  +++ mod_dir.c	1999/01/01 17:18:00	1.52
  @@ -127,10 +127,10 @@
       if (r->uri[0] == '\0' || r->uri[strlen(r->uri) - 1] != '/') {
           char *ifile;
           if (r->args != NULL)
  -            ifile = ap_pstrcat(r->pool, escape_uri(r->pool, r->uri),
  +            ifile = ap_pstrcat(r->pool, ap_escape_uri(r->pool, r->uri),
                               "/", "?", r->args, NULL);
           else
  -            ifile = ap_pstrcat(r->pool, escape_uri(r->pool, r->uri),
  +            ifile = ap_pstrcat(r->pool, ap_escape_uri(r->pool, r->uri),
                               "/", NULL);
   
           ap_table_setn(r->headers_out, "Location",
  @@ -162,7 +162,7 @@
           request_rec *rr = ap_sub_req_lookup_uri(name_ptr, r);
   
           if (rr->status == HTTP_OK && rr->finfo.st_mode != 0) {
  -            char *new_uri = escape_uri(r->pool, rr->uri);
  +            char *new_uri = ap_escape_uri(r->pool, rr->uri);
   
               if (rr->args != NULL)
                   new_uri = ap_pstrcat(r->pool, new_uri, "?", rr->args, NULL);
  
  
  
  1.109     +1 -1      apache-1.3/src/modules/standard/mod_include.c
  
  Index: mod_include.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_include.c,v
  retrieving revision 1.108
  retrieving revision 1.109
  diff -u -r1.108 -r1.109
  --- mod_include.c	1998/12/02 00:00:15	1.108
  +++ mod_include.c	1999/01/01 17:18:00	1.109
  @@ -796,7 +796,7 @@
   
           ap_table_setn(env, "PATH_INFO", ap_escape_shell_cmd(r->pool, r->path_info));
   
  -        pa_req = ap_sub_req_lookup_uri(escape_uri(r->pool, r->path_info), r);
  +        pa_req = ap_sub_req_lookup_uri(ap_escape_uri(r->pool, r->path_info), r);
           if (pa_req->filename) {
               ap_table_setn(env, "PATH_TRANSLATED",
                         ap_pstrcat(r->pool, pa_req->filename, pa_req->path_info,
  
  
  
  1.90      +1 -1      apache-1.3/src/modules/standard/mod_negotiation.c
  
  Index: mod_negotiation.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_negotiation.c,v
  retrieving revision 1.89
  retrieving revision 1.90
  diff -u -r1.89 -r1.90
  --- mod_negotiation.c	1998/12/29 18:28:10	1.89
  +++ mod_negotiation.c	1999/01/01 17:18:01	1.90
  @@ -2606,7 +2606,7 @@
           r->uri[ap_find_path_info(r->uri, r->path_info)] = '\0';
       }
       udir = ap_make_dirstr_parent(r->pool, r->uri);
  -    udir = escape_uri(r->pool, udir);
  +    udir = ap_escape_uri(r->pool, udir);
       ap_internal_redirect(ap_pstrcat(r->pool, udir, best->file_name,
                                       r->path_info, NULL), r);
       return OK;
  
  
  
  1.133     +2 -2      apache-1.3/src/modules/standard/mod_rewrite.c
  
  Index: mod_rewrite.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v
  retrieving revision 1.132
  retrieving revision 1.133
  diff -u -r1.132 -r1.133
  --- mod_rewrite.c	1998/12/02 08:24:39	1.132
  +++ mod_rewrite.c	1999/01/01 17:18:01	1.133
  @@ -1145,7 +1145,7 @@
                   ;
               if (*cp != '\0') {
                   rewritelog(r, 1, "escaping %s for redirect", r->filename);
  -                cp2 = escape_uri(r->pool, cp);
  +                cp2 = ap_escape_uri(r->pool, cp);
                   *cp = '\0';
                   r->filename = ap_pstrcat(r->pool, r->filename, cp2, NULL);
               }
  @@ -1434,7 +1434,7 @@
               if (*cp != '\0') {
                   rewritelog(r, 1, "[per-dir %s] escaping %s for redirect",
                              dconf->directory, r->filename);
  -                cp2 = escape_uri(r->pool, cp);
  +                cp2 = ap_escape_uri(r->pool, cp);
                   *cp = '\0';
                   r->filename = ap_pstrcat(r->pool, r->filename, cp2, NULL);
               }
  
  
  

Mime
View raw message