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
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
b070f1080b
Update NEWS
2014-01-17 12:34:23 +09: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
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
ffcff225fd
Update NEWS
2014-01-16 11:41:30 +09:00
8f5de8ddcf
Update NEWS
2014-01-16 11:40:33 +09:00
744f38c2d6
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Bug #66481 Segfaults on session_name()
2014-01-16 11:34:31 +09:00
5662ffb295
Bug #66481 Segfaults on session_name()
...
If the previous value of session.name was NULL then any call to
session_name($string) would result in a segmentation fault.
This changes the behaviour to set the value of session.name to
"PHPSESSID" if a blank value is given in php.ini or via -d on the
command line. There is already protection against setting it to NULL via
session_name() or ini_set().
2014-01-16 11:33:10 +09:00
7359dd6df3
Log information about cached scripts and keys
2014-01-15 12:12:22 +04:00
f52c251f60
Fixed session module is sending multiple set-cookie headers when session.use_strict_mode=1
2014-01-15 11:06:06 +09:00
9c32d30020
Fixed ZTS build
2014-01-13 23:09:59 +04:00
8092de3ca3
forked test for win32
2014-01-13 17:12:14 +01:00
ce2f024e9f
Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0)
2014-01-13 18:05:21 +04:00
fcd75690fe
Fixed bug #66474 (Optimizer bug in constant string to boolean conversion)
2014-01-13 12:06:19 +04:00
98e06a10d3
fix encoding
2014-01-10 15:57:40 +01:00
277895717c
5.5.9-dev now
2014-01-10 10:01:30 +01:00
4f115c0b7d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fixed EOL in the test
2014-01-09 15:28:09 +01:00
b8774519e2
fixed EOL in the test
2014-01-09 15:27:26 +01:00
418602adfb
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
added testcase from bug #65371
2014-01-09 15:24:31 +01:00
e927dbd1f6
added testcase from bug #65371
2014-01-09 15:23:49 +01:00
b5fbde9c5b
Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry)
2014-01-09 13:48:08 +04:00
748e707bf9
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
one more extension for the basename test
2014-01-05 19:21:27 +01:00
1c586d4070
one more extension for the basename test
2014-01-05 19:19:54 +01:00
3bde9cfd8d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
improved the fix for bug #66395
2014-01-05 19:12:52 +01:00
3f7f72adb2
improved the fix for bug #66395
...
- fixed the traverse vulnerability in case like c:d:file.txt
- ensure paths containing NTFS streams are still worky
2014-01-05 19:05:04 +01:00
aaec199050
updated NEWS
2014-01-04 01:41:02 +01:00
ae1cc83f98
Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012
...
Visual Studio 2012 includes sanity checks for C++11 features, see
http://msdn.microsoft.com/en-us/library/vstudio/bb531344(v=vs.110).aspx
To fix the 'inline' keyword redefinition for C++ in debug mode, the
new macros ZEND_WIN32_KEEP_INLINE is introduced, ZEND_WIN32_FORCE_INLINE is
automatically appended in release mode.
2014-01-04 01:41:01 +01:00
d992a972c0
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-04 01:24:54 +01:00
7e8e21df0c
Fix bug #66286 : Incorrect object comparison with inheritance
...
std_compare_objects immidiately returned 0 if the property tables
of both objects contain NULL at some index. Thus it would report
objects as equal even though properties following after that
differ.
2014-01-04 01:22:14 +01:00
8a5ac85fa6
updated NEWS
2014-01-03 22:42:38 +01:00
d3a053d9f4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #66395 basename function doesn't remove drive letter
2014-01-03 22:32:39 +01:00
46f60fae22
Fixed bug #66395 basename function doesn't remove drive letter
2014-01-03 22:25:58 +01:00
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
e7b62fe5a6
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-03 11:06:12 +08:00
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
405f6417f1
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-02 12:52:08 +00:00
5137cb5f0c
Fixed (some of) add/sub.
...
This worked in PHP 5.4 already, but with the introduction of DateTimeImmutable
this code was not correctly merged.
2014-01-02 12:45:48 +00:00
dee77f237c
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
2014-01-02 10:57:46 +00:00
9eb7997852
- BFN
2014-01-01 22:33:12 -02:00
e9195018dc
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix #66375 bad logic in sapi header callback routine
2014-01-01 13:00:29 +00:00
3c3ff43432
fix #66375 bad logic in sapi header callback routine
2014-01-01 12:58:18 +00:00
49cdde7326
Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
2014-01-01 09:56:31 -02:00
5967fb194f
- Fixed bug #66381 (__ss_family was changed on AIX 5.3)
2014-01-01 09:55:14 -02:00
c7ee97eea0
Merge branch 'PHP-5.4' into PHP-5.5
2013-12-30 13:54:58 +01:00
Will Fitch