[package] update apache to 2.2.13, drop httpd.conf file and patch it directly in the sources (#5858)
git-svn-id: svn://svn.openwrt.org/openwrt/packages@17645 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@ -1,6 +1,6 @@
|
||||
--- a/server/Makefile.in
|
||||
+++ b/server/Makefile.in
|
||||
@@ -26,7 +26,10 @@
|
||||
@@ -26,7 +26,10 @@ gen_test_char: $(gen_test_char_OBJECTS)
|
||||
$(LINK) $(EXTRA_LDFLAGS) $(gen_test_char_OBJECTS) $(EXTRA_LIBS)
|
||||
|
||||
test_char.h: gen_test_char
|
||||
|
@ -22,5 +22,5 @@
|
||||
+ 54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,
|
||||
+ 54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,
|
||||
+ 54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,
|
||||
+ 54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54
|
||||
+ 54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54
|
||||
+};
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/build/mkconfNW.awk
|
||||
+++ b/build/mkconfNW.awk
|
||||
@@ -24,7 +24,7 @@
|
||||
@@ -24,7 +24,7 @@ BEGIN {
|
||||
A["sysconfdir"] = "conf"
|
||||
A["iconsdir"] = "icons"
|
||||
A["manualdir"] = "manual"
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/include/scoreboard.h
|
||||
+++ b/include/scoreboard.h
|
||||
@@ -42,7 +42,7 @@
|
||||
@@ -42,7 +42,7 @@ extern "C" {
|
||||
|
||||
/* Scoreboard file, if there is one */
|
||||
#ifndef DEFAULT_SCOREBOARD
|
||||
|
60
net/apache/patches/005-httpd_conf.patch
Normal file
60
net/apache/patches/005-httpd_conf.patch
Normal file
@ -0,0 +1,60 @@
|
||||
--- a/docs/conf/httpd.conf.in
|
||||
+++ b/docs/conf/httpd.conf.in
|
||||
@@ -51,7 +51,6 @@ Listen @@Port@@
|
||||
# Example:
|
||||
# LoadModule foo_module modules/mod_foo.so
|
||||
#
|
||||
-@@LoadModule@@
|
||||
|
||||
<IfModule !mpm_netware_module>
|
||||
<IfModule !mpm_winnt_module>
|
||||
@@ -63,8 +62,8 @@ Listen @@Port@@
|
||||
# It is usually good practice to create a dedicated user and group for
|
||||
# running httpd, as with most system services.
|
||||
#
|
||||
-User daemon
|
||||
-Group daemon
|
||||
+User nobody
|
||||
+Group nogroup
|
||||
|
||||
</IfModule>
|
||||
</IfModule>
|
||||
@@ -191,7 +190,7 @@ ErrorLog "@rel_logfiledir@/error_log"
|
||||
# Possible values include: debug, info, notice, warn, error, crit,
|
||||
# alert, emerg.
|
||||
#
|
||||
-LogLevel warn
|
||||
+LogLevel debug
|
||||
|
||||
<IfModule log_config_module>
|
||||
#
|
||||
@@ -336,7 +335,7 @@ DefaultType text/plain
|
||||
# contents of the file itself to determine its type. The MIMEMagicFile
|
||||
# directive tells the module where the hint definitions are located.
|
||||
#
|
||||
-#MIMEMagicFile @rel_sysconfdir@/magic
|
||||
+MIMEMagicFile @rel_sysconfdir@/magic
|
||||
|
||||
#
|
||||
# Customizable error responses come in three flavors:
|
||||
@@ -358,7 +357,7 @@ DefaultType text/plain
|
||||
# broken on your system.
|
||||
#
|
||||
#EnableMMAP off
|
||||
-#EnableSendfile off
|
||||
+EnableSendfile off
|
||||
|
||||
# Supplemental configuration
|
||||
#
|
||||
@@ -404,7 +403,7 @@ DefaultType text/plain
|
||||
# starting without SSL on platforms with no /dev/random equivalent
|
||||
# but a statically compiled-in mod_ssl.
|
||||
#
|
||||
-<IfModule ssl_module>
|
||||
-SSLRandomSeed startup builtin
|
||||
-SSLRandomSeed connect builtin
|
||||
-</IfModule>
|
||||
+#<IfModule ssl_module>
|
||||
+#SSLRandomSeed startup builtin
|
||||
+#SSLRandomSeed connect builtin
|
||||
+#</IfModule>
|
Reference in New Issue
Block a user