and others added 30 commits
October 19, 2013 13:27
Conflicts: Zend/acinclude.m4
Fix RFC 6598 IPv4 Reserved Range Checks
Fix RFC 6598 IPv4 Reserved Range Checks
Fix RFC 6598 IPv4 Reserved Range Checks
hmm, we can check whether the head file exists instead This reverts commit 4d7d856 .
An array of zval* is allocated, but sizeof(zval **) is used. Makes no practical difference as sizeof(zval *) == sizeof(zval **).
Z_ARRVAL_P() is never NULL
* PHP-5.4: Initialize these to make Coverity happy Typo fix: managment -> management Use minus sign instead of hyphen Merge branch 'pull-request/499' Fix RFC 6598 IPv4 Reserved Range Checks
* PHP-5.5: Initialize these to make Coverity happy Typo fix: managment -> management Use minus sign instead of hyphen Merge branch 'pull-request/499' Fix RFC 6598 IPv4 Reserved Range Checks
* PHP-5.5: Trivial Coverity fix
* PHP-5.4: Fix unitialized opened_path here - found by Coverity
* PHP-5.5: Fix unitialized opened_path here - found by Coverity
* PHP-5.4: - Fixed possible memory leak
* PHP-5.5: - Fixed possible memory leak
* PHP-5.4: - Moved allocation to if block to make Coverity happy
Conflicts: ext/spl/tests/SplFileObject_rewind_error001.phpt
* 'PHP-5.5' of git.php.net:php-src: 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 Revert "Fixed issue php#115 (path issue when using phar)." Remove outdate codes, make it clearer, although just a bit.. Update NEWS Fixed Bug #66034 (Segmentation Fault when constructor of PDO statement throws an exception) Fixed coredump due to abnormal implemention of phar Typo fix: umknown -> unknown Fix bug #66008 5.4.23-dev remove "PHP 6" staff
* '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 php#293 (Exif crash on unknown encoding was fixed) By: Draal Conflicts: configure.in main/php_version.h Just SKIP that test on travis ...
…o strings
* PHP-5.4: Fix bug #65946 - pdo_sql_parser.c permanently converts values bound to strings Conflicts: ext/pdo/pdo_sql_parser.c
* PHP-5.5: Fix bug #65946 - pdo_sql_parser.c permanently converts values bound to strings
Although the doc said it is (unsigned int *), but it is ulong* in the libmysql 5.0 's source codes
…n 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
* PHP-5.5: Added tests for PHAR/OPCahce incompatibilities Update NEWS Fixed bug #65947 (basename is no more working after fgetcsv in certain situation) Update NEWS Fixed Bug #66043 (Segfault calling bind_param() on mysqli) NEWS entry NEWS entry Conflicts: NEWS
Fixed issue php#149 (Phar mount points not working with OPcache enabled).
* upstream/PHP-5.6: (399 commits) Fixed issue php#115 (path issue when using phar). Fixed issue php#149 (Phar mount points not working with OPcache enabled). Added tests for PHAR/OPCahce incompatibilities Update NEWS Fixed bug #65947 (basename is no more working after fgetcsv in certain situation) Update NEWS Fixed Bug #66043 (Segfault calling bind_param() on mysqli) NEWS entry NEWS entry Fix bug #65946 - pdo_sql_parser.c permanently converts values bound to strings bump API versions 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 Revert "Fixed issue php#115 (path issue when using phar)." Update LiteSpeed SAPI code to V6.4 Fixed typo in Makefile.frag updated NEWS Remove outdate codes, make it clearer, although just a bit.. Update NEWS ... Conflicts: Zend/zend_compile.h
FIX ALL THE THINGS
* lgnome/use-function: Only check user functions for filenames.
Closed