summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@fedoraproject.org>2017-05-06 08:50:19 +0200
committerRemi Collet <remi@fedoraproject.org>2017-05-06 08:50:19 +0200
commitb2791b6eece4e6af00c6fa29d516c1f676f89ad0 (patch)
treec175adfcbc0bf9d58e5faba829dc6c3b7aa440f2
parenta69929b965cac4c34a594483b46fc62aeb5dd27e (diff)
downloadphp-b2791b6eece4e6af00c6fa29d516c1f676f89ad0.zip
php-b2791b6eece4e6af00c6fa29d516c1f676f89ad0.tar.gz
php-b2791b6eece4e6af00c6fa29d516c1f676f89ad0.tar.xz
enable PHP execution of .phar files, see #1117140
-rw-r--r--nginx-php.conf6
-rw-r--r--php.conf4
-rw-r--r--php.spec5
3 files changed, 10 insertions, 5 deletions
diff --git a/nginx-php.conf b/nginx-php.conf
index 9b01536..1df1b04 100644
--- a/nginx-php.conf
+++ b/nginx-php.conf
@@ -4,11 +4,13 @@
#
index index.php index.html index.htm;
-location ~ \.php$ {
- try_files $uri =404;
+location ~ \.(php|phar)(/.*)?$ {
+ fastcgi_split_path_info ^(.+\.(?:php|phar))(/.*)$;
+
fastcgi_intercept_errors on;
fastcgi_index index.php;
include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+ fastcgi_param PATH_INFO $fastcgi_path_info;
fastcgi_pass php-fpm;
}
diff --git a/php.conf b/php.conf
index 1a5d148..2eb6a28 100644
--- a/php.conf
+++ b/php.conf
@@ -21,7 +21,7 @@ DirectoryIndex index.php
#
# Cause the PHP interpreter to handle files with a .php extension.
#
- <FilesMatch \.php$>
+ <FilesMatch \.(php|phar)$>
SetHandler application/x-httpd-php
</FilesMatch>
@@ -50,7 +50,7 @@ DirectoryIndex index.php
# Enable http authorization headers
SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1
- <FilesMatch \.php$>
+ <FilesMatch \.(php|phar)$>
SetHandler "proxy:unix:/run/php-fpm/www.sock|fcgi://localhost"
</FilesMatch>
</IfModule>
diff --git a/php.spec b/php.spec
index 01109c9..cff97b1 100644
--- a/php.spec
+++ b/php.spec
@@ -62,7 +62,7 @@
%endif
%global rcver RC1
-%global rpmrel 2
+%global rpmrel 3
Summary: PHP scripting language for creating dynamic web sites
Name: php
@@ -1501,6 +1501,9 @@ rm -f README.{Zeus,QNX,CVS-RULES}
%changelog
+* Sat May 6 2017 Remi Collet <remi@fedoraproject.org> - 7.1.5-0.3.RC1
+- enable PHP execution of .phar files, see #1117140
+
* Thu Apr 27 2017 Remi Collet <remi@fedoraproject.org> - 7.1.5-0.2.RC1
- new sources from new tag