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/include http_request.h
Date Wed, 27 Jun 2001 20:57:15 GMT
wrowe       01/06/27 13:57:15

  Modified:    server   request.c
               include  http_request.h
  Log:
    Here, finally are a few cleanups of my fat fingers.
  
  Revision  Changes    Path
  1.12      +4 -5      httpd-2.0/server/request.c
  
  Index: request.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/request.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- request.c	2001/06/27 20:53:36	1.11
  +++ request.c	2001/06/27 20:57:13	1.12
  @@ -954,10 +954,11 @@
       return ap_sub_req_method_uri("GET", new_file, r, next_filter);
   }
   
  -AP_DECLARE(request_rec *) ap_sub_req_lookup_dirent(apr_finfo_t *dirent,
  +AP_DECLARE(request_rec *) ap_sub_req_lookup_dirent(const apr_finfo_t *dirent,
                                                      const request_rec *r,
                                                      ap_filter_t *next_filter)
   {
  +    apr_status_t rv;
       request_rec *rnew;
       int res;
       char *fdir;
  @@ -982,13 +983,12 @@
        */
   
       udir = ap_make_dirstr_parent(rnew->pool, r->uri);
  -    apr_status_t rv;
   
       rnew->uri = ap_make_full_path(rnew->pool, udir, dirent->name);
       rnew->filename = ap_make_full_path(rnew->pool, fdir, dirent->name);
       ap_parse_uri(rnew, rnew->uri);    /* fill in parsed_uri values */
   
  -    if ((dirent->finfo & APR_FINFO_MIN) != APR_FINFO_MIN) {
  +    if ((dirent->valid & APR_FINFO_MIN) != APR_FINFO_MIN) {
           if (((rv = apr_stat(&rnew->finfo, rnew->filename,
                               APR_FINFO_MIN, rnew->pool)) != APR_SUCCESS)
                                                    && (rv != APR_INCOMPLETE)) {
  @@ -996,8 +996,7 @@
           }
       }
       else {
  -        r->finfo = apr_palloc(rnew->pool, sizeof(apr_finfo_t));
  -        memcpy (r->finfo, dirent);
  +        memcpy (&rnew->finfo, dirent, sizeof(apr_finfo_t));
       }
   
       if ((res = check_safe_file(rnew))) {
  
  
  
  1.30      +1 -1      httpd-2.0/include/http_request.h
  
  Index: http_request.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/http_request.h,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- http_request.h	2001/06/27 20:09:20	1.29
  +++ http_request.h	2001/06/27 20:57:14	1.30
  @@ -132,7 +132,7 @@
    * The file info passed must include the name, and must have the same relative
    * directory as the current request.
    */
  -AP_DECLARE(request_rec *) ap_sub_req_lookup_dirent(apr_finfo_t *finfo,
  +AP_DECLARE(request_rec *) ap_sub_req_lookup_dirent(const apr_finfo_t *finfo,
                                                 const request_rec *r,
                                                 ap_filter_t *next_filter);
   /**
  
  
  

Mime
View raw message