Merge r1326980, r1326984, 1326991, add CHANGES entry:

mod_sed, mod_log_debug: Symbol namespace cleanups.

Submitted by: jorton
Reviewed by: jorton , jim, sf

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1331848 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index d9365846e2e1d60bd8cea229a6acea60355dfd52..a93194e183daac3b7b9913180c8d852ab9508c4d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,8 @@
 
 Changes with Apache 2.4.3
 
+  *) mod_sed, mod_log_debug: Symbol namespace cleanups. [Joe Orton]
+
   *) core: Prevent "httpd -k restart" from killing server in presence of
      config error. [Joe Orton]
 

diff --git a/STATUS b/STATUS
index 28145278b50dc73ada2c6fde4072a4449680479d..00358b3d267315d13b9a3a28ab08b13d55c13ba8 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -95,13 +95,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     2.4 patch: Trunk patch works
     +1: rbowen, jim, sf
 
-  * mod_sed, mod_log_debug: Symbol namespace cleanups.
-    trunk patches: http://svn.apache.org/viewvc?rev=1326980&view=rev
-                   http://svn.apache.org/viewvc?rev=1326984&view=rev
-                   http://svn.apache.org/viewvc?rev=1326991&view=rev
-    2.4 patch: trunk works => http://people.apache.org/~jorton/httpd-2.4.1-symbols.patch
-    +1: jorton , jim, sf
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 

diff --git a/modules/filters/config.m4 b/modules/filters/config.m4
index 4ef2d3a59f2118a44c26b3ced3dd1002cce96bb3..966f77a551ca18941600b60b09bbbe64b0cd37a5 100644 (file)
--- a/modules/filters/config.m4
+++ b/modules/filters/config.m4
@@ -16,7 +16,13 @@ APACHE_MODULE(reflector, Reflect request through the output filter stack, , , )
 APACHE_MODULE(substitute, response content rewrite-like filtering, , , most)
 
 sed_obj="mod_sed.lo sed0.lo sed1.lo regexp.lo"
-APACHE_MODULE(sed, filter request and/or response bodies through sed, $sed_obj, , most)
+APACHE_MODULE(sed, filter request and/or response bodies through sed, $sed_obj, , most, [
+    if test "x$enable_sed" = "xshared"; then
+        # The only symbol which needs to be exported is the module
+        # structure, so ask libtool to hide libsed internals:
+        APR_ADDTO(MOD_SED_LDADD, [-export-symbols-regex sed_module])
+    fi
+])
 
 if test "$ac_cv_ebcdic" = "yes"; then
 # mod_charset_lite can be very useful on an ebcdic system,

diff --git a/modules/filters/sed1.c b/modules/filters/sed1.c
index ddca3bdb6296355fc444e62e9642617163fadaf8..739e1ce9c1181f4a0301a5c9e16dc0e807bd0e4b 100644 (file)
--- a/modules/filters/sed1.c
+++ b/modules/filters/sed1.c
@@ -25,7 +25,7 @@
 #include "apr_strings.h"
 #include "regexp.h"
 
-char    *trans[040]  = {
+static const char *const trans[040]  = {
     "\\01",
     "\\02",
     "\\03",
@@ -58,7 +58,7 @@ char    *trans[040]  = {
     "\\36",
     "\\37"
 };
-char rub[] = {"\\177"};
+static const char rub[] = {"\\177"};
 
 extern int sed_step(char *p1, char *p2, int circf, step_vars_storage *vars);
 static int substitute(sed_eval_t *eval, sed_reptr_t *ipc,
@@ -692,7 +692,8 @@ static apr_status_t command(sed_eval_t *eval, sed_reptr_t *ipc,
                             step_vars_storage *step_vars)
 {
     int    i;
-    char   *p1, *p2, *p3;
+    char   *p1, *p2;
+    const char *p3;
     int length;
     char sz[32]; /* 32 bytes enough to store 64 bit integer in decimal */
     apr_status_t rv = APR_SUCCESS;

diff --git a/modules/loggers/mod_log_debug.c b/modules/loggers/mod_log_debug.c
index 0361cba716e2b8cb2f4b79c3e451ded3852a9636..9111b119652ab3d331bd7ba0b39792f129c8b9dd 100644 (file)
--- a/modules/loggers/mod_log_debug.c
+++ b/modules/loggers/mod_log_debug.c
@@ -35,8 +35,8 @@ typedef struct {
     apr_array_header_t *entries;
 } log_debug_dirconf;
 
-const char *allhooks = "all";
-const char * const hooks[] = {
+static const char *allhooks = "all";
+static const char * const hooks[] = {
     "log_transaction",      /*  0 */
     "quick_handler",        /*  1 */
     "handler",              /*  2 */