You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2017/06/30 16:30:17 UTC
svn commit: r1800440 - in /httpd/test/framework/trunk/t: conf/proxy.conf.in
htdocs/php/fpm/pp/ htdocs/php/fpm/pp/sub1/ htdocs/php/fpm/pp/sub1/test.php
modules/proxy_fcgi.t
Author: jim
Date: Fri Jun 30 16:30:17 2017
New Revision: 1800440
URL: http://svn.apache.org/viewvc?rev=1800440&view=rev
Log:
Add in a simple ProxyPass test... Again, these
are the expected values as determined by the
reading of the RFCs and examples given by the
various PRs
Added:
httpd/test/framework/trunk/t/htdocs/php/fpm/pp/
httpd/test/framework/trunk/t/htdocs/php/fpm/pp/sub1/
httpd/test/framework/trunk/t/htdocs/php/fpm/pp/sub1/test.php
Modified:
httpd/test/framework/trunk/t/conf/proxy.conf.in
httpd/test/framework/trunk/t/modules/proxy_fcgi.t
Modified: httpd/test/framework/trunk/t/conf/proxy.conf.in
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/conf/proxy.conf.in?rev=1800440&r1=1800439&r2=1800440&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/conf/proxy.conf.in (original)
+++ httpd/test/framework/trunk/t/conf/proxy.conf.in Fri Jun 30 16:30:17 2017
@@ -103,8 +103,8 @@
<IfModule mod_actions.c>
#AddType application/x-php-fpm .php
- Action application/x-php-fpm /php/fpm virtual
- <Location /php/fpm>
+ Action application/x-php-fpm /php/fpm/action virtual
+ <Location /php/fpm/action>
SetHandler proxy:fcgi://localhost:9001
</Location>
<Directory @SERVERROOT@/htdocs/modules/proxy/fcgi-action>
@@ -114,7 +114,12 @@
<Location /fcgi-action-virtual>
SetHandler proxy:fcgi://127.0.0.1:${FCGI_PORT}
</Location>
+ Action application/x-php-fpm /php-fpm-pp/
+ ProxyPass /php-fpm-pp/ fcgi://localhost:9001/@SERVERROOT@/htdocs/
+ ProxyPassReverse /php-fpm-pp/ fcgi://localhost:9001/@SERVERROOT@/htdocs/
</IfModule>
+
+
</VirtualHost>
</IfModule>
Added: httpd/test/framework/trunk/t/htdocs/php/fpm/pp/sub1/test.php
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/htdocs/php/fpm/pp/sub1/test.php?rev=1800440&view=auto
==============================================================================
--- httpd/test/framework/trunk/t/htdocs/php/fpm/pp/sub1/test.php (added)
+++ httpd/test/framework/trunk/t/htdocs/php/fpm/pp/sub1/test.php Fri Jun 30 16:30:17 2017
@@ -0,0 +1,4 @@
+<?php
+ foreach ($_SERVER as $key => $value) {
+ echo "$key=$value\n";
+ }
\ No newline at end of file
Modified: httpd/test/framework/trunk/t/modules/proxy_fcgi.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/modules/proxy_fcgi.t?rev=1800440&r1=1800439&r2=1800440&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/modules/proxy_fcgi.t (original)
+++ httpd/test/framework/trunk/t/modules/proxy_fcgi.t Fri Jun 30 16:30:17 2017
@@ -13,7 +13,7 @@ my $have_php_fpm = `php-fpm -v` =~ /fpm-
plan tests => (7 * $have_fcgisetenvif) + (2 * $have_fcgibackendtype) +
(2 * $have_fcgibackendtype * have_module('rewrite')) +
(7 * have_module('rewrite')) + (7 * have_module('actions')) +
- (5 * $have_php_fpm * have_module('actions')) + 2,
+ (10 * $have_php_fpm * have_module('actions')) + 2,
need (
'mod_proxy_fcgi',
'FCGI',
@@ -254,6 +254,15 @@ if (have_module('actions')) {
ok t_cmp($envs->{'PATH_TRANSLATED'}, $docroot . '/foo/bar',
"PHP-FPM sets correct PATH_TRANSLATED");
+ $envs = run_fcgi_envvar_request(-1, "/php-fpm-pp/php/fpm/pp/sub1/test.php/foo/bar?query", "PHP-FPM");
+ ok t_cmp($envs->{'SCRIPT_NAME'}, '/php-fpm-pp/php/fpm/pp/sub1/test.php',
+ "ProxyPass PHP-FPM sets correct SCRIPT_NAME");
+ ok t_cmp($envs->{'PATH_INFO'}, '/foo/bar',
+ "ProxyPass PHP-FPM sets correct PATH_INFO");
+ ok t_cmp($envs->{'QUERY_STRING'}, 'query',
+ "ProxyPass PHP-FPM sets correct QUERY_STRING");
+ ok t_cmp($envs->{'PATH_TRANSLATED'}, $docroot . '/foo/bar',
+ "ProxyPass PHP-FPM sets correct PATH_TRANSLATED");
# TODO: Add more tests here