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 04:46:43 GMT
wrowe       00/11/01 20:46:43

  Modified:    src      ApacheCore.def
               src/main http_config.c
  Log:
    Get Win32 building again.
  
  Submitted by:	John Sterling <sterling@covalent.net>
  Reviewed by:	wrowe
  
  Revision  Changes    Path
  1.36      +1 -1      apache-2.0/src/ApacheCore.def
  
  Index: ApacheCore.def
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/ApacheCore.def,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- ApacheCore.def	2000/10/24 11:54:26	1.35
  +++ ApacheCore.def	2000/11/02 04:46:41	1.36
  @@ -289,7 +289,7 @@
   	ap_rprintf   @282
   	ap_rvputs   @283
   
  -	ap_send_header_field   @285
  +
   	ap_server_argv0   @286
   	ap_server_root   @287
   	ap_set_file_slot  @288
  
  
  
  1.83      +2 -1      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.82
  retrieving revision 1.83
  diff -u -r1.82 -r1.83
  --- http_config.c	2000/10/30 20:13:02	1.82
  +++ http_config.c	2000/11/02 04:46:42	1.83
  @@ -1173,11 +1173,12 @@
          so the server can be moved or mirrored with less pain.  */
       char *p;
       int offset = (int) (long) cmd->info;
  +    arg = ap_os_canonical_filename(cmd->pool, arg);
       if (ap_os_is_path_absolute(arg))
   	p = apr_pstrdup(cmd->pool, arg);
       else
   	p = ap_make_full_path(cmd->pool, ap_server_root, arg);
  -    *(char **) (struct_ptr + offset) = p;
  +    *(char **) ((char*)struct_ptr + offset) = p;
       return NULL;
   }
   
  
  
  

Mime
View raw message