Stanislav Malyshev
5312c39cfb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #67587 : Redirection loop on nginx with FPM
2014-07-08 12:54:20 -07:00
Christian Weiske
0bf50a8302
Fix bug #67587 : Redirection loop on nginx with FPM
...
Redirection will work correctly as long as PATH_INFO is available,
e.g. via the following nginx configuration:
set $path_info $fastcgi_path_info;
fastcgi_param PATH_INFO $path_info;
2014-07-08 12:53:45 -07:00
Anatol Belski
5cf0084a92
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated NEWS
2014-07-08 10:07:31 +02:00
Anatol Belski
857cd18cf4
updated NEWS
2014-07-08 10:07:18 +02:00
Anatol Belski
d472434ea0
updated NEWS
2014-07-08 10:06:35 +02:00
Anatol Belski
51f79846bf
Backported the patch from bug #67407 into 5.5+
2014-07-08 09:54:36 +02:00
Anatol Belski
e715038920
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Backported the patch from bug #67407 into 5.4
2014-07-08 09:54:12 +02:00
Anatol Belski
03214a2aef
Backported the patch from bug #67407 into 5.4
2014-07-08 09:52:35 +02:00
Remi Collet
7b6757d99a
NEWS
2014-07-08 08:31:15 +02:00
Remi Collet
0c840ced7c
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS
Fix Bug #67530 error_log=syslog ignored
2014-07-08 08:30:44 +02:00
Remi Collet
494034901e
NEWS
2014-07-08 08:30:15 +02:00
Remi Collet
f8acf826c3
Fix Bug #67530 error_log=syslog ignored
...
As for Bug #64915
Systemd use --nodaemonize but need to error_log to file or syslog to be honoured
2014-07-08 08:29:24 +02:00
Adam Harvey
1939b34c78
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
2014-07-07 20:40:47 +00:00
Adam Harvey
604de67b7d
Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
...
We had an infinite loop in sapi_cli_server_send_headers(): while iterating over
the linked list of headers, when an empty header was hit, continue would go to
the next iteration of the loop without updating h to be the next value in the
linked list. Updating it to always increment regardless of whether the header
is actually valid or not fixes the issue.
2014-07-07 20:36:06 +00:00
Stanislav Malyshev
5516963633
create locales and re-add test
2014-07-07 10:34:43 -07:00
Stanislav Malyshev
0e1599afe0
rm test for now
2014-07-07 09:32:26 -07:00
Stanislav Malyshev
c402956178
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
change locale - looks like not everybody has sl_SI
2014-07-07 01:36:03 -07:00
Stanislav Malyshev
a7d1cad4c3
change locale - looks like not everybody has sl_SI
2014-07-07 01:35:25 -07:00
Stanislav Malyshev
96c9cc315d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix format
2014-07-07 00:49:15 -07:00
Stanislav Malyshev
8ba240a70b
Fix bug #66921 - Wrong argument type hint for function intltz_from_date_time_zone
2014-07-07 00:48:44 -07:00
Stanislav Malyshev
897b7b68cc
fix format
2014-07-07 00:48:32 -07:00
Stanislav Malyshev
8ddf9a2dc4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting)
2014-07-07 00:37:59 -07:00
Stanislav Malyshev
6c8a570a96
Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting)
2014-07-07 00:36:57 -07:00
Stanislav Malyshev
c291033469
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Make sure the generator script also creates a newline at the end of file
Add newline at end of file to prevent compilation warning
2014-07-06 22:15:35 -07:00
Lior Kaplan
716d2a3937
Make sure the generator script also creates a newline at the end of file
...
Similar to commit d6713f39 in master
2014-07-06 22:15:09 -07:00
Lior Kaplan
c5fec9e09d
Add newline at end of file to prevent compilation warning
...
The newline was removed at commit 50d50c2f
2014-07-06 22:15:00 -07:00
Xinchen Hui
2034ace052
Fixed bug #67215 (php-cgi work with opcache, may be segmentation fault happen)
2014-07-03 14:58:37 +08:00
Xinchen Hui
533b1df732
Add test for bug #67215
...
bjori> writing a testcase making sure you get a fatal error and does not
segfault after that... is difficult
2014-07-03 13:48:59 +08:00
Xinchen Hui
e17bfb472e
Add CVE ID
2014-07-03 10:50:56 +08:00
Nikita Popov
213e9a0a3c
Merge branch 'PHP-5.4' into PHP-5.5
2014-07-02 22:40:33 +02:00
Nikita Popov
18989420b6
Add test for bug #67151
2014-07-02 22:39:54 +02:00
Ferenc Kovacs
c66a4e84bb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
adding a reproduce script for bug #49184
2014-07-02 22:38:27 +02:00
Ferenc Kovacs
37a13d2df7
adding a reproduce script for bug #49184
2014-07-02 22:37:58 +02:00
Nikita Popov
8c4156ed28
Merge branch 'PHP-5.4' into PHP-5.5
2014-07-02 22:34:32 +02:00
Nikita Popov
3cc6bd10ac
Fix bug #67151 : strtr with empty array crashes
2014-07-02 22:33:20 +02:00
Nikita Popov
d9ebd0f3d6
Fix bug #67497 : eval with parse error causes segfault in generator
2014-07-02 17:33:31 +02:00
Xinchen Hui
22882a9d89
Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting)
2014-07-02 17:57:42 +08:00
Xinchen Hui
df78c48354
Fixed Bug #67538 (SPL Iterators use-after-free)
2014-07-02 17:45:09 +08:00
Anatol Belski
131e60ce56
Merge branch 'PHP-5.4' into PHP-5.5
2014-07-02 11:35:42 +02:00
Anatol Belski
5efda71e54
bundle deplister.exe with releases
2014-07-02 11:34:37 +02:00
Anatol Belski
49e175be42
backported the VC12 fix for ARG_MAX
2014-07-02 11:11:39 +02:00
Michael Wallner
1e06c73192
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix integer overflow in {stream,file}_{get,put}_contents()
2014-07-02 09:55:15 +02:00
Michael Wallner
34e686c556
fix integer overflow in {stream,file}_{get,put}_contents()
2014-07-02 09:53:03 +02:00
Adam Harvey
2e02f18b15
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix ext/pgsql builds with libpq < 7.3.
2014-07-01 13:23:11 -07:00
Adam Harvey
899fe3d8af
Fix ext/pgsql builds with libpq < 7.3.
...
Fixes bug #67550 (Error in code "form" instead of "from", pgsql.c, line 756).
2014-07-01 13:19:22 -07:00
Anatol Belski
5d687afa89
updated libs_version.txt
2014-07-01 10:34:25 +02:00
Anatol Belski
f326713e42
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated libs_version.txt
2014-07-01 10:34:00 +02:00
Anatol Belski
6081dd781a
updated libs_version.txt
2014-07-01 10:33:09 +02:00
Anatol Belski
4965d1c2ce
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
updated libmagic.patch
2014-07-01 10:27:38 +02:00
Anatol Belski
af5f997a5d
updated libmagic.patch
2014-07-01 10:25:20 +02:00