Commit f24e3d7f authored by Justin Erenkrantz's avatar Justin Erenkrantz
Browse files

Add -X functionality back to httpd. 

- Updates upgrading.html
- Reverts Aaron's earlier docco patch (sorry...)
- Adds -X to all mpms in the tree


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

CHANGES

+3 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0.26-dev



  *) Add -X functionality back.  This indicates to all MPMs and any other

     part of Apache that it should run in "debug" mode.  [Justin Erenkrantz]



  *) Some initial support for the cygwin platform [prefork only].

     This is not to be confused with support for the WinNT/Win32

     platform, which is the recommended configuration for native

docs/manual/upgrading.html.en

+0 −6
Original line number Diff line number Diff line
@@ -108,12 +108,6 @@ parent process with <code>WINCH</code> rather than 
which was used for printing the virtual host configuration has

been replaced by <code>-t -D DUMP_VHOSTS</code>.</li>



<li>The <code>httpd</code> command line option <code>-X</code> has

been removed.  Most MPMs allow the same functionality to be requested

by using the <code>-D ONE_PROCESS</code> command line

option.  In addition, a <code>-D NO_DETACH</code> command line

option is available.</li>



<li>The module mod_auth_digest, which was experimental in Apache 1.3

is now a standard module.</li>

docs/manual/upgrading.html.fr

+0 −5
Original line number Diff line number Diff line
@@ -105,11 +105,6 @@ signal <code>USR1</code>.</li> 
qui servait à afficher la configuration des hôtes virtuels est 

remplacé par <code>-t -D DUMP_VHOSTS</code>.</li>



<li>L'option <code>-X</code> du programme <code>httpd</code> 

est supprime. La majorité des MPM permettent la même fonctionnalité

en définissant les variables d'environnement  <code>ONE_PROCESS</code> et

<code>NO_DETACH</code> avant de lancer <code>httpd</code>.</li>



<li>Le module mod_auth_digest, qui était expérimental dans la version 1.3,

est maintenant un module standard.</li>

include/http_main.h

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ 
 * in apr_getopt() format.  Use this for default'ing args that the MPM

 * can safely ignore and pass on from its rewrite_args() handler.

 */

#define AP_SERVER_BASEARGS "C:c:D:d:f:vVlLth?"

#define AP_SERVER_BASEARGS "C:c:D:d:f:vVlLth?X"



#ifdef __cplusplus

extern "C" {

server/main.c

+4 −0
Original line number Diff line number Diff line
@@ -344,6 +344,10 @@ int main(int argc, const char * const argv[]) 
	    new = (char **)apr_array_push(ap_server_config_defines);

	    *new = apr_pstrdup(pcommands, optarg);

	    break;

	case 'X':

	    new = (char **)apr_array_push(ap_server_config_defines);

	    *new = "DEBUG";

	    break;

	case 'f':

	    confname = optarg;

	    break;