Bob Weinand [Sat, 21 Dec 2013 18:22:47 +0000 (19:22 +0100)]
Added an opcode to opcode name map
That way extensions etc. don't have to maintain their own lists anymore.
Also as phpdbg is included and needs such a map, it'd be counterproductive to need to change two things on every new opcode.
Boris Lytochkin [Thu, 19 Dec 2013 21:00:46 +0000 (01:00 +0400)]
Merge branch '5.4' into PHP-5.4
* 5.4:
keep 'em sorted
Fixed SNMP_ERR_TOOBIG handling for bulk walk operations
Boris Lytochkin [Thu, 19 Dec 2013 20:51:59 +0000 (00:51 +0400)]
keep 'em sorted
Boris Lytochkin [Thu, 19 Dec 2013 20:25:16 +0000 (00:25 +0400)]
Fixed SNMP_ERR_TOOBIG handling for bulk walk operations
Remi Collet [Thu, 19 Dec 2013 09:53:38 +0000 (10:53 +0100)]
Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
Michael Wallner [Thu, 19 Dec 2013 09:04:32 +0000 (10:04 +0100)]
Update NEWS handling section of README.GIT-RULES
See http://marc.info/?t=
138124004400005&r=1&w=2
Anatol Belski [Tue, 17 Dec 2013 07:44:22 +0000 (08:44 +0100)]
fixed possibly uninitialized value usage
Stanislav Malyshev [Sun, 8 Dec 2013 23:37:35 +0000 (15:37 -0800)]
Fix bug #65873 - Integer overflow in exif_read_data()
Anatol Belski [Sat, 14 Dec 2013 19:43:02 +0000 (20:43 +0100)]
fixed parameter order for zend_throw_exception_ex call
DQNEO [Fri, 13 Dec 2013 21:20:37 +0000 (23:20 +0200)]
Fix doc (svn -> git)
Julien Pauli [Fri, 13 Dec 2013 12:26:16 +0000 (13:26 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Updated release process
Julien Pauli [Fri, 13 Dec 2013 12:16:54 +0000 (13:16 +0100)]
Updated release process
Michael Wallner [Thu, 12 Dec 2013 11:08:50 +0000 (12:08 +0100)]
fix test
Anatol Belski [Wed, 11 Dec 2013 12:31:29 +0000 (13:31 +0100)]
fix dir separator in cve-2013-6420 test
Stanislav Malyshev [Tue, 10 Dec 2013 19:32:11 +0000 (11:32 -0800)]
5.3.29-dev
Stanislav Malyshev [Sun, 8 Dec 2013 19:40:18 +0000 (11:40 -0800)]
Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
Adam Harvey [Sun, 8 Dec 2013 03:39:40 +0000 (19:39 -0800)]
Switch to using freetype-config for freetype detection.
This fixes GD compilation against libfreetype 2.5.1 and later after they made
the rather interesting decision to change their include directory layout in a
point release.
The original suggestion in the bug was to use pkg-config, but my inclination is
to use freetype-config instead: we should be able to get the same configuration
information without actually needing pkg-config installed, since pkg-config is
by no means guaranteed to exist on many Unices and distros, whereas
freetype-config should always be present if a libfreetype build environment is
installed. Let's try it out and see what happens.
Fixes bug #64405 (Use freetype-config for determining freetype2 dir(s)).
Anatol Belski [Wed, 11 Dec 2013 12:32:49 +0000 (13:32 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
fix dir separator in cve-2013-6420 test
Ard Biesheuvel [Tue, 10 Dec 2013 11:07:46 +0000 (12:07 +0100)]
Zend: fix overflow handling bug in non-x86 fast_add_function()
The 'result' argument of fast_add_function() may alias with either
of its operands (or both). Take care not to write to 'result' before
reading op1 and op2.
Stanislav Malyshev [Tue, 10 Dec 2013 19:34:45 +0000 (11:34 -0800)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src:
Fixed Bug #66218 zend_register_functions breaks reflection
Stanislav Malyshev [Tue, 10 Dec 2013 19:33:40 +0000 (11:33 -0800)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
5.3.29-dev
Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
Conflicts:
configure.in
main/php_version.h
Remi Collet [Tue, 10 Dec 2013 15:07:16 +0000 (16:07 +0100)]
Fixed Bug #66218 zend_register_functions breaks reflection
Functions registered using zend_register_functions instead of zend_module_entry.functions are not seen on reflection.
Ex: additional_functions from api_module_entry.
Ex: in CLI, dl, cli_set_process_title and cli_get_process_title
Note:
- also affects functions overrided in extension
(should be be reported in extension, where overrided, not in original extension)
- also allow extension to call zend_register_functions for various list
(instead of having a single bug list)
Lior Kaplan [Fri, 4 Oct 2013 21:31:16 +0000 (23:31 +0200)]
Replace invalid code with a proper #error
This code creates a nasty error as mentioned in bugs #31131, #37062
Patch taken from Debian's PHP package: 044-strtod_arm_fix
Michael Wallner [Fri, 6 Dec 2013 09:29:24 +0000 (10:29 +0100)]
Fixed bug #61645 (fopen and O_NONBLOCK)
if a mode like "rn" was passed to fopen(), then
php_stream_parse_fopen_modes() would assign O_WRONLY to
flags, because O_NONBLOCK tainted flags for the r/w/+ check
Michael Wallner [Fri, 6 Dec 2013 09:27:33 +0000 (10:27 +0100)]
fix possibly uninitialized value
Andrey Hristov [Wed, 4 Dec 2013 10:06:59 +0000 (12:06 +0200)]
Fix loss of precision
Adam Harvey [Tue, 3 Dec 2013 22:46:15 +0000 (14:46 -0800)]
Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
These were returned to the general allocation pool by RFC 3330, and hence
shouldn't cause an IP address validation failure due to being reserved. At
least 128.0.0.0/16 is in use on the public Internet today.
Fixes bug #66229 (128.0.0.0/16 isn't reserved any longer).
Michael Wallner [Mon, 2 Dec 2013 15:58:34 +0000 (16:58 +0100)]
Fix bug #65196
Passing DOMDocumentFragment to DOMDocument::saveHTML()
produces invalid markup, because a DocumentFragment is just a container
for child nodes and not a real node itself.
Michael Wallner [Mon, 2 Dec 2013 11:08:22 +0000 (12:08 +0100)]
fix bug #49634x
Dmitry Stogov [Mon, 2 Dec 2013 07:53:35 +0000 (11:53 +0400)]
Fixed tests
Dmitry Stogov [Mon, 2 Dec 2013 06:59:32 +0000 (10:59 +0400)]
Fixed ability to build non-specialized GOTO VM
Dmitry Stogov [Fri, 29 Nov 2013 08:53:02 +0000 (12:53 +0400)]
Added validation of class names in the autoload process
Derick Rethans [Thu, 28 Nov 2013 16:32:11 +0000 (16:32 +0000)]
Fixed bug #65199 (Wrong Day of Week) and fixed bug #63391 (Incorrect/inconsistent day of week prior to the year 1600)
Derick Rethans [Thu, 28 Nov 2013 14:26:01 +0000 (14:26 +0000)]
Merge branch 'date-time-dst-rfc' into PHP-5.4
This is a partial resolve of some DST issues, plenty of things to do, but as
this *does* fix a few issues it's worth merging it already.
Derick Rethans [Thu, 28 Nov 2013 14:24:39 +0000 (14:24 +0000)]
Marking those two as XFAIL for now.
Derick Rethans [Thu, 20 Jun 2013 08:28:23 +0000 (09:28 +0100)]
Fixed a few DST changeover issues.
Derick Rethans [Tue, 16 Apr 2013 15:31:10 +0000 (16:31 +0100)]
Move add/sub to timelib.
Derick Rethans [Sat, 13 Apr 2013 22:47:23 +0000 (23:47 +0100)]
Fix backwards transition diffs.
Derick Rethans [Sat, 13 Apr 2013 22:28:59 +0000 (23:28 +0100)]
Split up tests into their different categories.
Derick Rethans [Sat, 13 Apr 2013 17:45:51 +0000 (18:45 +0100)]
Group those tests a bit better, as some of the bd ones wanted a "ST" feature that doesn't exist yet.
Derick Rethans [Fri, 12 Apr 2013 10:24:14 +0000 (11:24 +0100)]
Fixed forward transitions in diffs.
Derick Rethans [Fri, 12 Apr 2013 10:23:49 +0000 (11:23 +0100)]
Always reset those parameters.
Derick Rethans [Sun, 31 Mar 2013 17:11:35 +0000 (18:11 +0100)]
Fixed "Forward Transition" construction of DateTime objects.
This fixes the issue in
https://wiki.php.net/rfc/datetime_and_daylight_saving_time#forward_transitions
There is a period during transition to DST where a time (such as 02:30) does
not exist. PHP already calculated the correct timestamp for this, but failed to
"rounded forward" to the existing correct hour value.
Derick Rethans [Wed, 27 Nov 2013 22:00:53 +0000 (22:00 +0000)]
Merge branch 'bug53879' into PHP-5.4
Derick Rethans [Wed, 27 Nov 2013 21:59:46 +0000 (21:59 +0000)]
Fixed bug #53879 (DateTime::createFromFormat() fails to parse cookie expiration date)
Dmitry Stogov [Wed, 27 Nov 2013 10:58:54 +0000 (14:58 +0400)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src:
Fixed bug #66060 (Heap buffer over-read in DateInterval)
Dmitry Stogov [Wed, 27 Nov 2013 10:26:34 +0000 (14:26 +0400)]
Fixed bug #65969 (Chain assignment with T_LIST failure)
Remi Collet [Wed, 27 Nov 2013 10:13:16 +0000 (11:13 +0100)]
Fixed bug #66060 (Heap buffer over-read in DateInterval)
Stanislav Malyshev [Wed, 27 Nov 2013 08:13:45 +0000 (00:13 -0800)]
5.4.24-dev now
Andrey Hristov [Tue, 26 Nov 2013 17:15:12 +0000 (19:15 +0200)]
add test
Andrey Hristov [Tue, 26 Nov 2013 17:01:49 +0000 (19:01 +0200)]
Fix for Bug #66141 (mysqlnd quote function is wrong with NO_BACKSLASH_ESCAPES after failed query)
Andrey Hristov [Mon, 25 Nov 2013 19:31:51 +0000 (21:31 +0200)]
bring the news
Anatol Belski [Thu, 21 Nov 2013 20:24:47 +0000 (21:24 +0100)]
fixed test
Andrey Hristov [Thu, 21 Nov 2013 19:29:21 +0000 (21:29 +0200)]
And here is the real fix for #66124
Andrey Hristov [Thu, 21 Nov 2013 19:14:42 +0000 (21:14 +0200)]
Fix for Bug #66124 (mysqli under mysqlnd loses precision when bind_param with 'i')
Anatol Belski [Wed, 20 Nov 2013 09:09:11 +0000 (10:09 +0100)]
permanently deactivate that place, not on runtime only
besides the two "if" checks, this fixes static analyze which is sometimes
broken because of this
Yasuo Ohgaki [Tue, 19 Nov 2013 22:17:53 +0000 (07:17 +0900)]
Fix WS in serialization_error_002.phpt
Aaron Hamid [Mon, 18 Nov 2013 03:59:42 +0000 (22:59 -0500)]
added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean
Jeff Welch [Fri, 8 Nov 2013 18:07:22 +0000 (13:07 -0500)]
Fixed tests that fail with non-default `serialize_precision` configurations.
See:
* https://bugs.php.net/bug.php?id=64760
*
4dc4302
Remi Collet [Tue, 19 Nov 2013 11:41:58 +0000 (12:41 +0100)]
avoid doing a stream_select on a closed stream
Xinchen Hui [Sun, 17 Nov 2013 09:04:37 +0000 (17:04 +0800)]
Fixed Bug #66094 (unregister_tick_function tries to cast a Closure to a string)
Adam Harvey [Sun, 10 Nov 2013 20:46:31 +0000 (15:46 -0500)]
Update NEWS and remove the unnecessary UPGRADING note.
Adam Harvey [Sun, 10 Nov 2013 20:43:56 +0000 (15:43 -0500)]
Merge remote-tracking branch 'ajf/JSONWhitespaceFix' into PHP-5.4
Rasmus Lerdorf [Sat, 9 Nov 2013 17:45:52 +0000 (09:45 -0800)]
Fix broken test
Xinchen Hui [Fri, 8 Nov 2013 07:32:28 +0000 (15:32 +0800)]
Fixed bug #65947 (basename is no more working after fgetcsv in certain situation)
previous codes: "#define php_mblen(ptr, len) ((ptr) == NULL ? mbsinit(&BG(mblen_state)):
(int)mbrlen(ptr, len, &BG(mblen_state)))#
it use mbsinit there, seems try to initialize the mblen_state, but:
"This function does not change the state identified by ps. Typical ways
to make the state pointed by ps an initial state are:
memset (ps,0,sizeof(*ps)); // ps points to zero-valued object
"
http://www.cplusplus.com/reference/cwchar/mbsinit/?kw=mbsinit
Xinchen Hui [Fri, 8 Nov 2013 07:06:36 +0000 (15:06 +0800)]
Fixed Bug #66043 (Segfault calling bind_param() on mysqli)
Although the doc said it is (unsigned int *), but it is ulong* in the
libmysql 5.0 's source codes
Rasmus Lerdorf [Fri, 8 Nov 2013 02:15:15 +0000 (18:15 -0800)]
NEWS entry
Rasmus Lerdorf [Fri, 8 Nov 2013 02:05:08 +0000 (18:05 -0800)]
Fix bug #65946 - pdo_sql_parser.c permanently converts values bound to strings
Rasmus Lerdorf [Thu, 7 Nov 2013 15:55:26 +0000 (07:55 -0800)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src: (65 commits)
Add a couple more test cases to parse_url() tests
fix missing change from 'tcp_socket' to the more common 'server'
fix many parallel test issues
Cleanup temp test file
Fixed Bug #66034 (Segmentation Fault when constructor of PDO statement throws an exception)
Typo fix: umknown -> unknown
Fix bug #66008
5.4.23-dev
Update NEWS
Fixed Bug 64760 var_export() does not use full precision for floating-point numbers
add bundled libzip LICENSE, as required by BSD License terms
- Updated to version 2013.8 (2013h)
remove "PHP 6" staff
Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
- Updated to version 2013.7 (2013g)
Fix Coverity issue reporting wrong sizeof()
exif NEWS
add tests for bug #62523
Merged PR #293 (Exif crash on unknown encoding was fixed) By: Draal Conflicts: configure.in main/php_version.h
Just SKIP that test on travis
...
Sara Golemon [Wed, 10 Jul 2013 15:26:47 +0000 (08:26 -0700)]
Add a couple more test cases to parse_url() tests
http://::# (valid but silly)
http://# (invalid)
ptarjan [Thu, 26 Sep 2013 08:06:36 +0000 (01:06 -0700)]
fix missing change from 'tcp_socket' to the more common 'server'
ptarjan [Thu, 26 Sep 2013 07:18:05 +0000 (00:18 -0700)]
fix many parallel test issues
While running these on HHVM I've run into a lot of parallelism issues.
I'm backporting all the fixes I had to do in
https://github.com/facebook/hiphop-php/blob/master/hphp/tools/import_zend_test.py#L650
to php core.
Most of these changes were just filenames that were shared between
tests, but I did more surgery on the fixed ports. I can apreciate port
31337 as much as the next nerd, but random ports are better for tests.
Christopher Jones [Wed, 10 Jul 2013 18:17:52 +0000 (11:17 -0700)]
Cleanup temp test file
Xinchen Hui [Tue, 5 Nov 2013 03:04:55 +0000 (11:04 +0800)]
Fixed Bug #66034 (Segmentation Fault when constructor of PDO statement throws an exception)
I know zend_call_function will initilize retval_ptr_ptr, but still set
it to NULL explict is more readable
Xinchen Hui [Tue, 5 Nov 2013 03:03:47 +0000 (11:03 +0800)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Lior Kaplan [Thu, 31 Oct 2013 21:12:41 +0000 (23:12 +0200)]
Typo fix: umknown -> unknown
Rasmus Lerdorf [Thu, 31 Oct 2013 10:06:35 +0000 (03:06 -0700)]
Fix bug #66008
Stanislav Malyshev [Wed, 30 Oct 2013 01:11:02 +0000 (18:11 -0700)]
5.4.23-dev
Yasuo Ohgaki [Tue, 29 Oct 2013 08:38:22 +0000 (17:38 +0900)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src:
add bundled libzip LICENSE, as required by BSD License terms
Yasuo Ohgaki [Tue, 29 Oct 2013 08:27:49 +0000 (17:27 +0900)]
Update NEWS
Yasuo Ohgaki [Tue, 29 Oct 2013 08:24:23 +0000 (17:24 +0900)]
Fixed Bug 64760 var_export() does not use full precision for floating-point numbers
Remi Collet [Tue, 29 Oct 2013 08:02:24 +0000 (09:02 +0100)]
add bundled libzip LICENSE, as required by BSD License terms
Yasuo Ohgaki [Tue, 29 Oct 2013 05:03:17 +0000 (14:03 +0900)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src:
- Updated to version 2013.8 (2013h)
Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
- Updated to version 2013.7 (2013g)
Derick Rethans [Mon, 28 Oct 2013 14:12:30 +0000 (15:12 +0100)]
- Updated to version 2013.8 (2013h)
Derick Rethans [Mon, 28 Oct 2013 14:08:57 +0000 (15:08 +0100)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Xinchen Hui [Sun, 27 Oct 2013 08:53:05 +0000 (16:53 +0800)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Xinchen Hui [Sun, 27 Oct 2013 08:52:43 +0000 (16:52 +0800)]
remove "PHP 6" staff
Yasuo Ohgaki [Sat, 26 Oct 2013 01:31:21 +0000 (10:31 +0900)]
Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
Derick Rethans [Wed, 23 Oct 2013 21:33:53 +0000 (22:33 +0100)]
- Updated to version 2013.7 (2013g)
Yasuo Ohgaki [Tue, 22 Oct 2013 03:27:18 +0000 (12:27 +0900)]
Fix Coverity issue reporting wrong sizeof()
Yasuo Ohgaki [Tue, 22 Oct 2013 03:23:07 +0000 (12:23 +0900)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src: (101 commits)
exif NEWS
add tests for bug #62523
Merged PR #293 (Exif crash on unknown encoding was fixed) By: Draal Conflicts: configure.in main/php_version.h
Just SKIP that test on travis
fix memory leak on error (from Coverity scan)
Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
5.4.21 release date
When src->src is null this doesn't get initialized but it is still used, so the passed in *ze will point to unitialized memory. Hopefully src->src is never null, but just in case this initialization doesn't hurt.
Fix typo
Clean up this weird safe_emalloc() call
Minor Coverity tweaks
- Moved NULL check before dereferencing
- Fixed possible NULL ptr dereference
- Fixed possible uninitialized scalar variable usage (spotted by Coverity)
Remove senseless check here
- Fix extern declaration according to definition
- Fix possible memory leak
- Moved allocation to if block to make Coverity happy
- Fixed possible memory leak
Fix unitialized opened_path here - found by Coverity
...
Michael Wallner [Mon, 21 Oct 2013 20:44:37 +0000 (22:44 +0200)]
exif NEWS
Michael Wallner [Mon, 21 Oct 2013 20:15:09 +0000 (22:15 +0200)]
add tests for bug #62523
Michael Wallner [Mon, 21 Oct 2013 19:48:27 +0000 (21:48 +0200)]
Merged PR #293 (Exif crash on unknown encoding was fixed)
By:
Draal
Conflicts:
configure.in
main/php_version.h
Michael Wallner [Mon, 21 Oct 2013 10:16:41 +0000 (12:16 +0200)]
Just SKIP that test on travis
Stanislav Malyshev [Mon, 21 Oct 2013 07:01:24 +0000 (00:01 -0700)]
fix memory leak on error (from Coverity scan)
Stanislav Malyshev [Mon, 21 Oct 2013 05:04:21 +0000 (22:04 -0700)]
Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
Stanislav Malyshev [Mon, 21 Oct 2013 02:59:39 +0000 (19:59 -0700)]
5.4.21 release date
Rasmus Lerdorf [Mon, 21 Oct 2013 05:15:35 +0000 (22:15 -0700)]
When src->src is null this doesn't get initialized
but it is still used, so the passed in *ze will point
to unitialized memory. Hopefully src->src is never
null, but just in case this initialization doesn't hurt.
Rasmus Lerdorf [Mon, 21 Oct 2013 00:55:55 +0000 (17:55 -0700)]
Fix typo