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)
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
...
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.
bwoebi [Wed, 16 Oct 2013 14:04:23 +0000 (16:04 +0200)]
Fixed bug #65911 ($this not usable as static property)
In context of static accesses like classname::$this, the string
"$this" should not be handled like a $this variable, but as an
identifier for a static variable.
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
# By Daniel Lowrey (1) and Michael Wallner (1)
# Via Michael Wallner
* 'PHP-5.4' of https://git.php.net/repository/php-src:
C89 compatibility
Fixed segfault when built with OpenSSL >= 1.0.1
Merge branch 'PHP-5.4' of https://git.php.net/push/php-src into PHP-5.4
* 'PHP-5.4' of https://git.php.net/push/php-src:
- Fixed bug #65818 (Segfault with built-in webserver and chunked transfer encoding)
- BFN
Fix bug #65667: ftp_nb_continue produces segfault
fix bug #64146 (serialize incorrectly saving objects when they are cloned)
such a weird hack probably helps in finding regressions in the future
Fixed bug #64230 (XMLReader does not suppress errors)
typo: really fix bug #51936 Crash with clone xmlreader
fix bug #59613 (Crash with clone XMLReader)
fix bug #65808 the socket_connect() won't work with IPv6 address
5.4.22-dev now
fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
Fixed bug #61548
fix test
fix memleak on resetting rebind_proc
Fix bug #65322: compile time errors won't trigger auto loading
5.4.20 release date
Add information about which INI file is which inside respective files
- Updated to version 2013.6 (2013f)
FIX BUG #65219 - USE DB not being sent for FreeTDS version < 0.92
FreeTDS <0.92 does not support DBSETLDBNAME option and therefore
will not work with SQL Azure. Fallback to dbuse command in
letter versions.
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
* 'PHP-5.4' of https://git.php.net/repository/php-src:
Fix bug #65667: ftp_nb_continue produces segfault
fix bug #64146 (serialize incorrectly saving objects when they are cloned)
such a weird hack probably helps in finding regressions in the future
the idea behind ftp_nb_get is for it to be followed by multiple calls
to ftp_nb_continue in order to download a file piece-by-piece.
As such, it's unwise to close the stream used to write the downloaded
data to when the file hasn't been completely downloaded within the first
call to ftp_nb_get.
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
* 'PHP-5.4' of https://git.php.net/repository/php-src:
typo: really fix bug #51936 Crash with clone xmlreader
fix bug #59613 (Crash with clone XMLReader)
fix bug #65808 the socket_connect() won't work with IPv6 address
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
# By Michael Wallner
# Via Michael Wallner
* 'PHP-5.4' of https://git.php.net/repository/php-src:
fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
Fixed bug #61548
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
# By Michael Wallner (2) and others
# Via Michael Wallner
* 'PHP-5.4' of https://git.php.net/repository/php-src:
fix test
fix memleak on resetting rebind_proc
Fix bug #65322: compile time errors won't trigger auto loading
5.4.20 release date
Fix bug #65322: compile time errors won't trigger auto loading
Also fixes duplicate bugs #54054 and #42098.
Furthermore this fixes incorrect error messages thrown from code
running inside an error handler when a compilation is in progress.
The error file and line are now correctly associated with the
file/line of the executor, rather than the compiler.
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
# By Derick Rethans (1) and others
# Via Lior Kaplan (1) and Stanley Sufficool (1)
* 'PHP-5.4' of https://git.php.net/repository/php-src:
Add information about which INI file is which inside respective files
- Updated to version 2013.6 (2013f)
FIX BUG #48539 - Disable TEXTLIMIT for FreeTDS driver
Merge branch 'PHP-5.4' of https://git.php.net/push/php-src into PHP-5.4
* 'PHP-5.4' of https://git.php.net/push/php-src: (140 commits)
Copy dba_*() keys before converting to string.
Fix the broken sh syntax in ext/imap/config.m4.
Revert "EmptyIterator now implements Countable; fixes bug 60577"
RFC 6598 reserved ip range starts at 100.64.0.0
fix a very rare case of use of uninitialized value combined with a memleak
NEWS for added reserved ip addresses according to RFC 6598
Add RFC 6598 IPs to reserved addresses
NEWS for #60577
NEWS for bug #64441
Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
EmptyIterator now implements Countable; fixes bug 60577
News for bugfix #64157
Bug 64157 Changed error message to make sense
Tinker with the wording of the short_open_tag description.
Handle CLI server request headers case insensitively.
5.4.21 now
Typo....
Add a XFAIL test for #64896
Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
Fixed bug #60598 (cli/apache sapi segfault on objects manipulation)
...
Adam Harvey [Sun, 22 Sep 2013 23:46:17 +0000 (16:46 -0700)]
Copy dba_*() keys before converting to string.
A nice Sunday afternoon project for somebody would be to refactor the dba
functions to use zend_parse_parameters() reliably and try to untangle some of
the macros in dba.c. Sadly, it is not a nice Sunday afternoon here.
Fixes bug #65708 (dba functions cast $key param to string in-place, bypassing
copy on write).
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
# By David Soria Parra (6) and others
# Via David Soria Parra
* 'PHP-5.4' of https://git.php.net/repository/php-src:
Revert "EmptyIterator now implements Countable; fixes bug 60577"
RFC 6598 reserved ip range starts at 100.64.0.0
fix a very rare case of use of uninitialized value combined with a memleak
NEWS for added reserved ip addresses according to RFC 6598
Add RFC 6598 IPs to reserved addresses
NEWS for #60577
NEWS for bug #64441
Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
EmptyIterator now implements Countable; fixes bug 60577
News for bugfix #64157
Bug 64157 Changed error message to make sense