]>
granicus.if.org Git - php/log
Andrey Hristov [Mon, 13 Jan 2014 23:31:16 +0000 (01:31 +0200)]
More refactoring of the big function generating execute requests
Andrey Hristov [Mon, 13 Jan 2014 10:40:59 +0000 (12:40 +0200)]
Merge branch 'master' of git.php.net:php-src
Andrey Hristov [Mon, 13 Jan 2014 10:40:39 +0000 (12:40 +0200)]
move common code into a function
Dmitry Stogov [Mon, 13 Jan 2014 08:08:23 +0000 (12:08 +0400)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #66474 (Optimizer bug in constant string to boolean conversion)
Dmitry Stogov [Mon, 13 Jan 2014 08:07:50 +0000 (12:07 +0400)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #66474 (Optimizer bug in constant string to boolean conversion)
Conflicts:
NEWS
Dmitry Stogov [Mon, 13 Jan 2014 08:06:19 +0000 (12:06 +0400)]
Fixed bug #66474 (Optimizer bug in constant string to boolean conversion)
Bob Weinand [Sun, 12 Jan 2014 01:00:37 +0000 (02:00 +0100)]
Merge branch 'PHP-5.6'
Bob Weinand [Sun, 12 Jan 2014 00:59:22 +0000 (01:59 +0100)]
Fixed build (making zend_is_by_ref_func_arg_fetch function static)
Nikita Popov [Sat, 11 Jan 2014 11:54:08 +0000 (12:54 +0100)]
Merge branch 'PHP-5.6'
Nikita Popov [Thu, 29 Aug 2013 09:35:11 +0000 (11:35 +0200)]
Implement argument unpacking
RFC: https://wiki.php.net/rfc/argument_unpacking
Nikita Popov [Wed, 28 Aug 2013 18:12:54 +0000 (20:12 +0200)]
Minor cleanup in zend_do_pass_param()
Johannes Schlüter [Fri, 10 Jan 2014 15:04:29 +0000 (16:04 +0100)]
Merge branch 'PHP-5.6'
Johannes Schlüter [Fri, 10 Jan 2014 15:02:46 +0000 (16:02 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
Johannes Schlüter [Fri, 10 Jan 2014 14:57:40 +0000 (15:57 +0100)]
fix encoding
Julien Pauli [Fri, 10 Jan 2014 09:01:30 +0000 (10:01 +0100)]
5.5.9-dev now
Anatol Belski [Thu, 9 Jan 2014 14:29:16 +0000 (15:29 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fixed EOL in the test
Anatol Belski [Thu, 9 Jan 2014 14:28:47 +0000 (15:28 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fixed EOL in the test
Anatol Belski [Thu, 9 Jan 2014 14:28:09 +0000 (15:28 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fixed EOL in the test
Anatol Belski [Thu, 9 Jan 2014 14:27:26 +0000 (15:27 +0100)]
fixed EOL in the test
Anatol Belski [Thu, 9 Jan 2014 14:25:18 +0000 (15:25 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
added testcase from bug #65371
Anatol Belski [Thu, 9 Jan 2014 14:24:55 +0000 (15:24 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
added testcase from bug #65371
Anatol Belski [Thu, 9 Jan 2014 14:24:31 +0000 (15:24 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
added testcase from bug #65371
Anatol Belski [Thu, 9 Jan 2014 14:23:49 +0000 (15:23 +0100)]
added testcase from bug #65371
Dmitry Stogov [Thu, 9 Jan 2014 09:50:12 +0000 (13:50 +0400)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry)
Dmitry Stogov [Thu, 9 Jan 2014 09:49:54 +0000 (13:49 +0400)]
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)
Dmitry Stogov [Thu, 9 Jan 2014 09:48:08 +0000 (13:48 +0400)]
Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry)
Scott MacVicar [Mon, 6 Jan 2014 17:06:33 +0000 (17:06 +0000)]
Merge branch 'PHP-5.6'
* PHP-5.6:
[libxml] Unit test for libxml_disable_entity_loader()
Scott MacVicar [Mon, 6 Jan 2014 17:05:34 +0000 (17:05 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
[libxml] Unit test for libxml_disable_entity_loader()
Scott MacVicar [Mon, 6 Jan 2014 17:05:16 +0000 (17:05 +0000)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
[libxml] Unit test for libxml_disable_entity_loader()
Scott MacVicar [Sun, 5 Jan 2014 10:11:05 +0000 (02:11 -0800)]
[libxml] Unit test for libxml_disable_entity_loader()
Summary:
Test to make sure libxml_disable_entity_loader() is behaving.
Anatol Belski [Sun, 5 Jan 2014 18:22:11 +0000 (19:22 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
one more extension for the basename test
Anatol Belski [Sun, 5 Jan 2014 18:21:49 +0000 (19:21 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
one more extension for the basename test
Anatol Belski [Sun, 5 Jan 2014 18:21:27 +0000 (19:21 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
one more extension for the basename test
Anatol Belski [Sun, 5 Jan 2014 18:19:54 +0000 (19:19 +0100)]
one more extension for the basename test
Anatol Belski [Sun, 5 Jan 2014 18:13:40 +0000 (19:13 +0100)]
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
Anatol Belski [Sun, 5 Jan 2014 18:13:15 +0000 (19:13 +0100)]
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
Anatol Belski [Sun, 5 Jan 2014 18:12:52 +0000 (19:12 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
improved the fix for bug #66395
Anatol Belski [Sun, 5 Jan 2014 18:05:04 +0000 (19:05 +0100)]
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
Anatol Belski [Fri, 3 Jan 2014 23:47:10 +0000 (00:47 +0100)]
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.
Anatol Belski [Fri, 3 Jan 2014 23:47:10 +0000 (00:47 +0100)]
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.
Anatol Belski [Fri, 3 Jan 2014 23:59:03 +0000 (00:59 +0100)]
updated NEWS
Anatol Belski [Fri, 3 Jan 2014 23:47:10 +0000 (00:47 +0100)]
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.
Nikita Popov [Sat, 4 Jan 2014 00:30:44 +0000 (01:30 +0100)]
Merge branch 'PHP-5.6'
Nikita Popov [Sat, 4 Jan 2014 00:29:15 +0000 (01:29 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
Nikita Popov [Sat, 4 Jan 2014 00:24:54 +0000 (01:24 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
Nikita Popov [Sat, 4 Jan 2014 00:22:14 +0000 (01:22 +0100)]
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.
Anatol Belski [Fri, 3 Jan 2014 21:45:09 +0000 (22:45 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
Anatol Belski [Fri, 3 Jan 2014 21:44:46 +0000 (22:44 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
Anatol Belski [Fri, 3 Jan 2014 21:42:38 +0000 (22:42 +0100)]
updated NEWS
Anatol Belski [Fri, 3 Jan 2014 21:39:17 +0000 (22:39 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #66395 basename function doesn't remove drive letter
Anatol Belski [Fri, 3 Jan 2014 21:38:47 +0000 (22:38 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #66395 basename function doesn't remove drive letter
Anatol Belski [Fri, 3 Jan 2014 21:32:39 +0000 (22:32 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #66395 basename function doesn't remove drive letter
Anatol Belski [Fri, 3 Jan 2014 21:25:58 +0000 (22:25 +0100)]
Fixed bug #66395 basename function doesn't remove drive letter
Xinchen Hui [Fri, 3 Jan 2014 03:37:32 +0000 (11:37 +0800)]
Merge branch 'PHP-5.6'
Xinchen Hui [Fri, 3 Jan 2014 03:36:50 +0000 (11:36 +0800)]
Here need to be str_efree
found by ext/standard/tests/general_functions/phpinfo2.php fails
Xinchen Hui [Fri, 3 Jan 2014 03:11:57 +0000 (11:11 +0800)]
Bump year
Xinchen Hui [Fri, 3 Jan 2014 03:09:07 +0000 (11:09 +0800)]
Merge branch 'PHP-5.6'
Xinchen Hui [Fri, 3 Jan 2014 03:08:10 +0000 (11:08 +0800)]
Bump year
Xinchen Hui [Fri, 3 Jan 2014 03:08:06 +0000 (11:08 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Fri, 3 Jan 2014 03:06:16 +0000 (11:06 +0800)]
Bump year
Xinchen Hui [Fri, 3 Jan 2014 03:06:12 +0000 (11:06 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Fri, 3 Jan 2014 03:04:26 +0000 (11:04 +0800)]
Bump year
Derick Rethans [Thu, 2 Jan 2014 12:52:26 +0000 (12:52 +0000)]
Merge branch 'PHP-5.6'
Derick Rethans [Thu, 2 Jan 2014 12:52:20 +0000 (12:52 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6
Derick Rethans [Thu, 2 Jan 2014 12:52:08 +0000 (12:52 +0000)]
Merge branch 'PHP-5.4' into PHP-5.5
Derick Rethans [Thu, 2 Jan 2014 12:47:52 +0000 (12:47 +0000)]
Merge branch 'PHP-5.6'
Derick Rethans [Thu, 2 Jan 2014 12:47:44 +0000 (12:47 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6
Derick Rethans [Thu, 2 Jan 2014 12:45:48 +0000 (12:45 +0000)]
Fixed (some of) add/sub.
This worked in PHP 5.4 already, but with the introduction of DateTimeImmutable
this code was not correctly merged.
Derick Rethans [Thu, 2 Jan 2014 10:57:46 +0000 (10:57 +0000)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Felipe Pena [Thu, 2 Jan 2014 00:33:12 +0000 (22:33 -0200)]
- BFN
krakjoe [Wed, 1 Jan 2014 13:01:41 +0000 (13:01 +0000)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix #66375 bad logic in sapi header callback routine
krakjoe [Wed, 1 Jan 2014 13:01:06 +0000 (13:01 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix #66375 bad logic in sapi header callback routine
krakjoe [Wed, 1 Jan 2014 13:00:29 +0000 (13:00 +0000)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix #66375 bad logic in sapi header callback routine
krakjoe [Wed, 1 Jan 2014 12:58:18 +0000 (12:58 +0000)]
fix #66375 bad logic in sapi header callback routine
Felipe Pena [Wed, 1 Jan 2014 11:57:03 +0000 (09:57 -0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
- Fixed bug #66381 (__ss_family was changed on AIX 5.3)
Felipe Pena [Wed, 1 Jan 2014 11:56:49 +0000 (09:56 -0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
- Fixed bug #66381 (__ss_family was changed on AIX 5.3)
Felipe Pena [Wed, 1 Jan 2014 11:56:31 +0000 (09:56 -0200)]
Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
Felipe Pena [Wed, 1 Jan 2014 11:55:14 +0000 (09:55 -0200)]
- Fixed bug #66381 (__ss_family was changed on AIX 5.3)
Nikita Popov [Mon, 30 Dec 2013 13:41:45 +0000 (14:41 +0100)]
Merge branch 'PHP-5.6'
Nikita Popov [Mon, 30 Dec 2013 13:37:32 +0000 (14:37 +0100)]
Throw warning when converting invalid string to GMP
Michael Wallner [Mon, 30 Dec 2013 13:32:25 +0000 (14:32 +0100)]
This should be an empty merge.
Merge branch 'PHP-5.6'
* PHP-5.6:
update php.ini-*
Add E_DEPRECATED when populating $HTTP_RAW_POST_DATA
add 'never'
fix type
fix type; add tests for -1
s/BOOLEAN/ENTRY/
re-introduce always_populate_raw_post_data
Michael Wallner [Tue, 10 Dec 2013 15:28:51 +0000 (16:28 +0100)]
update php.ini-*
Michael Wallner [Tue, 10 Dec 2013 14:35:41 +0000 (15:35 +0100)]
Add E_DEPRECATED when populating $HTTP_RAW_POST_DATA
Michael Wallner [Wed, 27 Nov 2013 11:19:47 +0000 (12:19 +0100)]
add 'never'
Michael Wallner [Wed, 27 Nov 2013 11:19:32 +0000 (12:19 +0100)]
fix type
Michael Wallner [Tue, 26 Nov 2013 14:29:39 +0000 (15:29 +0100)]
fix type; add tests for -1
Michael Wallner [Tue, 26 Nov 2013 14:07:29 +0000 (15:07 +0100)]
s/BOOLEAN/ENTRY/
Michael Wallner [Tue, 26 Nov 2013 14:03:37 +0000 (15:03 +0100)]
re-introduce always_populate_raw_post_data
Nikita Popov [Mon, 30 Dec 2013 12:59:55 +0000 (13:59 +0100)]
Merge branch 'PHP-5.6'
Nikita Popov [Mon, 30 Dec 2013 12:58:29 +0000 (13:58 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
Nikita Popov [Mon, 30 Dec 2013 12:54:58 +0000 (13:54 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
Nikita Popov [Mon, 30 Dec 2013 12:46:55 +0000 (13:46 +0100)]
Fix leak caused by fix to bug #65667
ftp->stream is now closed in the ftp resource dtor.
Remi Collet [Mon, 30 Dec 2013 09:00:19 +0000 (10:00 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
missing file from libzip 0.11.2
Remi Collet [Mon, 30 Dec 2013 09:00:02 +0000 (10:00 +0100)]
missing file from libzip 0.11.2
Remi Collet [Mon, 30 Dec 2013 07:47:23 +0000 (08:47 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix compat for PHP ABI changes
Remi Collet [Mon, 30 Dec 2013 07:47:16 +0000 (08:47 +0100)]
fix compat for PHP ABI changes
Remi Collet [Mon, 30 Dec 2013 06:45:17 +0000 (07:45 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
Remi Collet [Mon, 30 Dec 2013 06:45:09 +0000 (07:45 +0100)]
NEWS
Remi Collet [Mon, 30 Dec 2013 06:38:45 +0000 (07:38 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Sync with pecl/zip 1.12.4dev
Remi Collet [Mon, 30 Dec 2013 06:35:30 +0000 (07:35 +0100)]
Sync with pecl/zip 1.12.4dev
- update bunled libzip to 0.11.2
- expose zip_file_set_external_attributes + zip_file_get_external_attributes
with new methods:
ZipArchive::setExternalAttributesName
ZipArchive::setExternalAttributesIndex
ZipArchive::getExternalAttributesName
ZipArchive::getExternalAttributesIndex