svn commit: r1936871 - httpd/httpd/trunk/test/pytest_suite/apache_pytest

[jo...@apache.org]

Author: jorton
Date: Tue Aug  4 14:52:49 2026
New Revision: 1936871

Log:
* test/pytest_suite/apache_pytest/fpm.py (PhpFpm.generate_conf): Set
register_argc_argv so PHP tests see $_SERVER['argc']/['argv'] under
FPM, which mod_php's config for this never actually reached.

Assisted-by: Claude Sonnet 5 <no...@anthropic.com>
GitHub: PR #701

Modified:
   httpd/httpd/trunk/test/pytest_suite/apache_pytest/fpm.py

Modified: httpd/httpd/trunk/test/pytest_suite/apache_pytest/fpm.py
==============================================================================
--- httpd/httpd/trunk/test/pytest_suite/apache_pytest/fpm.py	Tue Aug  4 14:52:29 2026	(r1936870)
+++ httpd/httpd/trunk/test/pytest_suite/apache_pytest/fpm.py	Tue Aug  4 14:52:49 2026	(r1936871)
@@ -60,6 +60,11 @@ class PhpFpm:
             # Surface PHP errors/warnings to the response for test visibility.
             "catch_workers_output = yes\n"
             "clear_env = no\n"
+            # t/php/arg.php et al require argc/argv in $_SERVER. Under mod_php
+            # this came from extra.conf.in's php_admin_flag, but that's inside
+            # an <IfModule> keyed on a mod_php variant that's never loaded when
+            # running under FPM, so it never applied -- set it here instead.
+            "php_admin_value[register_argc_argv] = On\n"
         )
         return self.conf