You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rj...@apache.org on 2009/05/06 18:53:56 UTC
svn commit: r772356 - in /httpd/httpd/trunk: CHANGES server/main.c
Author: rjung
Date: Wed May 6 16:53:55 2009
New Revision: 772356
URL: http://svn.apache.org/viewvc?rev=772356&view=rev
Log:
Fix usage message on the Windows platform.
- do not include graceful commands and duplicate
start|restart|stop
- add ServerRoot to the parameters encapsulated by "-n"
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/server/main.c
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=772356&r1=772355&r2=772356&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Wed May 6 16:53:55 2009
@@ -6,6 +6,9 @@
mod_proxy_ajp: Avoid delivering content from a previous request which
failed to send a request body. PR 46949 [Ruediger Pluem]
+ *) Windows: Fix usage message.
+ [Rainer Jung]
+
*) apachectl: When passing through arguments to httpd in
non-SysV mode, use the "$@" syntax to preserve arguments.
[Eric Covener]
Modified: httpd/httpd/trunk/server/main.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/main.c?rev=772356&r1=772355&r2=772356&view=diff
==============================================================================
--- httpd/httpd/trunk/server/main.c (original)
+++ httpd/httpd/trunk/server/main.c Wed May 6 16:53:55 2009
@@ -361,17 +361,18 @@
#ifdef WIN32
ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
- " %s [-w] [-k start|restart|stop|shutdown]", pad);
+ " %s [-w] [-k start|restart|stop|shutdown] [-n service_name]", pad);
ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
" %s [-k install|config|uninstall] [-n service_name]",
pad);
-#endif
+#else
/* XXX not all MPMs support signalling the server in general or graceful-stop
* in particular
*/
ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
" %s [-k start|restart|graceful|graceful-stop|stop]",
pad);
+#endif
ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
" %s [-v] [-V] [-h] [-l] [-L] [-t] [-S]", pad);
ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
@@ -405,7 +406,7 @@
#ifdef WIN32
ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
" -n name : set service name and use its "
- "ServerConfigFile");
+ "ServerConfigFile and ServerRoot");
ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
" -k start : tell Apache to start");
ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,