Commit afbd99b2 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

some non-MPM code wants to see DEFAULT_PIDLOG, so liberate the 

setting from the MPM-specific mpm_default.h

now visible again via httpd -V


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

CHANGES

+2 −1
Changes for CHANGES: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ 


Changes with Apache 2.3.12



  *) MPM helper function ap_remove_pid() added.  [Jeff Trawick]

  *) Restore visibility of DEFAULT_PIDLOG to core and modules.  MPM 

     helper function ap_remove_pid() added.  [Jeff Trawick]



  *) Enable DEFAULT_REL_RUNTIMEDIR on Windows and NetWare.  [various]

include/ap_config.h

+5 −0
Changes for include/ap_config.h: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -235,6 +235,11 @@ 
#endif

#include "ap_config_layout.h"



/* Where the main/parent process's pid is logged */

#ifndef DEFAULT_PIDLOG

#define DEFAULT_PIDLOG DEFAULT_REL_RUNTIMEDIR "/httpd.pid"

#endif



#if defined(NETWARE)

#define AP_NONBLOCK_WHEN_MULTI_LISTEN 1

#endif

server/mpm/event/mpm_default.h

+0 −5
Changes for server/mpm/event/mpm_default.h: 0 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -51,11 +51,6 @@ 
#define DEFAULT_THREADS_PER_CHILD 25

#endif



/* Where the main/parent process's pid is logged */

#ifndef DEFAULT_PIDLOG

#define DEFAULT_PIDLOG DEFAULT_REL_RUNTIMEDIR "/httpd.pid"

#endif



/* Number of requests to try to handle in a single process.  If <= 0,

 * the children don't die off.

 */

server/mpm/mpmt_os2/mpm_default.h

+0 −5
Changes for server/mpm/mpmt_os2/mpm_default.h: 0 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -45,11 +45,6 @@ 
#define DEFAULT_MIN_SPARE_THREAD 5

#endif



/* Where the main/parent process's pid is logged */

#ifndef DEFAULT_PIDLOG

#define DEFAULT_PIDLOG DEFAULT_REL_RUNTIMEDIR "/httpd.pid"

#endif



/*

 * Interval, in microseconds, between scoreboard maintenance.

 */

server/mpm/netware/mpm_default.h

+0 −6
Changes for server/mpm/netware/mpm_default.h: 0 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -60,12 +60,6 @@ 
#define DEFAULT_MIN_FREE_THREADS 10

#endif



/* Where the main/parent process's pid is logged */

/*#ifndef DEFAULT_PIDLOG

  #define DEFAULT_PIDLOG DEFAULT_REL_RUNTIMEDIR "/httpd.pid"

  #endif

*/



/*

 * Interval, in microseconds, between scoreboard maintenance.

 */