Commit d3c1b189 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

Stop using environment variables to set ONE_PROCESS and NO_DETACH. Now 

we use the -D command line argument to Apache to configure these
options.
Submitted by:	Greg Stein


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

CHANGES

+5 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0b1



  *) Stop using environment variables to force debug mode or

     no detach.  We now use the -D command line argument to 

     specify the correct mode.  -DONE_PROCESS and -DNO_DETACH.

     [Greg Stein]



  *) Change handlers to use hooks. [Ben Laurie]



  *) Stop returning copies of filenames from both apr_file_t and

server/mpm/beos/beos.c

+2 −2
Original line number Diff line number Diff line
@@ -813,8 +813,8 @@ static void beos_pre_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte 
    static int restart_num = 0;

    int no_detach = 0;



    one_process = !!getenv("ONE_PROCESS");

    no_detach = !!getenv("NO_DETACH");

    one_process = !!ap_exists_config_define("ONE_PROCESS");

    no_detach = !!ap_exists_config_define("NO_DETACH");



    /* sigh, want this only the second time around */

    if (restart_num++ == 1) {

server/mpm/dexter/dexter.c

+2 −2
Original line number Diff line number Diff line
@@ -1127,8 +1127,8 @@ static void dexter_pre_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp 
    static int restart_num = 0;

    int no_detach = 0;



    one_process = !!getenv("ONE_PROCESS");

    no_detach = !!getenv("NO_DETACH");

    one_process = !!ap_exists_config_define("ONE_PROCESS");

    no_detach = !!ap_exists_config_define("NO_DETACH");



    /* sigh, want this only the second time around */

    if (restart_num++ == 1) {

server/mpm/experimental/perchild/perchild.c

+2 −2
Original line number Diff line number Diff line
@@ -1299,8 +1299,8 @@ static void perchild_pre_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *pte 
    int no_detach = 0;

    int i;



    one_process = !!getenv("ONE_PROCESS");

    no_detach = !!getenv("NO_DETACH");

    one_process = !!ap_exists_config_define("ONE_PROCESS");

    no_detach = !!ap_exists_config_define("NO_DETACH");



    /* sigh, want this only the second time around */

    if (restart_num++ == 1) {

server/mpm/mpmt_beos/mpmt_beos.c

+2 −2
Original line number Diff line number Diff line
@@ -820,8 +820,8 @@ static void mpmt_beos_pre_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t 
    static int restart_num = 0;

    int no_detach = 0;



    one_process = !!getenv("ONE_PROCESS");

    no_detach = !!getenv("NO_DETACH");

    one_process = !!ap_exists_config_define("ONE_PROCESS");

    no_detach = !!ap_exists_config_define("NO_DETACH");



    /* sigh, want this only the second time around */

    if (restart_num++ == 1) {