String size refactor take 2 #3
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
weltling
commented
Aug 13, 2013
weltling
commented
- started to make fixes in ext/standard
- several other places fixed
- merged php-src/master multiple times
* PHP-5.5: Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro.
* bug65028: fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents
* PHP-5.4: fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents
* PHP-5.5: fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents
Includes Oracle Database 12c Implicit Result Set support, DTrace support, and various code cleanups. See package.xml for details.
* oci8_20: Initial PHP OCI8 2.0.0-dev commit.
… PHP-5.4 # By Xinchen Hui (2) and others # Via Stanislav Malyshev (1) and Xinchen Hui (1) * 'PHP-5.4' of https://git.php.net/repository/php-src: Upper section name Fixed bug #65328 (Segfault when getting SplStack object Value) Fix compiler warning on redefined constant fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents
… PHP-5.5 # By Johannes Schlüter (3) and others # Via Xinchen Hui (3) and others * 'PHP-5.5' of https://git.php.net/repository/php-src: Upper section name Update NEWs Fixed bug #65328 (Segfault when getting SplStack object Value) Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro. fix missing include Fix bug 65299 Fix compiler warning on redefined constant Fix comment fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents
# By Johannes Schlüter (3) and others # Via Johannes Schlüter (4) and others * 'master' of https://git.php.net/repository/php-src: Upper section name Update NEWs Fixed bug #65328 (Segfault when getting SplStack object Value) Initial PHP OCI8 2.0.0-dev commit. Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro. fix missing include Fix bug 65299 Fix compiler warning on redefined constant Fix comment fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt fix bug #65028 Phar::buildFromDirectory creates corrupt archives for some specific contents
… PHP-5.4 * 'PHP-5.4' of https://git.php.net/repository/php-src: Upper section name Fixed bug #65328 (Segfault when getting SplStack object Value)
… PHP-5.5 * 'PHP-5.5' of https://git.php.net/repository/php-src: Upper section name Update NEWs Fixed bug #65328 (Segfault when getting SplStack object Value)
* 'master' of https://git.php.net/repository/php-src: Upper section name Update NEWs Fixed bug #65328 (Segfault when getting SplStack object Value)
… PHP-5.4 * 'PHP-5.4' of https://git.php.net/repository/php-src:
… PHP-5.5 * 'PHP-5.5' of https://git.php.net/repository/php-src:
* 'master' of https://git.php.net/repository/php-src: Update UPGRADING and make typo fixes to OCI8 package.xml
* 'master' of https://git.php.net/repository/php-src: Fix --enable-maintainer-zts mode in OCI8 2.0
…rit the parent's current prefetch count
* PHP-5.5: Fix #61345: fix install of CGI binary Fix #61345: fix install of CGI binary
* pull-request/402: bison upgrading notes use $YACC instead of 'bison' as suggested by Yasuo improve comments and messages as suggested add excluded version exmaple make the bison version check a blacklist
* pull-request/325: Add schema default/fixed value support
* PHP-5.5: Add schema default/fixed value support
tests for error1: not well formed xml tests for error2: not well formed xml attribute without colon tests for error2: not well formed xml, typo tests for error4: wrong xml version tests for error5: extra content at the end of the doc tests libxml_dtd_load tests libxml_dtd_valid tests for libdtd_noerror tests for LIBXML_DTDATTR, LIBXML_NOCDATA, LIBXML_NOENT and LIBXML_NOBLANKS the basic behavior fix comments
…directory for the php source code. It fixs the fail on the load of the dtd in the tests modified by this commit.
* PHP-5.5: Embeds the content of the DTD in the DOCTYPE declaration of the XML files. Adds 2 new xml files which include the dtd path relative to the base directory for the php source code. It fixs the fail on the load of the dtd in the tests modified by this commit. Adds files: error 1 to 5 and variation 1 to 4
* PHP-5.4: ensure notices are not ignored when tests need them
* PHP-5.5: ensure notices are not ignored when tests need them
* PHP-5.5: use mysqlnd, some tests fail otherwise
… script description
This recalls 14caf17
* PHP-5.4: fixed strndup usage in the pgsql ext
* PHP-5.5: fixed strndup usage in the pgsql ext
* PHP-5.4: removed unused vars
* PHP-5.5: removed unused vars
…ize_refactor_take_2 Conflicts: Zend/zend_operators.h main/SAPI.h main/rfc1867.c main/streams/php_stream_transport.h main/streams/streams.c main/streams/transports.c main/streams/xp_socket.c
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.