bfa8639219
Merge branch 'PHP-5.6'
...
* PHP-5.6:
NEWS
NEWS
Fixed bug #65641 PHP-FPM incorrectly defines the SCRIPT_NAME variable when using Apache
2014-09-15 13:32:37 +02:00
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
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
06f8879017
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix NEWS - #65641 mod_proxy-fcgi is not fixed (still open) - #67606 mod_fastcgi is fixed in ee275e34c8#65641 mod_proxy-fcgi is not fixed (still open) - #67606 mod_fastcgi is fixed in ee275e34c8#111 (compile error without ZEND_SIGNALS)
Don't run travis against master (phpng)
Update README.md
2014-09-15 08:28:22 +02:00
0cb365fb98
Merge phpdbg into PHP-5.6
2014-09-15 05:48:09 +02:00
9873cc29c1
fix format
2014-09-14 23:10:41 +02:00
534ee96964
fix ftell/fseek calls
2014-09-14 23:03:13 +02:00
5cf17fc8bf
reduce struct size by 8 byte on 64 bit
2014-09-14 22:31:01 +02:00
b75a058810
fix ftell/fseek calls
2014-09-14 22:28:42 +02:00
69d6e093e9
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fixed the cast and incompatible pointer warning
Conflicts:
sapi/cgi/fastcgi.c
2014-09-12 14:37:54 +02:00
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
fdfc31a4f7
fixed the cast and incompatible pointer warning
2014-09-12 14:36:00 +02:00
82096dc151
Removed ZEND_QM_ASSIGN_VAR and ZEND_JMP_SET_VAR opcodes (in PHPNG they did exacly the same as ZEND_QM_ASSIGN and ZEND_JMP_SET)
2014-09-11 12:29:54 +04:00
1981dd9c73
Revert "Removing ext/ereg and dependencies"
...
This reverts commit 86de7963fe
2014-09-11 11:06:57 +04:00
86de7963fe
Removing ext/ereg and dependencies
...
Affected extensions:
- opcache (use pcre)
- mbstring (removed ereg functions overloading)
- pgsql (use pcre)
- reflection (test cases using 'ereg')
SAPI:
- apache (header only)
- apache_hooks (header only)
2014-09-11 10:22:44 +08:00
2470e01ab6
Fine tuned the order of adding request variables.
2014-09-09 00:01:36 -04:00
4bdd9aabdd
Fine tuned the order of adding request variables.
2014-09-09 00:01:03 -04:00
bdac08bcdd
Fine tuned the order of adding request variables.
2014-09-09 00:00:14 -04:00
6561d03a41
Added ability to make a number of "warmup" requests before an actual benchmark.
...
(php-cgi -T [<number-of-warmup-requests>,]<number-of-benchmark-requests> <file>)
2014-09-08 16:24:46 +04:00
00805ffb92
Merge branch 'PHP-5.6'
...
Conflicts:
ext/soap/php_http.c
2014-09-04 21:23:11 +02:00
b85b78db4f
Update LSAPI to 6.7, added support for 'filter_input'.
...
Fixed a crash in CLI mode.
2014-09-03 11:29:44 -04:00
b16929ca72
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2014-09-03 11:28:30 -04:00
bba16dde5d
Update LSAPI to 6.7, added support for 'filter_input'.
...
Fixed a crash in CLI mode.
2014-09-03 11:27:54 -04:00
e51677b2e6
fixed reference counting
2014-09-02 11:24:52 +04:00
d18803eb5f
fix apache handler build
2014-09-01 14:49:52 -07:00
88d7ca44f6
Refactored INI subsystem to use zend_string* instead of char*
2014-09-01 20:57:33 +04:00
88099a0a27
Allow PHP 7 to install in Apache 2 on OS X
...
This fixes the fundamental part of #67910 . The complete change from
php5 -> php7 in sapi/* still needs to be done.
2014-08-29 08:47:10 -07:00
e55c641792
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix NEWS for fcgi fix merge
restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
2014-08-28 23:11:55 -07:00
ee275e34c8
restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
2014-08-28 23:06:00 -07:00
4a12b4cef9
closesocket is defined in php_network.h
2014-08-28 13:20:43 +08:00
7a90e40af7
closesocket is already defined in main/php_network.h
2014-08-28 13:18:55 +08:00
3234480827
first show to make 's' work with size_t
2014-08-27 20:49:31 +02:00
202e8db1dc
fixed several long vs zend_long casts
2014-08-26 11:26:53 +02:00
df7b6779bc
Fixed incompatible pointer type (int64)
2014-08-26 12:11:28 +08:00
59848e3fbb
Remove ZEND_ACC_INTERACTIVE and CG(interactive)
...
As far as I can discern these are leftovers of the interactive
shell implementation that was used before PHP 5.4. Now the readline
ext makes use of normal eval calls for this.
So, dropping these until there is evidence to the contrary, as they
currently wouldn't work anyway.
2014-08-25 23:46:43 +02:00
455741fce3
master renames phase 4
2014-08-25 20:57:25 +02:00
4d997f63d9
master renames phase 3
2014-08-25 20:22:49 +02:00
6f9f0bf205
master renames phase 2
2014-08-25 19:28:33 +02:00
c3e3c98ec6
master renames phase 1
2014-08-25 19:24:55 +02:00
8d6ef99a39
Merge remote-tracking branch 'php/master'
2014-08-21 09:21:31 +02:00
e02616866f
Fix bug #67878 program_prefix not honoured in man pages
...
- add @program_prefix@ in php, phpize and php-config man pages
- set date to 2014
- fix "SEE ALSO" alignment
2014-08-21 09:14:38 +02:00
e9166fec62
Fix bug #67878 program_prefix not honoured in man pages
...
- add @program_prefix@ in php, phpize and php-config man pages
- set date to 2014
- fix "SEE ALSO" alignment
2014-08-21 09:14:16 +02:00
dde4d2e628
Fix bug #67878 program_prefix not honoured in man pages
...
- add @program_prefix@ in php, phpize and php-config man pages
- set date to 2014
- fix "SEE ALSO" alignment
2014-08-21 09:13:12 +02:00
fdbbe5fa30
fixed some incompatible types
2014-08-20 09:52:23 +02:00
07359785c3
Merge remote-tracking branch 'php/master'
2014-08-20 08:48:43 +02:00
285934a4c9
Fixed off-by-one memory allocation that could lead to invalid memory reads on strlen()
...
Always properly null terminate strings before ini parsing
Remove unnecessary memset() statements
2014-08-20 12:13:19 +08:00
376e545b01
Merge branch 'fpmConfFix' of github.com:DaveRandom/php-src
2014-08-20 00:28:43 +01:00
61c8af6a9d
ported apache handler
2014-08-19 23:39:22 +02:00
21f623e945
ported fcgi
2014-08-19 23:12:17 +02:00
63d3f0b844
basic macro replacements, all at once
2014-08-19 08:07:31 +02:00
Remi Collet