diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-22 00:06:19 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-22 00:06:19 -0300 |
| commit | 45a1b262edf175ecf5dd43e51c8ee72f9d78265b (patch) | |
| tree | c96780037991d6d44cefc8a149e9b88c6bfc6d67 /extra/php | |
| parent | c034be9e8f973eb6c1dbb77fb4528fad379ddbfd (diff) | |
| parent | 69e1fada8bdc9588d0a3d8bc3403fa809d809a84 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/quvi/PKGBUILD
community/tasks/PKGBUILD
community/xwax/PKGBUILD
core/udev/PKGBUILD
extra/libplist/PKGBUILD
extra/mirage/PKGBUILD
extra/rdesktop/PKGBUILD
staging/gpsd/PKGBUILD
testing/pygobject/PKGBUILD
Diffstat (limited to 'extra/php')
| -rw-r--r-- | extra/php/PKGBUILD | 6 | ||||
| -rw-r--r-- | extra/php/apache.conf | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 109775ea6..8f54d6031 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 118966 2011-04-09 20:51:34Z pierre $ +# $Id: PKGBUILD 120015 2011-04-18 10:42:15Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -24,7 +24,7 @@ pkgname=('php' 'php-tidy' 'php-xsl') pkgver=5.3.6 -pkgrel=2 +pkgrel=3 _suhosinver=${pkgver}-0.9.10 arch=('i686' 'x86_64' 'mips64el') license=('PHP') @@ -40,7 +40,7 @@ source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" md5sums=('2286f5a82a6e8397955a0025c1c2ad98' 'fff1a38877142f3ae6036dbe5a85d0a6' '39eaa70d276fc3d45d6bcf6cd5ae1106' - '96ca078be6729b665be8a865535a97bf' + 'dec2cbaad64e3abf4f0ec70e1de4e8e9' 'b01be5f816988fcee7e78225836e5e27' 'd50ff349da08110a7cc8c691ce2d0423' '07c4e412909ac65a44ec90e7a2c4bade') diff --git a/extra/php/apache.conf b/extra/php/apache.conf index 86344c803..c3ca0aad5 100644 --- a/extra/php/apache.conf +++ b/extra/php/apache.conf @@ -3,7 +3,11 @@ <IfModule dir_module> <IfModule php5_module> DirectoryIndex index.php index.html - AddHandler application/x-httpd-php .php - AddHandler application/x-httpd-php-source .phps + <FilesMatch "\.php$"> + SetHandler application/x-httpd-php + </FilesMatch> + <FilesMatch "\.phps$"> + SetHandler application/x-httpd-php-source + </FilesMatch> </IfModule> -</IfModule>
\ No newline at end of file +</IfModule> |