You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ni...@apache.org on 2009/12/22 01:05:41 UTC
svn commit: r893044 - in /httpd/httpd/trunk: docs/man/httpd.8
docs/manual/programs/httpd.xml modules/generators/mod_info.c server/main.c
Author: niq
Date: Tue Dec 22 00:05:40 2009
New Revision: 893044
URL: http://svn.apache.org/viewvc?rev=893044&view=rev
Log:
Strip SHARED_CORE deadwood.
PR 46239
Modified:
httpd/httpd/trunk/docs/man/httpd.8
httpd/httpd/trunk/docs/manual/programs/httpd.xml
httpd/httpd/trunk/modules/generators/mod_info.c
httpd/httpd/trunk/server/main.c
Modified: httpd/httpd/trunk/docs/man/httpd.8
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/man/httpd.8?rev=893044&r1=893043&r2=893044&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/man/httpd.8 (original)
+++ httpd/httpd/trunk/docs/man/httpd.8 Tue Dec 22 00:05:40 2009
@@ -73,9 +73,6 @@
-E \fIfile\fR
Send error messages during server startup to \fIfile\fR\&.
.TP
--R \fIdirectory\fR
-When the server is compiled using the SHARED_CORE rule, this specifies the \fIdirectory\fR for the shared object files\&.
-.TP
-h
Output a short summary of available command line options\&.
.TP
Modified: httpd/httpd/trunk/docs/manual/programs/httpd.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/programs/httpd.xml?rev=893044&r1=893043&r2=893044&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/programs/httpd.xml (original)
+++ httpd/httpd/trunk/docs/manual/programs/httpd.xml Tue Dec 22 00:05:40 2009
@@ -122,12 +122,6 @@
<dd>Send error messages during server startup to <var>file</var>.</dd>
-<dt><code>-R <var>directory</var></code></dt>
-
-<dd>When the server is compiled using the <code>SHARED_CORE</code>
-rule, this specifies the <var>directory</var> for the shared
-object files.</dd>
-
<dt><code>-h</code></dt>
<dd>Output a short summary of available command line options.</dd>
Modified: httpd/httpd/trunk/modules/generators/mod_info.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/generators/mod_info.c?rev=893044&r1=893043&r2=893044&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/generators/mod_info.c (original)
+++ httpd/httpd/trunk/modules/generators/mod_info.c Tue Dec 22 00:05:40 2009
@@ -503,10 +503,6 @@
ap_rputs(" -D NEED_HASHBANG_EMUL\n", r);
#endif
-#ifdef SHARED_CORE
- ap_rputs(" -D SHARED_CORE\n", r);
-#endif
-
/* This list displays the compiled in default paths: */
#ifdef HTTPD_ROOT
ap_rputs(" -D HTTPD_ROOT=\"" HTTPD_ROOT "\"\n", r);
@@ -516,10 +512,6 @@
ap_rputs(" -D SUEXEC_BIN=\"" SUEXEC_BIN "\"\n", r);
#endif
-#if defined(SHARED_CORE) && defined(SHARED_CORE_DIR)
- ap_rputs(" -D SHARED_CORE_DIR=\"" SHARED_CORE_DIR "\"\n", r);
-#endif
-
#ifdef DEFAULT_PIDLOG
ap_rputs(" -D DEFAULT_PIDLOG=\"" DEFAULT_PIDLOG "\"\n", r);
#endif
Modified: httpd/httpd/trunk/server/main.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/main.c?rev=893044&r1=893043&r2=893044&view=diff
==============================================================================
--- httpd/httpd/trunk/server/main.c (original)
+++ httpd/httpd/trunk/server/main.c Tue Dec 22 00:05:40 2009
@@ -212,10 +212,6 @@
printf(" -D NEED_HASHBANG_EMUL\n");
#endif
-#ifdef SHARED_CORE
- printf(" -D SHARED_CORE\n");
-#endif
-
/* This list displays the compiled in default paths: */
#ifdef HTTPD_ROOT
printf(" -D HTTPD_ROOT=\"" HTTPD_ROOT "\"\n");
@@ -225,10 +221,6 @@
printf(" -D SUEXEC_BIN=\"" SUEXEC_BIN "\"\n");
#endif
-#if defined(SHARED_CORE) && defined(SHARED_CORE_DIR)
- printf(" -D SHARED_CORE_DIR=\"" SHARED_CORE_DIR "\"\n");
-#endif
-
#ifdef DEFAULT_PIDLOG
printf(" -D DEFAULT_PIDLOG=\"" DEFAULT_PIDLOG "\"\n");
#endif
@@ -343,14 +335,8 @@
pad[i] = '\0';
-#ifdef SHARED_CORE
- ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL ,
- "Usage: %s [-R directory] [-D name] [-d directory] [-f file]",
- bin);
-#else
ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
"Usage: %s [-D name] [-d directory] [-f file]", bin);
-#endif
ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
" %s [-C \"directive\"] [-c \"directive\"]", pad);
@@ -374,12 +360,6 @@
ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
"Options:");
-#ifdef SHARED_CORE
- ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
- " -R directory : specify an alternate location for "
- "shared object files");
-#endif
-
ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL,
" -D name : define a name for use in "
"<IfDefine name> directives");