Patch comment updates.
This commit is contained in:
parent
0a6d82dc32
commit
91afecf7de
@ -1,3 +1,4 @@
|
|||||||
httpd-2.2.8.tar.gz
|
httpd-2.2.8.tar.gz
|
||||||
x86_64
|
x86_64
|
||||||
*.log
|
*.log
|
||||||
|
*.rpm
|
||||||
|
@ -2,9 +2,7 @@
|
|||||||
apr and apr-util are patched to correctly depend on their deps, so
|
apr and apr-util are patched to correctly depend on their deps, so
|
||||||
it's sufficient to just link httpd against the .la file.
|
it's sufficient to just link httpd against the .la file.
|
||||||
|
|
||||||
Upstream-HEAD: needed
|
Upstream-Status: needed
|
||||||
Upstream-2.0: omit
|
|
||||||
Upstream-Status: apr-util still to be fixed properly on HEAD
|
|
||||||
|
|
||||||
--- httpd-2.0.45/configure.in.deplibs 2003-04-29 10:27:05.000000000 +0100
|
--- httpd-2.0.45/configure.in.deplibs 2003-04-29 10:27:05.000000000 +0100
|
||||||
+++ httpd-2.0.45/configure.in 2003-04-29 10:26:45.000000000 +0100
|
+++ httpd-2.0.45/configure.in 2003-04-29 10:26:45.000000000 +0100
|
||||||
|
@ -1,6 +1,9 @@
|
|||||||
|
|
||||||
If SELinux is enabled, log the context on startup.
|
If SELinux is enabled, log the context on startup.
|
||||||
|
|
||||||
|
Upstream-Status: not submitted, needs #ifdef-goodness, probably
|
||||||
|
not worth the battle
|
||||||
|
|
||||||
--- httpd-2.1.10/server/core.c.selinux
|
--- httpd-2.1.10/server/core.c.selinux
|
||||||
+++ httpd-2.1.10/server/core.c
|
+++ httpd-2.1.10/server/core.c
|
||||||
@@ -51,6 +51,8 @@
|
@@ -51,6 +51,8 @@
|
||||||
|
@ -3,6 +3,9 @@
|
|||||||
- drop unnecessary --libs output from ap?-?-config
|
- drop unnecessary --libs output from ap?-?-config
|
||||||
- make multilib-safe
|
- make multilib-safe
|
||||||
|
|
||||||
|
Upstream-Status: The is-mod_so-linked-in hack is done better on trunk.
|
||||||
|
The multilib hack is awful and can't go upstream.
|
||||||
|
|
||||||
--- httpd-2.2.2/support/apxs.in.apxs
|
--- httpd-2.2.2/support/apxs.in.apxs
|
||||||
+++ httpd-2.2.2/support/apxs.in
|
+++ httpd-2.2.2/support/apxs.in
|
||||||
@@ -25,7 +25,18 @@
|
@@ -25,7 +25,18 @@
|
||||||
|
@ -2,6 +2,8 @@
|
|||||||
Support "--enable-modules=none" to build an httpd binary with
|
Support "--enable-modules=none" to build an httpd binary with
|
||||||
no optional modules enabled.
|
no optional modules enabled.
|
||||||
|
|
||||||
|
Upstream-Status: committed to trunk, r357168
|
||||||
|
|
||||||
--- httpd-2.1.10/acinclude.m4.disablemods
|
--- httpd-2.1.10/acinclude.m4.disablemods
|
||||||
+++ httpd-2.1.10/acinclude.m4
|
+++ httpd-2.1.10/acinclude.m4
|
||||||
@@ -289,14 +289,19 @@
|
@@ -289,14 +289,19 @@
|
||||||
|
@ -1,7 +1,8 @@
|
|||||||
|
|
||||||
Tweak the default config to get installbuilddir right.
|
Tweak the default config to get installbuilddir right.
|
||||||
(should really make the RedHat layout DTRT again and
|
|
||||||
use that layout instead)
|
Upstream-Status: should really make the "RedHat" layout DTRT again and
|
||||||
|
use that layout instead
|
||||||
|
|
||||||
--- httpd-2.1.10/config.layout.layout
|
--- httpd-2.1.10/config.layout.layout
|
||||||
+++ httpd-2.1.10/config.layout
|
+++ httpd-2.1.10/config.layout
|
||||||
|
@ -5,6 +5,10 @@ configured, to avoid spamming the SSL vhost in the default install.
|
|||||||
In 2.2 lr->protocol could be used instead to do this properly, if
|
In 2.2 lr->protocol could be used instead to do this properly, if
|
||||||
that was actually initialized properly by mod_ssl.
|
that was actually initialized properly by mod_ssl.
|
||||||
|
|
||||||
|
Upstream-Status: not submitted, ugly hack which only makes a difference
|
||||||
|
to the default configuration used in Fedora. Need to find
|
||||||
|
a way to do this properly.
|
||||||
|
|
||||||
--- httpd-2.1.10/server/mpm_common.c.pod
|
--- httpd-2.1.10/server/mpm_common.c.pod
|
||||||
+++ httpd-2.1.10/server/mpm_common.c
|
+++ httpd-2.1.10/server/mpm_common.c
|
||||||
@@ -583,6 +584,7 @@
|
@@ -583,6 +584,7 @@
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
|
|
||||||
http://issues.apache.org/bugzilla/show_bug.cgi?id=36780
|
http://issues.apache.org/bugzilla/show_bug.cgi?id=36780
|
||||||
|
|
||||||
|
Upstream-Status: committed to trunk, r583817
|
||||||
|
|
||||||
--- httpd-2.2.4/server/util_filter.c.oldflush
|
--- httpd-2.2.4/server/util_filter.c.oldflush
|
||||||
+++ httpd-2.2.4/server/util_filter.c
|
+++ httpd-2.2.4/server/util_filter.c
|
||||||
@@ -578,8 +578,18 @@ AP_DECLARE_NONSTD(apr_status_t) ap_filte
|
@@ -578,8 +578,18 @@ AP_DECLARE_NONSTD(apr_status_t) ap_filte
|
||||||
|
Loading…
Reference in New Issue
Block a user