httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Bill Stoddard" <redd...@attglobal.net>
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 09:34:11 GMT
> 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

Didn't spend a lot of time reviewing the code, but it looks like a definite move in the right
direction. I had considered something similar to this (new hook to handle rewriting the args,
et.
al.) but you've taken it a step further.  +1.

In main_win32 I did a hack to extract the pid file from the config on a stop/restart. You
could use
this code to move the stop logic into the pre_config hook.  Something is tickling my memory
that
there was a problem with that code (an implicit assumption), but I can't quite remember what
it
was..

Bill

>
> 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