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/modules/proxy proxy_util.c
Date Wed, 31 Jan 2001 23:11:07 GMT
wrowe       01/01/31 15:11:07

  Modified:    modules/http http_request.c
               modules/mappers mod_rewrite.c mod_userdir.c
               modules/proxy proxy_util.c
  Log:
    Fix the remaining APR_FINFO_NORM occurances.  Again, followup is needed
    to actually test any field outside the scope of APR_FINFO_MIN.
  
  Revision  Changes    Path
  1.85      +1 -1      httpd-2.0/modules/http/http_request.c
  
  Index: http_request.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/http/http_request.c,v
  retrieving revision 1.84
  retrieving revision 1.85
  diff -u -r1.84 -r1.85
  --- http_request.c	2001/01/31 22:58:53	1.84
  +++ http_request.c	2001/01/31 23:10:56	1.85
  @@ -978,7 +978,7 @@
           ap_parse_uri(rnew, rnew->uri);    /* fill in parsed_uri values */
   
           if (((rv = apr_stat(&rnew->finfo, rnew->filename,
  -                           APR_FINFO_MIN, rnew->pool)) != APR_SUCCESS)
  +                            APR_FINFO_MIN, rnew->pool)) != APR_SUCCESS)
                                                    && (rv != APR_INCOMPLETE)) {
               rnew->finfo.filetype = 0;
           }
  
  
  
  1.65      +10 -10    httpd-2.0/modules/mappers/mod_rewrite.c
  
  Index: mod_rewrite.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_rewrite.c,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- mod_rewrite.c	2001/01/29 16:36:26	1.64
  +++ mod_rewrite.c	2001/01/31 23:11:00	1.65
  @@ -491,7 +491,7 @@
       newmap->fpout = NULL;
   
       if (newmap->checkfile && (sconf->state == ENGINE_ENABLED)
  -        && (apr_stat(&st, newmap->checkfile, APR_FINFO_NORM, 
  +        && (apr_stat(&st, newmap->checkfile, APR_FINFO_MIN, 
                        cmd->pool) != APR_SUCCESS)) {
           return apr_pstrcat(cmd->pool,
                             "RewriteMap: map file or program not found:",
  @@ -2114,14 +2114,14 @@
   
       rc = 0;
       if (strcmp(p->pattern, "-f") == 0) {
  -        if (apr_stat(&sb, input, APR_FINFO_NORM, r->pool) == APR_SUCCESS) {
  +        if (apr_stat(&sb, input, APR_FINFO_MIN, r->pool) == APR_SUCCESS) {
               if (sb.filetype == APR_REG) {
                   rc = 1;
               }
           }
       }
       else if (strcmp(p->pattern, "-s") == 0) {
  -        if (apr_stat(&sb, input, APR_FINFO_NORM, r->pool) == APR_SUCCESS) {
  +        if (apr_stat(&sb, input, APR_FINFO_MIN, r->pool) == APR_SUCCESS) {
               if ((sb.filetype == APR_REG) && sb.size > 0) {
                   rc = 1;
               }
  @@ -2129,7 +2129,7 @@
       }
       else if (strcmp(p->pattern, "-l") == 0) {
   #if !defined(OS2)
  -        if (apr_lstat(&sb, input, APR_FINFO_NORM, r->pool) == APR_SUCCESS) {
  +        if (apr_lstat(&sb, input, APR_FINFO_MIN, r->pool) == APR_SUCCESS) {
               if (sb.filetype == APR_LNK) {
                   rc = 1;
               }
  @@ -2137,7 +2137,7 @@
   #endif
       }
       else if (strcmp(p->pattern, "-d") == 0) {
  -        if (apr_stat(&sb, input, APR_FINFO_NORM, r->pool) == APR_SUCCESS) {
  +        if (apr_stat(&sb, input, APR_FINFO_MIN, r->pool) == APR_SUCCESS) {
               if (sb.filetype == APR_DIR) {
                   rc = 1;
               }
  @@ -2174,7 +2174,7 @@
               /* file exists for any result up to 2xx, no redirects */
               if (rsub->status < 300 &&
                   /* double-check that file exists since default result is 200 */
  -                apr_stat(&sb, rsub->filename, APR_FINFO_NORM, 
  +                apr_stat(&sb, rsub->filename, APR_FINFO_MIN, 
                            r->pool) == APR_SUCCESS) {
                   rc = 1;
               }
  @@ -2658,7 +2658,7 @@
           if (strcmp(s->name, name) == 0) {
               if (s->type == MAPTYPE_TXT) {
                   if ((rv = apr_stat(&st, s->checkfile, 
  -                                   APR_FINFO_NORM, r->pool)) != APR_SUCCESS) {
  +                                   APR_FINFO_MIN, r->pool)) != APR_SUCCESS) {
                       ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
                                    "mod_rewrite: can't access text RewriteMap "
                                    "file %s", s->checkfile);
  @@ -2696,7 +2696,7 @@
               else if (s->type == MAPTYPE_DBM) {
   #ifndef NO_DBM_REWRITEMAP
                   if ((rv = apr_stat(&st, s->checkfile,
  -                                   APR_FINFO_NORM, r->pool)) != APR_SUCCESS) {
  +                                   APR_FINFO_MIN, r->pool)) != APR_SUCCESS) {
                       ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
                                    "mod_rewrite: can't access DBM RewriteMap "
                                    "file %s", s->checkfile);
  @@ -2759,7 +2759,7 @@
               }
               else if (s->type == MAPTYPE_RND) {
                   if ((rv = apr_stat(&st, s->checkfile,
  -                                   APR_FINFO_NORM, r->pool)) != APR_SUCCESS) {
  +                                   APR_FINFO_MIN, r->pool)) != APR_SUCCESS) {
                       ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
                                    "mod_rewrite: can't access text RewriteMap "
                                    "file %s", s->checkfile);
  @@ -4005,7 +4005,7 @@
       if ((cp = strchr(curpath+1, '/')) != NULL) {
           *cp = '\0';
       }
  -    if (apr_stat(sb, curpath, APR_FINFO_NORM, NULL) == APR_SUCCESS) {
  +    if (apr_stat(sb, curpath, APR_FINFO_MIN, NULL) == APR_SUCCESS) {
           return 1;
       }
       else {
  
  
  
  1.33      +1 -1      httpd-2.0/modules/mappers/mod_userdir.c
  
  Index: mod_userdir.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_userdir.c,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- mod_userdir.c	2001/01/28 23:51:53	1.32
  +++ mod_userdir.c	2001/01/31 23:11:01	1.33
  @@ -340,7 +340,7 @@
            * used, for example, to run a CGI script for the user.
            */
           if (filename && (!*userdirs 
  -                      || ((rv = apr_stat(&statbuf, filename, APR_FINFO_NORM,
  +                      || ((rv = apr_stat(&statbuf, filename, APR_FINFO_MIN,
                                            r->pool)) == APR_SUCCESS
                                                || rv == APR_INCOMPLETE))) {
               r->filename = apr_pstrcat(r->pool, filename, dname, NULL);
  
  
  
  1.37      +1 -1      httpd-2.0/modules/proxy/proxy_util.c
  
  Index: proxy_util.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_util.c,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- proxy_util.c	2001/01/20 21:42:19	1.36
  +++ proxy_util.c	2001/01/31 23:11:05	1.37
  @@ -1271,7 +1271,7 @@
       len = 2;
       apr_send(fp, CRLF, &len);
       /* send data */
  -    apr_getfileinfo(&finfo, APR_FINFO_NORM, cachefp);
  +    apr_getfileinfo(&finfo, APR_FINFO_MIN, cachefp);
       if(!r->header_only && ap_send_fd(cachefp, r, offset, finfo.size, &len))
           return HTTP_INTERNAL_SERVER_ERROR;
       return OK;
  
  
  

Mime
View raw message