httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/server core.c
Date Thu, 23 Aug 2001 22:19:49 GMT
wrowe       01/08/23 15:19:49

  Modified:    server   core.c
  Log:
    Fix my typo (I invented the silly constant, you would expect me to recall it.)
  
  Revision  Changes    Path
  1.41      +6 -6      httpd-2.0/server/core.c
  
  Index: core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/core.c,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- core.c	2001/08/23 22:17:19	1.40
  +++ core.c	2001/08/23 22:19:49	1.41
  @@ -2911,10 +2911,10 @@
   	&& (r->server->path[r->server->pathlen - 1] == '/'
   	    || r->uri[r->server->pathlen] == '/'
   	    || r->uri[r->server->pathlen] == '\0')) {
  -        if (apr_filepath_merge(r->filename, conf->ap_document_root,
  +        if (apr_filepath_merge(&r->filename, conf->ap_document_root,
   			       r->uri + r->server->pathlen, 
                                  APR_FILEPATH_TRUENAME 
  -                             | APR_SECUREROOT_TEST, r->pool)
  +                             | APR_FILEPATH_SECUREROOT, r->pool)
                       != APR_SUCCESS) {
               return HTTP_FORBIDDEN;
           }
  @@ -2926,10 +2926,10 @@
            * /'s in a row.  This happens under windows when the document
            * root ends with a /
            */
  -        if (apr_filepath_merge(r->filename, conf->ap_document_root,
  -                               r->uri + (*(r->uri) == '/') ? 1 : 0, 
  -                               APR_FILEPATH_TRUENAME 
  -                             | APR_SECUREROOT_TEST, r->pool)
  +        if (apr_filepath_merge(&r->filename, conf->ap_document_root,
  +                               r->uri + ((*(r->uri) == '/') ? 1 : 0),
  +                               APR_FILEPATH_TRUENAME
  +                             | APR_FILEPATH_SECUREROOT, r->pool)
                       != APR_SUCCESS) {
               return HTTP_FORBIDDEN;
           }
  
  
  

Mime
View raw message