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
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]
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 ]
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,
#include "apr_strings.h"
#include "regexp.h"
-char *trans[040] = {
+static const char *const trans[040] = {
"\\01",
"\\02",
"\\03",
"\\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,
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;
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 */