3b82a477b0
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed Bug #66412 readline_clear_history() with libedit causes segfault after #65714
2014-01-20 08:41:04 +01:00
91513097ca
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed Bug #66412 readline_clear_history() with libedit causes segfault after #65714
2014-01-20 08:40:39 +01:00
31d67bd353
Fixed Bug #66412 readline_clear_history() with libedit causes segfault after #65714
...
Checking all libedit functions, this check is done in each functions (add_history,
read_history, write_history, ...) but is missing in clear_history.
Test coverage: readline_clear_history_001.phpt
2014-01-20 08:38:53 +01:00
fd45f1eb78
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Enable zend.multibyte tests. Tipcal configuration works, but most tests fail.
2014-01-19 13:33:27 +09:00
fb7e25d2e0
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Enable zend.multibyte tests. Tipcal configuration works, but most tests fail.
2014-01-19 13:32:35 +09:00
4e55c6bffb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Enable zend.multibyte tests. Tipcal configuration works, but most tests fail.
2014-01-19 13:31:50 +09:00
e769c96a11
Enable zend.multibyte tests. Tipcal configuration works, but most tests fail.
2014-01-19 13:29:45 +09:00
d788a85736
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix C89 compat
2014-01-19 02:05:38 +01:00
12c1cfbf8f
fix C89 compat
2014-01-19 02:05:10 +01:00
9eb4bc2f84
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix #62479 : Some chars not parsed in passwords
2014-01-18 19:49:06 -05:00
fb2091b1d4
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix #62479 : Some chars not parsed in passwords
2014-01-18 19:41:45 -05:00
98907a96f9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix #62479 : Some chars not parsed in passwords
2014-01-18 19:40:54 -05:00
da83b513b2
Fix #62479 : Some chars not parsed in passwords
...
This fixes an issue where backslashes and spaces aren't
correctly parsed for passwords.
2014-01-18 19:27:40 -05:00
4e5195f82c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix bug #66509 : copy() arginfo incorrect since 5.4
2014-01-18 11:57:34 -05:00
a540c57331
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #66509 : copy() arginfo incorrect since 5.4
2014-01-18 11:56:22 -05:00
767e6d2e08
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #66509 : copy() arginfo incorrect since 5.4
Conflicts:
NEWS
2014-01-18 11:39:32 -05:00
5b906ce6eb
Fix bug #66509 : copy() arginfo incorrect since 5.4
...
Since 5.4, the ZEND_BEGIN_ARG_INFO_EX was replaced
by non _EX, causing Reflection to assume the
$context parameter is required.
2014-01-18 11:25:53 -05:00
89eab884d9
Merge branch 'PHP-5.6'
2014-01-18 14:44:57 +01:00
31a2ac470c
Fix argument unpacking across stack pages
...
If multiple unpacks were used (or mixed with normal arguments)
parts of the arguments could land on different stack pages. If
this occurs the arguments will now be copied to a new stack page.
The code used to do this is copied verbatim from the PHP 5.4 branch
and only modified to reduce the amount of inlined code.
2014-01-18 14:41:33 +01:00
84efb8fc71
Merge branch 'PHP-5.6'
2014-01-18 13:53:15 +01:00
8ff4d61f08
Merge branch 'phpdbg' into PHP-5.6
2014-01-18 13:52:27 +01:00
c205a6f3de
zts fix
2014-01-17 21:20:19 +00:00
18f31d474e
...
2014-01-17 21:15:03 +00:00
54fa2883f0
remove goto from zend_try/zend_end_try/zend_catch blocks
2014-01-17 21:08:35 +00:00
86096a99ec
Merge branch 'PHP-5.6'
2014-01-17 20:29:31 +08:00
43a8f4f814
Add a couple of missing items to UPGRADING.
...
Usual grumble about please ensuring UPGRADING gets updated goes here. :)
2014-01-17 20:28:49 +08:00
f1fc5a5bf5
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Clarify always_populate_raw_post_data situation in 5.6
2014-01-17 12:19:17 +01:00
03386d1786
Clarify always_populate_raw_post_data situation in 5.6
2014-01-17 12:18:16 +01:00
deb56c010e
Merge branch 'PHP-5.6'
2014-01-17 11:08:21 +01:00
b58dbefba0
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
added appropriate exception handling flag to ext\intl
Update NEWS
2014-01-17 11:08:02 +01:00
7f0aff52cf
added appropriate exception handling flag to ext\intl
...
According to the doc page
http://msdn.microsoft.com/en-us/library/1deeycx5.aspx
it's appropriate as none of the extern C functions do throw
exceptions. This also fixes the warning C4530.
2014-01-17 11:03:40 +01:00
98e6c8ca2d
fix indentation
2014-01-17 12:49:21 +04:00
dff0d51243
Add some basic and apparmor tests to fpm
2014-01-17 12:49:07 +04:00
e3d3283405
Add --force-stderr to fpm
2014-01-17 12:49:00 +04:00
f6d137a716
Add apparmor change hat functionality to fpm
2014-01-17 12:48:33 +04:00
cfce5a4d02
Merge branch 'master' of https://git.php.net/repository/php-src
...
* 'master' of https://git.php.net/repository/php-src :
forked the test for bug #66481
2014-01-17 12:22:34 +04:00
a053e69991
fix indentation
2014-01-17 12:22:07 +04:00
b070f1080b
Update NEWS
2014-01-17 12:34:23 +09:00
feb4eb850d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
forked the test for bug #66481
2014-01-17 03:32:26 +01:00
8b703e9ee0
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
forked the test for bug #66481
2014-01-17 03:32:06 +01:00
14e371e7d4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
forked the test for bug #66481
2014-01-17 03:31:38 +01:00
a218a8b917
forked the test for bug #66481
2014-01-17 03:30:42 +01:00
837bd24dea
fix #50
2014-01-16 20:10:30 +00:00
998f506b6d
Merge branch 'fpm-apparmor-fixed' of https://github.com/notti/php-src
...
* 'fpm-apparmor-fixed' of https://github.com/notti/php-src :
Add some basic and apparmor tests to fpm
Add --force-stderr to fpm
Add apparmor change hat functionality to fpm
2014-01-16 17:36:03 +04:00
7691926bbe
Merge branch 'PHP-5.6'
2014-01-16 14:42:14 +08:00
bfcdd67865
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-16 14:42:04 +08:00
9799816e0c
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-16 14:41:52 +08:00
b777248ded
Re-fixed Bug #66481 (Calls to session_name() segfault when session.name is null)
2014-01-16 14:41:12 +08:00
271053ad47
Revert "Bug #66481 Segfaults on session_name()"
...
This reverts commit 5662ffb295
2014-01-16 14:38:35 +08:00
57cf8eaccd
Revert "Update NEWS"
...
This reverts commit 8f5de8ddcf
2014-01-16 14:38:22 +08:00
Remi Collet