Index: branches/fc19-dev/server/common/patches/httpd-304s.patch =================================================================== --- branches/fc19-dev/server/common/patches/httpd-304s.patch (revision 2462) +++ branches/fc19-dev/server/common/patches/httpd-304s.patch (revision 2469) @@ -1,6 +1,6 @@ -From 8211f350ce390b8b426b817e0fb7892c91c12c63 Mon Sep 17 00:00:00 2001 +From f4d66a13e385c6fa2026e2da1119ad080928c1f5 Mon Sep 17 00:00:00 2001 From: Alexander Chernyakhovsky Date: Fri, 3 May 2013 21:40:07 -0400 -Subject: [PATCH 3/4] Fix "the-bug" (non-empty content in 304s) +Subject: [PATCH] Fix "the-bug" (non-empty content in 304s) PHP should not produce any output, even if zlib.output_compression is @@ -21,9 +21,9 @@ https://diswww.mit.edu/charon/scripts/24018 --- - server/util_script.c | 5 +++++ + server/util_script.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/server/util_script.c b/server/util_script.c -index 5708c08..187e30f 100644 +index 12a056f..dd83337 100644 --- a/server/util_script.c +++ b/server/util_script.c @@ -41,4 +41,4 @@ if (!apr_is_empty_table(cookie_table)) { -- -1.7.9.6 (Apple Git-31.1) +1.8.1.2 Index: branches/fc19-dev/server/common/patches/httpd-fixup-vhost.patch =================================================================== --- branches/fc19-dev/server/common/patches/httpd-fixup-vhost.patch (revision 2462) +++ branches/fc19-dev/server/common/patches/httpd-fixup-vhost.patch (revision 2469) @@ -1,6 +1,6 @@ -From 373eb8f72153417173d8ecdf11223fba0a740c19 Mon Sep 17 00:00:00 2001 +From e90c8e59a93e5dde747e6dec7b960d2a6f2523ab Mon Sep 17 00:00:00 2001 From: Alexander Chernyakhovsky Date: Fri, 3 May 2013 22:43:28 -0400 -Subject: [PATCH 4/4] Export method to fixup a single virtual host +Subject: [PATCH] Export method to fixup a single virtual host Apache normally provides ap_fixup_virtual_hosts, which merges the @@ -12,6 +12,6 @@ ap_fixup_virtual_hosts. --- - include/http_config.h | 9 ++++++++ - server/config.c | 58 +++++++++++++++++++++++++++---------------------- + include/http_config.h | 9 ++++++++ + server/config.c | 58 ++++++++++++++++++++++++++++----------------------- 2 files changed, 41 insertions(+), 26 deletions(-) @@ -37,8 +37,8 @@ * Reserve some modules slots for modules loaded by other means than diff --git a/server/config.c b/server/config.c -index bc0804a..22a131e 100644 +index c1aae17..254c5d2 100644 --- a/server/config.c +++ b/server/config.c -@@ -2246,46 +2246,52 @@ AP_DECLARE(void) ap_merge_log_config(const struct ap_logconf *old_conf, +@@ -2245,46 +2245,52 @@ AP_DECLARE(void) ap_merge_log_config(const struct ap_logconf *old_conf, } } @@ -120,4 +120,4 @@ } -- -1.7.9.6 (Apple Git-31.1) +1.8.1.2 Index: branches/fc19-dev/server/common/patches/httpd-mod_status-security.patch =================================================================== --- branches/fc19-dev/server/common/patches/httpd-mod_status-security.patch (revision 2462) +++ branches/fc19-dev/server/common/patches/httpd-mod_status-security.patch (revision 2469) @@ -1,6 +1,6 @@ -From 6fc43320aab74560a5aad10f6602309f9de9b762 Mon Sep 17 00:00:00 2001 +From c9e5769ec7163cadd44a1b1a75a12a75a5a1db58 Mon Sep 17 00:00:00 2001 From: Alexander Chernyakhovsky Date: Fri, 3 May 2013 21:39:17 -0400 -Subject: [PATCH 2/4] Prevent mod_status from taking effect in .htaccess files +Subject: [PATCH] Prevent mod_status from taking effect in .htaccess files Introduce a directive to the Apache configuration that is only @@ -11,9 +11,9 @@ Signed-off-by: Geoffrey Thomas --- - modules/generators/mod_status.c | 33 +++++++++++++++++++++++++++++---- + modules/generators/mod_status.c | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/modules/generators/mod_status.c b/modules/generators/mod_status.c -index 0237f1d..5a9ea7b 100644 +index fe832b3..92a6f69 100644 --- a/modules/generators/mod_status.c +++ b/modules/generators/mod_status.c @@ -61,5 +61,5 @@ } -@@ -974,11 +999,11 @@ static void register_hooks(apr_pool_t *p) +@@ -948,10 +973,10 @@ static void register_hooks(apr_pool_t *p) AP_DECLARE_MODULE(status) = { @@ -74,6 +74,5 @@ register_hooks /* register_hooks */ }; - -- -1.7.9.6 (Apple Git-31.1) +1.8.1.2 Index: branches/fc19-dev/server/common/patches/httpd-suexec-scripts.patch =================================================================== --- branches/fc19-dev/server/common/patches/httpd-suexec-scripts.patch (revision 2462) +++ branches/fc19-dev/server/common/patches/httpd-suexec-scripts.patch (revision 2469) @@ -1,6 +1,6 @@ -From 8445788d68230b2e18739166f4c3ae6434038421 Mon Sep 17 00:00:00 2001 +From 427d432a56df94d69a11cc438b08adb070615005 Mon Sep 17 00:00:00 2001 From: Alexander Chernyakhovsky Date: Fri, 3 May 2013 21:38:58 -0400 -Subject: [PATCH 1/4] Add scripts-specific support to suexec +Subject: [PATCH] Add scripts-specific support to suexec This patch make suexec aware of static-cat, Scripts' tool to serve @@ -19,13 +19,13 @@ manner that will strip arguments passed by Apache to php-cgi. --- - configure.in | 4 ++ - support/suexec.c | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++++- + configure.in | 4 ++ + support/suexec.c | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 173 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in -index d93f78c..14faccf 100644 +index 811aace..a95349f 100644 --- a/configure.in +++ b/configure.in -@@ -720,6 +720,10 @@ AC_ARG_WITH(suexec-userdir, +@@ -721,6 +721,10 @@ AC_ARG_WITH(suexec-userdir, APACHE_HELP_STRING(--with-suexec-userdir,User subdirectory),[ AC_DEFINE_UNQUOTED(AP_USERDIR_SUFFIX, "$withval", [User subdirectory] ) ] ) @@ -39,5 +39,5 @@ AC_DEFINE_UNQUOTED(AP_DOC_ROOT, "$withval", [SuExec root directory] ) ] ) diff --git a/support/suexec.c b/support/suexec.c -index 5b6b254..e377042 100644 +index 32e7320..3a4d802 100644 --- a/support/suexec.c +++ b/support/suexec.c @@ -60,5 +60,5 @@ /* variable name is */ -@@ -264,9 +268,108 @@ static void clean_env(void) +@@ -268,9 +272,108 @@ static void clean_env(void) environ = cleanenv; } @@ -169,5 +169,5 @@ gid_t gid; /* target group placeholder */ char *target_uname; /* target user name */ -@@ -286,6 +389,7 @@ int main(int argc, char *argv[]) +@@ -290,6 +393,7 @@ int main(int argc, char *argv[]) * Start with a "clean" environment */ @@ -177,5 +177,5 @@ /* * Check existence/validity of the UID of the user -@@ -369,6 +473,20 @@ int main(int argc, char *argv[]) +@@ -373,6 +477,20 @@ int main(int argc, char *argv[]) #endif /*_OSD_POSIX*/ @@ -198,5 +198,5 @@ * or attempts to back up out of the current directory, * to protect against attacks. If any are -@@ -390,6 +508,7 @@ int main(int argc, char *argv[]) +@@ -394,6 +512,7 @@ int main(int argc, char *argv[]) userdir = 1; } @@ -206,5 +206,5 @@ * Error out if the target username is invalid. */ -@@ -471,7 +590,7 @@ int main(int argc, char *argv[]) +@@ -482,7 +601,7 @@ int main(int argc, char *argv[]) * Error out if attempt is made to execute as root or as * a UID less than AP_UID_MIN. Tsk tsk. @@ -215,5 +215,5 @@ exit(107); } -@@ -503,6 +622,7 @@ int main(int argc, char *argv[]) +@@ -514,6 +633,7 @@ int main(int argc, char *argv[]) log_err("failed to setuid (%lu: %s)\n", (unsigned long)uid, cmd); exit(110); @@ -223,5 +223,5 @@ /* * Get the current working directory, as well as the proper -@@ -525,6 +645,21 @@ int main(int argc, char *argv[]) +@@ -536,6 +656,21 @@ int main(int argc, char *argv[]) log_err("cannot get docroot information (%s)\n", target_homedir); exit(112); @@ -245,5 +245,5 @@ else { if (((chdir(AP_DOC_ROOT)) != 0) || -@@ -551,15 +686,17 @@ int main(int argc, char *argv[]) +@@ -562,15 +697,17 @@ int main(int argc, char *argv[]) /* * Error out if cwd is writable by others. @@ -264,5 +264,5 @@ exit(117); } -@@ -567,10 +704,12 @@ int main(int argc, char *argv[]) +@@ -578,10 +715,12 @@ int main(int argc, char *argv[]) /* * Error out if the program is writable by others. @@ -277,5 +277,5 @@ /* * Error out if the file is setuid or setgid. -@@ -584,6 +723,7 @@ int main(int argc, char *argv[]) +@@ -595,6 +734,7 @@ int main(int argc, char *argv[]) * Error out if the target name/group is different from * the name/group of the cwd or the program. @@ -285,5 +285,5 @@ (gid != dir_info.st_gid) || (uid != prg_info.st_uid) || -@@ -595,12 +735,14 @@ int main(int argc, char *argv[]) +@@ -606,12 +746,14 @@ int main(int argc, char *argv[]) (unsigned long)prg_info.st_uid, (unsigned long)prg_info.st_gid); exit(120); @@ -301,5 +301,5 @@ exit(121); } -@@ -649,6 +791,30 @@ int main(int argc, char *argv[]) +@@ -660,6 +802,30 @@ int main(int argc, char *argv[]) /* * Execute the command, replacing our image with its own. @@ -333,4 +333,4 @@ { -- -1.7.9.6 (Apple Git-31.1) - +1.8.1.2 +