Remi Collet
d66640a334
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #68423i PHP-FPM will no longer load all pools
2014-11-14 17:32:46 +01:00
Remi Collet
23db119768
Fix bug #68423i PHP-FPM will no longer load all pools
...
The hash need to be unique per IP + Port
Previous version have (IPv4 only)
sprintf(key, "%u.%u.%u.%u:%u", IPQUAD(&sa_in->sin_addr), (unsigned int) ntohs(sa_in->sin_port));
2014-11-14 17:29:31 +01:00
George Wang
bba11e3255
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
2014-11-03 11:44:13 -05:00
George Wang
4435161456
set default response code to 200
2014-11-03 11:43:04 -05:00
George Wang
19f3f4b155
set default response code to 200
2014-11-03 11:42:45 -05:00
Bob Weinand
113f1fd6d5
Temporarily disable wait/xml protocol...
2014-10-30 23:09:57 +01:00
Bob Weinand
b9d1dc329f
Merge phpdbg into PHP-5.6
2014-10-30 13:17:58 +01:00
Anatol Belski
fc904569ea
fix output globals importing
2014-10-29 20:03:28 +01:00
Anatol Belski
4b8f411d31
use portable strndup implementation
2014-10-29 19:49:20 +01:00
Anatol Belski
f842b8f4be
unix sockets aren't available on windows
2014-10-29 19:39:46 +01:00
Anatol Belski
79a4339f1b
fix sapi/phpdbg/config.w32
2014-10-29 19:28:21 +01:00
Bob Weinand
68b5dd2ba9
Merge phpdbg into PHP-5.6
2014-10-29 11:43:01 +01:00
Remi Collet
7dd871438f
cleanup uneeded json
2014-10-29 07:26:41 +01:00
Bob Weinand
a5415456d4
Merge phpdbg into PHP-5.6
2014-10-28 23:06:50 +01:00
Bob Weinand
be5d389768
Merge phpdbg into PHP-5.6
2014-10-28 22:44:29 +01:00
Bob Weinand
6150d9342c
Merge ../phpdbg into PHP-5.6
...
Conflicts:
sapi/phpdbg/config.m4
2014-10-28 22:15:05 +01:00
Remi Collet
9028846c63
fix phpdbg build when src tree != build tree
2014-10-28 19:12:41 +01:00
Bob Weinand
297baa0c18
Remove the ugly hack via a temp file to store breakpoints
2014-10-28 17:25:48 +01:00
Bob Weinand
fd8a70b1ee
Typo (notfoundc => notfound)
2014-10-28 17:25:46 +01:00
Bob Weinand
76bd799eb7
Fix quitting on a second run
2014-10-28 17:25:46 +01:00
Bob Weinand
c34fd92466
Fix wrong exec length on relative paths
2014-10-28 17:25:45 +01:00
Bob Weinand
cc3587f4a3
Fix possibly unclosed <stream> tags
2014-10-28 17:25:45 +01:00
Bob Weinand
79c66e7cd2
Fix potential segfaults and unresolved breaks
2014-10-28 17:25:43 +01:00
Bob Weinand
fe5f5d40f2
*Always* clean up and run destructors
2014-10-28 17:25:43 +01:00
Bob Weinand
0ede82d466
Merge phpdbg into PHP-5.6
2014-10-27 14:07:26 +01:00
Bob Weinand
6eab2b9101
Merge phpdbg into PHP-5.6
...
Conflicts:
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_prompt.c
2014-10-27 13:11:13 +01:00
Bob Weinand
50756b515c
Do not execute anything after quit or clean command
2014-10-27 00:00:19 +01:00
Bob Weinand
190f4f9f18
Fix last commit, and do not output unnecessary information
2014-10-27 00:00:18 +01:00
Bob Weinand
3ab7734b88
Stabilize execution, always run destructors and extended file breakpoints
2014-10-27 00:00:16 +01:00
Bob Weinand
69bc61de41
Fix nullptr dereference in clean without exec context
2014-10-27 00:00:15 +01:00
krakjoe
41537cdddc
remove dodgy param parser, bring userland breakpoint api inline with PHP7
2014-10-27 00:00:14 +01:00
krakjoe
51c1cc4ff5
disable output buffering by default
2014-10-27 00:00:14 +01:00
Bob Weinand
cc70ec1e67
Add question to reset execution in run/exec/clean
2014-10-27 00:00:13 +01:00
Bob Weinand
24babb0194
Merge phpdbg into PHP-5.6
2014-10-25 18:59:48 +02:00
Bob Weinand
9b4d9ac6c7
Merge phpdbg into PHP-5.6
2014-10-24 19:22:45 +02:00
George Wang
0e18003374
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
2014-10-03 16:43:35 -04:00
George Wang
ef0eed7f5f
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2014-10-03 16:43:08 -04:00
George Wang
5b08e56eca
Fixed a bug that causes crash when environment variable is access while parsing php.ini
2014-10-03 16:42:27 -04:00
George Wang
0cc2600ec6
Fixed a bug that causes crash when environment variable is access while parsing php.ini
2014-10-03 16:42:15 -04:00
Ferenc Kovacs
200e407b24
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS entry for previous commit
add IPv6 support to php-fpm
2014-10-03 11:39:09 +02:00
Robin Gloster
15ba757a2b
add IPv6 support to php-fpm
2014-10-03 11:35:27 +02:00
Johannes Schlüter
16b4167fdd
Merge branch 'PHP-5.5' into PHP-5.6
2014-09-27 02:18:29 +02:00
Johannes Schlüter
e6105ffb22
Merge branch 'PHP-5.4' into PHP-5.5
2014-09-27 02:17:52 +02:00
Johannes Schlüter
2711948d14
This test should pass
2014-09-27 02:17:26 +02:00
Remi Collet
47bc380ecf
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
NEWS
Fixed bug #65641 PHP-FPM incorrectly defines the SCRIPT_NAME variable when using Apache
2014-09-15 13:31:26 +02:00
Remi Collet
8cac75969e
Fixed bug #65641 PHP-FPM incorrectly defines the SCRIPT_NAME variable when using Apache
...
ProxyPass is unable to provide correct PATH_INFO
as it is not aware of file path (while SetHandler is).
As we can extract PATH_INFO from PATH_TRANSLATED,
we also need to check if present in SCRIPT_NAME
and remove it.
After applying this patch.
With mod_php
_SERVER["REQUEST_URI"] /info.php/foo/bar?q=1
_SERVER["SCRIPT_NAME"] /info.php
_SERVER["PATH_INFO"] /foor/bar
_SERVER["PHP_SELF"] /info.php/foo/bar
_SERVER["QUERY_STRING"] q=1
With mod_proxy_fcgi + SetHandler
_SERVER["REQUEST_URI"] /info.php/foo/bar?q=1
_SERVER["SCRIPT_NAME"] /info.php
_SERVER["PATH_INFO"] /foo/bar
_SERVER["PHP_SELF"] /info.php/foo/bar
_SERVER["QUERY_STRING"] q=1
With mod_proxy_fcgi + ProxyPass
_SERVER["REQUEST_URI"] /info.php/foo/bar?q=1
_SERVER["SCRIPT_NAME"] /info.php
_SERVER["PATH_INFO"] /foo/bar
_SERVER["PHP_SELF"] /info.php/foo/bar
_SERVER["QUERY_STRING"] q=1
2014-09-15 13:29:55 +02:00
Bob Weinand
0cb365fb98
Merge phpdbg into PHP-5.6
2014-09-15 05:48:09 +02:00
Anatol Belski
bcdbd47117
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed the cast and incompatible pointer warning
2014-09-12 14:36:54 +02:00
Anatol Belski
fdfc31a4f7
fixed the cast and incompatible pointer warning
2014-09-12 14:36:00 +02:00
George Wang
4bdd9aabdd
Fine tuned the order of adding request variables.
2014-09-09 00:01:03 -04:00
