281 lines
6.9 KiB
Diff
281 lines
6.9 KiB
Diff
Adapted for 7.2.7 from 7.3 by remi
|
|
|
|
|
|
From 0ea4013f101d64fbeb9221260b36e98f10ed1ddd Mon Sep 17 00:00:00 2001
|
|
From: Remi Collet <remi@remirepo.net>
|
|
Date: Wed, 4 Jul 2018 08:48:38 +0200
|
|
Subject: [PATCH] Fixed bug #62596 add getallheaders (apache_request_headers)
|
|
missing function in FPM add sapi_add_request_header in public API (was
|
|
add_request_header) fix arginfo for fastcgi_finish_request fucntion
|
|
|
|
---
|
|
main/SAPI.c | 50 +++++++++++++++++++++++++++++
|
|
main/SAPI.h | 1 +
|
|
sapi/cgi/cgi_main.c | 51 +----------------------------
|
|
sapi/fpm/fpm/fpm_main.c | 25 ++++++++++++++-
|
|
sapi/fpm/tests/getallheaders.phpt | 67 +++++++++++++++++++++++++++++++++++++++
|
|
5 files changed, 143 insertions(+), 51 deletions(-)
|
|
create mode 100644 sapi/fpm/tests/getallheaders.phpt
|
|
|
|
diff --git a/main/SAPI.c b/main/SAPI.c
|
|
index b6c3329..7e0c7c8 100644
|
|
--- a/main/SAPI.c
|
|
+++ b/main/SAPI.c
|
|
@@ -1104,6 +1104,56 @@ SAPI_API void sapi_terminate_process(void) {
|
|
}
|
|
}
|
|
|
|
+SAPI_API void sapi_add_request_header(char *var, unsigned int var_len, char *val, unsigned int val_len, void *arg) /* {{{ */
|
|
+{
|
|
+ zval *return_value = (zval*)arg;
|
|
+ char *str = NULL;
|
|
+
|
|
+ ALLOCA_FLAG(use_heap)
|
|
+
|
|
+ if (var_len > 5 &&
|
|
+ var[0] == 'H' &&
|
|
+ var[1] == 'T' &&
|
|
+ var[2] == 'T' &&
|
|
+ var[3] == 'P' &&
|
|
+ var[4] == '_') {
|
|
+
|
|
+ char *p;
|
|
+
|
|
+ var_len -= 5;
|
|
+ p = var + 5;
|
|
+ var = str = do_alloca(var_len + 1, use_heap);
|
|
+ *str++ = *p++;
|
|
+ while (*p) {
|
|
+ if (*p == '_') {
|
|
+ *str++ = '-';
|
|
+ p++;
|
|
+ if (*p) {
|
|
+ *str++ = *p++;
|
|
+ }
|
|
+ } else if (*p >= 'A' && *p <= 'Z') {
|
|
+ *str++ = (*p++ - 'A' + 'a');
|
|
+ } else {
|
|
+ *str++ = *p++;
|
|
+ }
|
|
+ }
|
|
+ *str = 0;
|
|
+ } else if (var_len == sizeof("CONTENT_TYPE")-1 &&
|
|
+ memcmp(var, "CONTENT_TYPE", sizeof("CONTENT_TYPE")-1) == 0) {
|
|
+ var = "Content-Type";
|
|
+ } else if (var_len == sizeof("CONTENT_LENGTH")-1 &&
|
|
+ memcmp(var, "CONTENT_LENGTH", sizeof("CONTENT_LENGTH")-1) == 0) {
|
|
+ var = "Content-Length";
|
|
+ } else {
|
|
+ return;
|
|
+ }
|
|
+ add_assoc_stringl_ex(return_value, var, var_len, val, val_len);
|
|
+ if (str) {
|
|
+ free_alloca(var, use_heap);
|
|
+ }
|
|
+}
|
|
+/* }}} */
|
|
+
|
|
/*
|
|
* Local variables:
|
|
* tab-width: 4
|
|
diff --git a/main/SAPI.h b/main/SAPI.h
|
|
index f829fd7..4b8e223 100644
|
|
--- a/main/SAPI.h
|
|
+++ b/main/SAPI.h
|
|
@@ -151,6 +151,7 @@ SAPI_API void sapi_shutdown(void);
|
|
SAPI_API void sapi_activate(void);
|
|
SAPI_API void sapi_deactivate(void);
|
|
SAPI_API void sapi_initialize_empty_request(void);
|
|
+SAPI_API void sapi_add_request_header(char *var, unsigned int var_len, char *val, unsigned int val_len, void *arg);
|
|
END_EXTERN_C()
|
|
|
|
/*
|
|
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
|
|
index 2e9cefe..350846d 100644
|
|
--- a/sapi/cgi/cgi_main.c
|
|
+++ b/sapi/cgi/cgi_main.c
|
|
@@ -1591,54 +1591,6 @@ PHP_FUNCTION(apache_child_terminate) /*
|
|
}
|
|
/* }}} */
|
|
|
|
-static void add_request_header(char *var, unsigned int var_len, char *val, unsigned int val_len, void *arg) /* {{{ */
|
|
-{
|
|
- zval *return_value = (zval*)arg;
|
|
- char *str = NULL;
|
|
- char *p;
|
|
- ALLOCA_FLAG(use_heap)
|
|
-
|
|
- if (var_len > 5 &&
|
|
- var[0] == 'H' &&
|
|
- var[1] == 'T' &&
|
|
- var[2] == 'T' &&
|
|
- var[3] == 'P' &&
|
|
- var[4] == '_') {
|
|
-
|
|
- var_len -= 5;
|
|
- p = var + 5;
|
|
- var = str = do_alloca(var_len + 1, use_heap);
|
|
- *str++ = *p++;
|
|
- while (*p) {
|
|
- if (*p == '_') {
|
|
- *str++ = '-';
|
|
- p++;
|
|
- if (*p) {
|
|
- *str++ = *p++;
|
|
- }
|
|
- } else if (*p >= 'A' && *p <= 'Z') {
|
|
- *str++ = (*p++ - 'A' + 'a');
|
|
- } else {
|
|
- *str++ = *p++;
|
|
- }
|
|
- }
|
|
- *str = 0;
|
|
- } else if (var_len == sizeof("CONTENT_TYPE")-1 &&
|
|
- memcmp(var, "CONTENT_TYPE", sizeof("CONTENT_TYPE")-1) == 0) {
|
|
- var = "Content-Type";
|
|
- } else if (var_len == sizeof("CONTENT_LENGTH")-1 &&
|
|
- memcmp(var, "CONTENT_LENGTH", sizeof("CONTENT_LENGTH")-1) == 0) {
|
|
- var = "Content-Length";
|
|
- } else {
|
|
- return;
|
|
- }
|
|
- add_assoc_stringl_ex(return_value, var, var_len, val, val_len);
|
|
- if (str) {
|
|
- free_alloca(var, use_heap);
|
|
- }
|
|
-}
|
|
-/* }}} */
|
|
-
|
|
PHP_FUNCTION(apache_request_headers) /* {{{ */
|
|
{
|
|
if (zend_parse_parameters_none()) {
|
|
@@ -1648,7 +1600,7 @@ PHP_FUNCTION(apache_request_headers) /*
|
|
if (fcgi_is_fastcgi()) {
|
|
fcgi_request *request = (fcgi_request*) SG(server_context);
|
|
|
|
- fcgi_loadenv(request, add_request_header, return_value);
|
|
+ fcgi_loadenv(request, sapi_add_request_header, return_value);
|
|
} else {
|
|
char buf[128];
|
|
char **env, *p, *q, *var, *val, *t = buf;
|
|
diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
|
|
index 3256660..e815be4 100644
|
|
--- a/sapi/fpm/fpm/fpm_main.c
|
|
+++ b/sapi/fpm/fpm/fpm_main.c
|
|
@@ -1533,6 +1533,10 @@ PHP_FUNCTION(fastcgi_finish_request) /* {{{ */
|
|
{
|
|
fcgi_request *request = (fcgi_request*) SG(server_context);
|
|
|
|
+ if (zend_parse_parameters_none() == FAILURE) {
|
|
+ return;
|
|
+ }
|
|
+
|
|
if (!fcgi_is_closed(request)) {
|
|
php_output_end_all();
|
|
php_header();
|
|
@@ -1547,8 +1551,27 @@ PHP_FUNCTION(fastcgi_finish_request) /* {{{ */
|
|
}
|
|
/* }}} */
|
|
|
|
+ZEND_BEGIN_ARG_INFO(cgi_fcgi_sapi_no_arginfo, 0)
|
|
+ZEND_END_ARG_INFO()
|
|
+
|
|
+PHP_FUNCTION(apache_request_headers) /* {{{ */
|
|
+{
|
|
+ fcgi_request *request;
|
|
+
|
|
+ if (zend_parse_parameters_none() == FAILURE) {
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ array_init(return_value);
|
|
+ if ((request = (fcgi_request*) SG(server_context))) {
|
|
+ fcgi_loadenv(request, sapi_add_request_header, return_value);
|
|
+ }
|
|
+} /* }}} */
|
|
+
|
|
static const zend_function_entry cgi_fcgi_sapi_functions[] = {
|
|
- PHP_FE(fastcgi_finish_request, NULL)
|
|
+ PHP_FE(fastcgi_finish_request, cgi_fcgi_sapi_no_arginfo)
|
|
+ PHP_FE(apache_request_headers, cgi_fcgi_sapi_no_arginfo)
|
|
+ PHP_FALIAS(getallheaders, apache_request_headers, cgi_fcgi_sapi_no_arginfo)
|
|
PHP_FE_END
|
|
};
|
|
|
|
diff --git a/sapi/fpm/tests/getallheaders.phpt b/sapi/fpm/tests/getallheaders.phpt
|
|
new file mode 100644
|
|
index 0000000..b41f1c6
|
|
--- /dev/null
|
|
+++ b/sapi/fpm/tests/getallheaders.phpt
|
|
@@ -0,0 +1,67 @@
|
|
+--TEST--
|
|
+FPM: Function getallheaders basic test
|
|
+--SKIPIF--
|
|
+<?php include "skipif.inc"; ?>
|
|
+--FILE--
|
|
+<?php
|
|
+
|
|
+require_once "tester.inc";
|
|
+
|
|
+$cfg = <<<EOT
|
|
+[global]
|
|
+error_log = {{FILE:LOG}}
|
|
+[unconfined]
|
|
+listen = {{ADDR}}
|
|
+pm = dynamic
|
|
+pm.max_children = 5
|
|
+pm.start_servers = 1
|
|
+pm.min_spare_servers = 1
|
|
+pm.max_spare_servers = 3
|
|
+EOT;
|
|
+
|
|
+$code = <<<EOT
|
|
+<?php
|
|
+echo "Test Start\n";
|
|
+var_dump(getallheaders());
|
|
+echo "Test End\n";
|
|
+EOT;
|
|
+
|
|
+$headers = [];
|
|
+$tester = new FPM\Tester($cfg, $code);
|
|
+$tester->start();
|
|
+$tester->expectLogStartNotices();
|
|
+$tester->request(
|
|
+ '',
|
|
+ [
|
|
+ 'HTTP_X_FOO' => 'BAR',
|
|
+ 'HTTP_FOO' => 'foo'
|
|
+ ]
|
|
+ )->expectBody(
|
|
+ [
|
|
+ 'Test Start',
|
|
+ 'array(4) {',
|
|
+ ' ["Foo"]=>',
|
|
+ ' string(3) "foo"',
|
|
+ ' ["X-Foo"]=>',
|
|
+ ' string(3) "BAR"',
|
|
+ ' ["Content-Length"]=>',
|
|
+ ' string(1) "0"',
|
|
+ ' ["Content-Type"]=>',
|
|
+ ' string(0) ""',
|
|
+ '}',
|
|
+ 'Test End',
|
|
+ ]
|
|
+ );
|
|
+$tester->terminate();
|
|
+$tester->expectLogTerminatingNotices();
|
|
+$tester->close();
|
|
+
|
|
+?>
|
|
+Done
|
|
+--EXPECT--
|
|
+Done
|
|
+--CLEAN--
|
|
+<?php
|
|
+require_once "tester.inc";
|
|
+FPM\Tester::clean();
|
|
+?>
|
|
--
|
|
2.1.4
|
|
|