httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Tim Costello <timcoste...@ozemail.com.au>
Subject RE: cvs commit: apache-2.0/src/support htpasswd.dsp logresol
Date Thu, 01 Jan 1970 00:00:00 GMT
> I expect that Windows developers are all broken now.  If I broke every
> Windows developer, then I am sorry, we will have to back out the changes,
> and I will explain what I did so that somebody with MSDev 5.0 can make the
> changes for me.  Please somebody with Windows let me know if this worked
> or not.

It's been about a week since I compiled the server and had it serving pages. 
The build settings aren't quite right yet (new common files not used) - a 
diff to fix this is included. This doesn't address the /Zi => /ZI changes 
Bill raised. /ZI is VC6's new edit-and-continue style debugging, so we'll 
have to change it back at some stage.

One thing I missed in the service/shutdown etc. patch was the linkage of
ap_server_argv0 to apachecore.dll where it is defined. A small patch is
included to prevent segfaults when running as an NT service. Apache was trying
to write to the import address table instead of the variable in apachecore. 

The other thing that has changed is the config processing - I need to go back
and read the mails to new-httpd. Currently the ServerRoot isn't set before
DSOs are loaded (because it isn't EXEC_ON_READ?) - and because I'm using a
relative path, the wrong serverroot (hence module path) is used when loading 
modules into the server. 

The config change has exposed differences in how the server works when it's a 
service vs running interactively - my initial feeling is that it should behave the 
same either way. Ideas / comments from people who know main_win32.c and service.c?

Hopefully these comments are a bit less petty :)

Thanks,
Tim

===== BEGIN PATCH =====
--- c:/srclib/repos/apache/2.0/src/src/lib/apr/aprlib.dsp	Thu May 18 09:46:27 2000
+++ src/lib/apr/aprlib.dsp	Thu May 18 10:31:18 2000
@@ -40,7 +41,7 @@
 # PROP Intermediate_Dir "LibR"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32"
/I "misc/win32" /I "network_io/win32" /I "threadproc/win32" /I "time/win32" /D "WIN32" /D
"NDEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32"
/I "misc/win32" /I "misc/unix" /I "network_io/win32" /I "threadproc/win32" /I "time/win32"
/D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
@@ -65,7 +66,7 @@
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX
/FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I "dso/win32" /I "file_io/win32"
/I "locks/win32" /I "misc/win32" /I "network_io/win32" /I "threadproc/win32" /I "time/win32"
/D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I "dso/win32" /I "file_io/win32"
/I "locks/win32" /I "misc/win32" /I "misc/unix" /I "network_io/win32" /I "threadproc/win32"
/I "time/win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
@@ -131,7 +132,7 @@
 # End Source File
 # Begin Source File
 
-SOURCE=.\misc\win32\canonerr.c
+SOURCE=.\misc\unix\canonerr.c
 # End Source File
 # Begin Source File
 
@@ -143,11 +144,11 @@
 # End Source File
 # Begin Source File
 
-SOURCE=.\misc\win32\errorcodes.c
+SOURCE=.\misc\unix\errorcodes.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\file_io\win32\fileacc.c
+SOURCE=.\file_io\unix\fileacc.c
 # End Source File
 # Begin Source File
 
@@ -159,7 +160,7 @@
 # End Source File
 # Begin Source File
 
-SOURCE=.\misc\win32\getopt.c
+SOURCE=.\misc\unix\getopt.c
 # End Source File
 # Begin Source File
 
@@ -223,7 +224,7 @@
 # End Source File
 # Begin Source File
 
-SOURCE=.\misc\win32\start.c
+SOURCE=.\misc\unix\start.c
 # End Source File
 # Begin Source File
--- c:/srclib/repos/apache/2.0/src/src/os/win32/service.c	Wed May 17 12:07:42 2000
+++ src/os/win32/service.c	Thu May 18 13:18:03 2000
@@ -66,13 +66,14 @@
 #include "httpd.h"
 #include "http_conf_globals.h"
 #include "http_log.h"
-#include "http_main.h"
 #include "service.h"
 #include "registry.h"
 #include "ap_mpm.h"
 
 typedef void (CALLBACK *ap_completion_t)();
 API_VAR_IMPORT ap_completion_t ap_mpm_init_complete;
+
+API_VAR_IMPORT char *ap_server_argv0;
 
 static struct
 {
===== END PATCH =====
This message was sent through MyMail http://www.mymail.com.au



Mime
View raw message