Andrey Hristov
01d5e28057
move common code into a function
2014-01-13 12:40:39 +02:00
Anatol Belski
9aaea81cfe
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fixed EOL in the test
2014-01-09 15:29:16 +01:00
Anatol Belski
ec89e6bfe2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fixed EOL in the test
2014-01-09 15:28:47 +01:00
Anatol Belski
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
Anatol Belski
b8774519e2
fixed EOL in the test
2014-01-09 15:27:26 +01:00
Anatol Belski
3572a0482d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
added testcase from bug #65371
2014-01-09 15:25:18 +01:00
Anatol Belski
4fe9a5d611
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
added testcase from bug #65371
2014-01-09 15:24:55 +01:00
Anatol Belski
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
Anatol Belski
e927dbd1f6
added testcase from bug #65371
2014-01-09 15:23:49 +01:00
Dmitry Stogov
83b00bbd08
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry)
2014-01-09 13:50:12 +04:00
Dmitry Stogov
f16a4bc203
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry)
2014-01-09 13:49:54 +04:00
Dmitry Stogov
b5fbde9c5b
Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry)
2014-01-09 13:48:08 +04:00
Scott MacVicar
6fe34014f0
Merge branch 'PHP-5.6'
...
* PHP-5.6:
[libxml] Unit test for libxml_disable_entity_loader()
2014-01-06 17:06:33 +00:00
Scott MacVicar
28beaaad9c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
[libxml] Unit test for libxml_disable_entity_loader()
2014-01-06 17:05:34 +00:00
Scott MacVicar
42f084c692
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
[libxml] Unit test for libxml_disable_entity_loader()
2014-01-06 17:05:16 +00:00
Scott MacVicar
24cc7c0be2
[libxml] Unit test for libxml_disable_entity_loader()
...
Summary:
Test to make sure libxml_disable_entity_loader() is behaving.
2014-01-06 17:04:54 +00:00
Anatol Belski
e797e058c5
Merge branch 'PHP-5.6'
...
* PHP-5.6:
one more extension for the basename test
2014-01-05 19:22:11 +01:00
Anatol Belski
61e1f79585
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
one more extension for the basename test
2014-01-05 19:21:49 +01:00
Anatol Belski
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
Anatol Belski
1c586d4070
one more extension for the basename test
2014-01-05 19:19:54 +01:00
Anatol Belski
ac875f8f7e
Merge branch 'PHP-5.6'
...
* PHP-5.6:
improved the fix for bug #66395
Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012
updated NEWS
Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012
2014-01-05 19:13:40 +01:00
Anatol Belski
e5dd5d0ad4
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
improved the fix for bug #66395
updated NEWS
Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012
2014-01-05 19:13:15 +01:00
Anatol Belski
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
Anatol Belski
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
Anatol Belski
19aafe43b2
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:49 +01:00
Anatol Belski
4e7c9ea896
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:27 +01:00
Anatol Belski
aaec199050
updated NEWS
2014-01-04 01:41:02 +01:00
Anatol Belski
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
Nikita Popov
250ee4c17a
Merge branch 'PHP-5.6'
2014-01-04 01:30:44 +01:00
Nikita Popov
72a16851f4
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-04 01:29:15 +01:00
Nikita Popov
d992a972c0
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-04 01:24:54 +01:00
Nikita Popov
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
Anatol Belski
6e7d24dd14
Merge branch 'PHP-5.6'
...
* PHP-5.6:
updated NEWS
2014-01-03 22:45:09 +01:00
Anatol Belski
169d66e0c6
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
2014-01-03 22:44:46 +01:00
Anatol Belski
8a5ac85fa6
updated NEWS
2014-01-03 22:42:38 +01:00
Anatol Belski
b502c0a3dc
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed bug #66395 basename function doesn't remove drive letter
2014-01-03 22:39:17 +01:00
Anatol Belski
f0100261e1
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed bug #66395 basename function doesn't remove drive letter
2014-01-03 22:38:47 +01:00
Anatol Belski
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
Anatol Belski
46f60fae22
Fixed bug #66395 basename function doesn't remove drive letter
2014-01-03 22:25:58 +01:00
Xinchen Hui
b209c27302
Merge branch 'PHP-5.6'
2014-01-03 11:37:32 +08:00
Xinchen Hui
4e2ae5f5ca
Here need to be str_efree
...
found by ext/standard/tests/general_functions/phpinfo2.php fails
2014-01-03 11:36:50 +08:00
Xinchen Hui
af6c11c5f0
Bump year
2014-01-03 11:11:57 +08:00
Xinchen Hui
0f53e37494
Merge branch 'PHP-5.6'
2014-01-03 11:09:07 +08:00
Xinchen Hui
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
Xinchen Hui
b5f245db37
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-03 11:08:06 +08:00
Xinchen Hui
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
Xinchen Hui
e7b62fe5a6
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-03 11:06:12 +08:00
Xinchen Hui
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
Derick Rethans
c9f909cd42
Merge branch 'PHP-5.6'
2014-01-02 12:52:26 +00:00
Derick Rethans
68c9f5d84c
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-02 12:52:20 +00:00