httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@locus.apache.org
Subject cvs commit: apache-2.0/src/main http_config.c
Date Thu, 02 Nov 2000 20:05:02 GMT
wrowe       00/11/02 12:05:01

  Modified:    src/main http_config.c
  Log:
    Solve the os_is_absolute_path problem for the moment.
  
    This is -not- the permanent patch for 2.0, simply a placeholder till we
    have the canonical name implemented in APR for good.
  
  Revision  Changes    Path
  1.84      +5 -0      apache-2.0/src/main/http_config.c
  
  Index: http_config.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_config.c,v
  retrieving revision 1.83
  retrieving revision 1.84
  diff -u -r1.83 -r1.84
  --- http_config.c	2000/11/02 04:46:42	1.83
  +++ http_config.c	2000/11/02 20:05:00	1.84
  @@ -1173,7 +1173,9 @@
          so the server can be moved or mirrored with less pain.  */
       char *p;
       int offset = (int) (long) cmd->info;
  +#ifndef OS2
       arg = ap_os_canonical_filename(cmd->pool, arg);
  +#endif
       if (ap_os_is_path_absolute(arg))
   	p = apr_pstrdup(cmd->pool, arg);
       else
  @@ -1192,6 +1194,9 @@
   
   AP_DECLARE(const char *) ap_server_root_relative(apr_pool_t *p, const char *file)
   {
  +#ifndef OS2
  +    file = ap_os_canonical_filename(p, file);
  +#endif
       if(ap_os_is_path_absolute(file))
   	return file;
       return ap_make_full_path(p, ap_server_root, file);
  
  
  

Mime
View raw message