diff options
author | Remi Collet <fedora@famillecollet.com> | 2012-04-27 17:21:14 +0200 |
---|---|---|
committer | Remi Collet <fedora@famillecollet.com> | 2012-04-27 17:21:14 +0200 |
commit | ad2289539025930128771f245b896a5ab6a20ea8 (patch) | |
tree | 3d84e44a7f8dd2e97a4dc369ef23042607852bc2 /httpd-2.4.2-r1326980+.patch | |
parent | 14184dc422b158575b35881d4f46121aa1fb7681 (diff) |
httpd: sync with rawhide
Diffstat (limited to 'httpd-2.4.2-r1326980+.patch')
-rw-r--r-- | httpd-2.4.2-r1326980+.patch | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/httpd-2.4.2-r1326980+.patch b/httpd-2.4.2-r1326980+.patch new file mode 100644 index 0000000..3d37c3f --- /dev/null +++ b/httpd-2.4.2-r1326980+.patch @@ -0,0 +1,65 @@ + +http://svn.apache.org/viewvc?view=revision&revision=1326980 +http://svn.apache.org/viewvc?view=revision&revision=1326984 +http://svn.apache.org/viewvc?view=revision&revision=1326991 + +--- httpd-2.4.2/modules/loggers/mod_log_debug.c ++++ httpd-2.4.2/modules/loggers/mod_log_debug.c +@@ -35,8 +35,8 @@ + 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 */ +--- httpd-2.4.2/modules/filters/sed1.c ++++ httpd-2.4.2/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 @@ + "\\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 @@ + 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; +--- httpd-2.4.2/modules/filters/config.m4 ++++ httpd-2.4.2/modules/filters/config.m4 +@@ -16,7 +16,13 @@ + 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, |