Get Win32 building again.

Submitted by:	John Sterling <sterling@covalent.net>
Reviewed by:	wrowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86797 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/ApacheCore.def b/ApacheCore.def
index 3f1da6df1a29b8dbb6b26944a7266e75f3b18c62..cda03a933904a4eab3f78f71455d37adc6809c94 100644 (file)
--- a/ApacheCore.def
+++ b/ApacheCore.def
@@ -289,7 +289,7 @@ EXPORTS
        ap_rprintf   @282
        ap_rvputs   @283
 
-       ap_send_header_field   @285
+
        ap_server_argv0   @286
        ap_server_root   @287
        ap_set_file_slot  @288

diff --git a/libhttpd.def b/libhttpd.def
index 3f1da6df1a29b8dbb6b26944a7266e75f3b18c62..cda03a933904a4eab3f78f71455d37adc6809c94 100644 (file)
--- a/libhttpd.def
+++ b/libhttpd.def
@@ -289,7 +289,7 @@ EXPORTS
        ap_rprintf   @282
        ap_rvputs   @283
 
-       ap_send_header_field   @285
+
        ap_server_argv0   @286
        ap_server_root   @287
        ap_set_file_slot  @288

diff --git a/server/config.c b/server/config.c
index b4f6a7bedd8d24f87a215794c335a47c5111752c..32131ffc015e0b82af29d7d9d629ce8cd5b19cf6 100644 (file)
--- a/server/config.c
+++ b/server/config.c
@@ -1173,11 +1173,12 @@ AP_DECLARE_NONSTD(const char *) ap_set_file_slot(cmd_parms *cmd, void *struct_pt
        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;
 }