httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1331848 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS modules/filters/config.m4 modules/filters/sed1.c modules/loggers/mod_log_debug.c
Date Sat, 28 Apr 2012 22:59:36 GMT
Author: sf
Date: Sat Apr 28 22:59:36 2012
New Revision: 1331848

URL: http://svn.apache.org/viewvc?rev=1331848&view=rev
Log:
Merge r1326980, r1326984, 1326991, add CHANGES entry:

mod_sed, mod_log_debug: Symbol namespace cleanups.

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

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/modules/filters/config.m4
    httpd/httpd/branches/2.4.x/modules/filters/sed1.c
    httpd/httpd/branches/2.4.x/modules/loggers/mod_log_debug.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1326980,1326984,1326991

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1331848&r1=1331847&r2=1331848&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Sat Apr 28 22:59:36 2012
@@ -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]
 

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1331848&r1=1331847&r2=1331848&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Sat Apr 28 22:59:36 2012
@@ -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 ]
 

Modified: httpd/httpd/branches/2.4.x/modules/filters/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/filters/config.m4?rev=1331848&r1=1331847&r2=1331848&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/filters/config.m4 (original)
+++ httpd/httpd/branches/2.4.x/modules/filters/config.m4 Sat Apr 28 22:59:36 2012
@@ -16,7 +16,13 @@ APACHE_MODULE(reflector, Reflect request
 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,

Modified: httpd/httpd/branches/2.4.x/modules/filters/sed1.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/filters/sed1.c?rev=1331848&r1=1331847&r2=1331848&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/filters/sed1.c (original)
+++ httpd/httpd/branches/2.4.x/modules/filters/sed1.c Sat Apr 28 22:59:36 2012
@@ -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 *
                             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;

Modified: httpd/httpd/branches/2.4.x/modules/loggers/mod_log_debug.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/loggers/mod_log_debug.c?rev=1331848&r1=1331847&r2=1331848&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/loggers/mod_log_debug.c (original)
+++ httpd/httpd/branches/2.4.x/modules/loggers/mod_log_debug.c Sat Apr 28 22:59:36 2012
@@ -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 */



Mime
View raw message