summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2003-05-22 18:53:49 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2003-05-22 18:53:49 +0000
commitda4e1234c360ad3d763f23be605985fd749beccd (patch)
tree494dd8266a715384f576a64eaa282ed5c0a0d037 /dev-php
parentChanged ~sparc keyword to sparc. (diff)
downloadhistorical-da4e1234c360ad3d763f23be605985fd749beccd.tar.gz
historical-da4e1234c360ad3d763f23be605985fd749beccd.tar.bz2
historical-da4e1234c360ad3d763f23be605985fd749beccd.zip
Fixed bug #18445 properly. Apache2 doesnt like shell wildcarding in its config files.
Diffstat (limited to 'dev-php')
-rw-r--r--dev-php/mod_php/ChangeLog6
-rw-r--r--dev-php/mod_php/Manifest4
-rw-r--r--dev-php/mod_php/files/70_mod_php.conf20
3 files changed, 25 insertions, 5 deletions
diff --git a/dev-php/mod_php/ChangeLog b/dev-php/mod_php/ChangeLog
index a1e27c8a6e1a..34899b996724 100644
--- a/dev-php/mod_php/ChangeLog
+++ b/dev-php/mod_php/ChangeLog
@@ -1,9 +1,13 @@
# ChangeLog for dev-php/mod_php
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.68 2003/05/15 21:32:22 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/mod_php/ChangeLog,v 1.69 2003/05/22 18:53:45 robbat2 Exp $
*mod_php-4.3.1-r3 (23 Apr 2003)
+ 17 May 2003; Robin H. Johnson <robbat2@gentoo.org> files/70_mod_php.conf:
+ Fixed bug #18445 properly. Apache2 doesn't like shell wildcarding in it's
+ config files.
+
15 May 2003; Robin H. Johnson <robbat2@gentoo.org> mod_php-4.3.1-r3.ebuild:
Released to all archs on unstable.
diff --git a/dev-php/mod_php/Manifest b/dev-php/mod_php/Manifest
index 9326161f2d89..ecfac6e4696f 100644
--- a/dev-php/mod_php/Manifest
+++ b/dev-php/mod_php/Manifest
@@ -3,10 +3,10 @@ MD5 8a10662c67b87c1c40d3eedb598280bf mod_php-4.3.1.ebuild 8922
MD5 c99a00bf82ec9a082399ab1dd931c415 mod_php-4.3.1-r2.ebuild 9241
MD5 6de98d80b82a71ed8845884b0bd5676e mod_php-4.2.3-r2.ebuild 8071
MD5 dfc6bd16160024127fa9b0c242fc8ab5 mod_php-4.3.0-r2.ebuild 8634
-MD5 606b90cf2c9cfc6094e4017ad9432cab ChangeLog 15407
+MD5 251aa0210269edcb5af78f301b9dea2d ChangeLog 15576
MD5 c585d6d5154fe64839f25db957301433 mod_php-4.3.1-r1.ebuild 9135
MD5 cceddd5c262e0ffef31d45b7da269851 files/mod_php.conf 148
-MD5 0aaa8b20d112adc6514b0fa9b48ab5d0 files/70_mod_php.conf 434
+MD5 77023a54f39bae40733118d5cabd8f7f files/70_mod_php.conf 853
MD5 316366d60770de4c45957483cde50fe8 files/digest-mod_php-4.3.1 63
MD5 663577b8f4b90d61f245bb6052629194 files/pear_config.diff 422
MD5 ad1869c3f2c3a60b4d7c4d26026373cf files/digest-mod_php-4.2.3-r2 63
diff --git a/dev-php/mod_php/files/70_mod_php.conf b/dev-php/mod_php/files/70_mod_php.conf
index 5cfb7091b3ce..2088bbb78c2b 100644
--- a/dev-php/mod_php/files/70_mod_php.conf
+++ b/dev-php/mod_php/files/70_mod_php.conf
@@ -2,17 +2,33 @@
<IfModule !mod_php4.c>
LoadModule php4_module extramodules/libphp4.so
</IfModule>
-
</IfDefine>
<IfModule mod_mime.c>
AddType application/x-httpd-php .php
+ AddType application/x-httpd-php .phtml
AddType application/x-httpd-php .php3
AddType application/x-httpd-php .php4
AddType application/x-httpd-php-source .phps
</IfModule>
-<Files *.php{,3,4,s}>
+<Files *.php>
+ LimitRequestBody 524288
+ RequestHeader unset If-Modified-Since
+</Files>
+<Files *.php3>
+ LimitRequestBody 524288
+ RequestHeader unset If-Modified-Since
+</Files>
+<Files *.php4>
+ LimitRequestBody 524288
+ RequestHeader unset If-Modified-Since
+</Files>
+<Files *.phps>
+ LimitRequestBody 524288
+ RequestHeader unset If-Modified-Since
+</Files>
+<Files *.phtml>
LimitRequestBody 524288
RequestHeader unset If-Modified-Since
</Files>