httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "William A. Rowe, Jr." <wr...@lnd.com>
Subject RE: cvs commit: apache-2.0/src/modules/mpm/winnt mpm_winnt.c mpm_winnt.h registry.c service.c
Date Wed, 31 May 2000 15:36:34 GMT
> -----Original Message-----
> From: wrowe@locus.apache.org [mailto:wrowe@locus.apache.org]
> Sent: Wednesday, May 31, 2000 10:16 AM
> To: apache-2.0-cvs@apache.org
> Subject: cvs commit: apache-2.0/src/modules/mpm/winnt mpm_winnt.c
> mpm_winnt.h registry.c service.c
> 
> 
> wrowe       00/05/31 08:15:32
> 
>   Modified:    src/modules/mpm/winnt mpm_winnt.c mpm_winnt.h
>                                      registry.c service.c
>   Log:
>     First checkin of Win32 service control structure merged 
> into the mpm.
>   
>     Project files to be updated with this 'experimental' 
> implementation once
>     peer review is complete and the module maintainer accepts 
> the patch.
>   

After I answer all the -'s issues, and get permission from FirstBill,
I'll be happy to update the http_main.c and Apache/ApacheCore .dsp
files for the new service structure.  Till then, I'm operating it
as a momentary code fork (I really should learn how to declare a cvs
vendor branch for this sort of thing), the winnt.c/.h remain, and are 
unaltered.  The mpm_winnt.c/.h will superceed them, and the patch was 
applied to a copy of these sources.

same details as before to test and experiment...

Modify ApacheCore.dsp, pull out winnt.c/.h and drop in to the
core project service.c, registry.c and the integrated mpm_winnt.c,
Remove the original winnt.h/.c, and add User32.lib to the link
library list.

A patched http_main.c becomes the only (.c) source to Apache.dsp.
(the http_main.c in cvs isn't committed yet, I'm not breaking it 
until stability of the mpm/service patch increases by two orders 
of magnitude, but I don't think the patch below is too hard to 
apply if you want to work with the new code :)

Index: http_main.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_main.c,v
retrieving revision 1.52
diff -u -r1.52 http_main.c
--- http_main.c	2000/05/30 22:54:31	1.52
+++ http_main.c	2000/05/31 05:27:33
@@ -278,11 +278,7 @@
     destroy_and_exit_process(process, 1);
 }
 
-#ifdef WIN32
-int apache_main(int argc, char *argv[])
-#else
-API_EXPORT(int)        main(int argc, char *argv[])
-#endif
+int main(int argc, char *argv[])
 {
     int c;
     int configtestonly = 0;
@@ -297,9 +293,7 @@
     ap_pool_t *pcommands; /* Pool for -D, -C and -c switches */
     module **mod;
 
-#ifndef WIN32 /* done in main_win32.c */
     ap_initialize();
-#endif
     process = create_process(argc, (const char **)argv);
     pglobal = process->pool;
     pconf = process->pconf;

Mime
View raw message