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, 13 Dec 2001 00:43:14 GMT
wrowe       01/12/12 16:43:14

  Modified:    server   core.c
  Log:
    Whatever this was doing, it looks most unholy.
  
  Revision  Changes    Path
  1.114     +10 -6     httpd-2.0/server/core.c
  
  Index: core.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/core.c,v
  retrieving revision 1.113
  retrieving revision 1.114
  diff -u -r1.113 -r1.114
  --- core.c	2001/12/06 02:54:47	1.113
  +++ core.c	2001/12/13 00:43:13	1.114
  @@ -350,8 +350,8 @@
       core_server_config *virt = (core_server_config *)virtv;
       core_server_config *conf;
   
  -    conf = (core_server_config *)apr_pcalloc(p, sizeof(core_server_config));
  -    *conf = *virt;
  +    conf = (core_server_config *)apr_palloc(p, sizeof(core_server_config));
  +    memcpy(conf. virt, sizeof(core_server_config));
       if (!conf->access_name) {
           conf->access_name = base->access_name;
       }
  @@ -2720,11 +2720,15 @@
       if (r->method_number == M_PUT) {
           return HTTP_METHOD_NOT_ALLOWED;
       }
  -    if (r->finfo.filetype == 0 || (r->path_info && *r->path_info)) {
  +    if (r->finfo.filetype == 0) {
   	ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, r,
  -		      "File does not exist: %s",r->path_info ?
  -		      apr_pstrcat(r->pool, r->filename, r->path_info, NULL)
  -		      : r->filename);
  +		      "File does not exist: %s", r->filename);
  +	return HTTP_NOT_FOUND;
  +    }
  +    if (r->path_info && *r->path_info) {
  +	ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, r,
  +		      "File does not exist: %s",
  +		      apr_pstrcat(r->pool, r->filename, r->path_info, NULL));
   	return HTTP_NOT_FOUND;
       }
       
  
  
  

Mime
View raw message