Pierre Joye [Mon, 4 Nov 2013 21:26:40 +0000 (22:26 +0100)]
Merge branch 'master' of git.php.net:php-src
# By Remi Collet (2) and Xinchen Hui (2)
# Via Xinchen Hui (5) and Remi Collet (1)
* 'master' of git.php.net:php-src:
NEWS + UPGRADING
Sync ext/zip with pecl/zip version 1.3.2 - update libzip to version 1.11.1. We don't use any private symbol anymore - new method ZipArchive::setPassword($password) - add --with-libzip option to build with system libzip
Fixed coredump due to abnormal implemention of phar
remove "PHP 6" staff
Remi Collet [Mon, 4 Nov 2013 12:23:36 +0000 (13:23 +0100)]
Sync ext/zip with pecl/zip version 1.3.2
- update libzip to version 1.11.1. We don't use any private symbol anymore
- new method ZipArchive::setPassword($password)
- add --with-libzip option to build with system libzip
Sherif Ramadan [Wed, 30 Oct 2013 13:36:19 +0000 (09:36 -0400)]
Merge branch 'pull-request/287'
Add ability to use array keys with array_filter().
This adds a third (optional) argument to array_filter() that will determine
what gets passed to the callback, the array key, value or both.
The third argument can be one of two constants: ARRAY_FILTER_USE_BOTH or,
ARRAY_FILTER_USE_KEY.
Nikita Popov [Tue, 29 Oct 2013 19:58:30 +0000 (20:58 +0100)]
Fix bug #65997 by switching to Serializable for GMP
Rather than using get_properties and __wakeup for serialization
the code now uses Serializable::serialize() and
Serializable::unserialize(). The get_properties handler is switched
to a get_debug_info handler. Thus get_gc will now return only
the normal properties and not do any modifications, thus fixing
the leak. This also avoids a $num property from being publicly
visible after the object was dumped or serialized, so that's an
extra plus.
Yasuo Ohgaki [Tue, 29 Oct 2013 08:30:47 +0000 (17:30 +0900)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src: (22 commits)
add bundled libzip LICENSE, as required by BSD License terms
Avoid copy in func_get_arg()
- Updated to version 2013.8 (2013h)
Use zval* instead of zval**
Increased limit for opcache.max_accelerated_files to 1,000,000. (Chris)
Improved performance of array_merge() by eliminating useless copying
Improved performance of func_get_args() by eliminating useless copying
fix limitation of upload size == (U)INT_MAX in CGI
Link to more readmes
test commit
increase backlog to the highest value everywhere
Update NEWS
Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
- test3
- test commit 2
- test commit1
ldap_escape() notes
- Updated to version 2013.7 (2013g)
Increment version number, since this will be 5.5.6.
Added Zend Debugger to the note about the load order (by trash4you at online dot de)
...
Yasuo Ohgaki [Tue, 29 Oct 2013 08:24:48 +0000 (17:24 +0900)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
add bundled libzip LICENSE, as required by BSD License terms
- Updated to version 2013.8 (2013h)
Use zval* instead of zval**
Increased limit for opcache.max_accelerated_files to 1,000,000. (Chris)
Improved performance of array_merge() by eliminating useless copying
Improved performance of func_get_args() by eliminating useless copying
Link to more readmes
increase backlog to the highest value everywhere
Update NEWS
Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
- Updated to version 2013.7 (2013g)
Increment version number, since this will be 5.5.6.
Added Zend Debugger to the note about the load order (by trash4you at online dot de)
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)
Dmitry Stogov [Mon, 28 Oct 2013 09:50:04 +0000 (13:50 +0400)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
increase backlog to the highest value everywhere
Update NEWS
Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
Dmitry Stogov [Mon, 28 Oct 2013 09:48:02 +0000 (13:48 +0400)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
increase backlog to the highest value everywhere
Update NEWS
Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
Antony Dovgal [Mon, 28 Oct 2013 09:47:13 +0000 (13:47 +0400)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
* 'PHP-5.5' of https://git.php.net/repository/php-src:
Improved performance of func_get_args() by eliminating useless copying
Link to more readmes
Update NEWS
Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
Antony Dovgal [Mon, 28 Oct 2013 09:46:40 +0000 (13:46 +0400)]
Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
Improved performance of func_get_args() by eliminating useless copying
fix limitation of upload size == (U)INT_MAX in CGI
Link to more readmes
test commit
Update NEWS
Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
Yasuo Ohgaki [Mon, 28 Oct 2013 09:36:51 +0000 (18:36 +0900)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Improved performance of func_get_args() by eliminating useless copying
fix limitation of upload size == (U)INT_MAX in CGI
Link to more readmes
test commit
- test3
- test commit 2
- test commit1
Antony Dovgal [Sun, 27 Oct 2013 18:54:47 +0000 (22:54 +0400)]
increase backlog to the highest value everywhere
It makes no sense to use -1 for *BSD (which is the highest value there)
and still use 128 for Linux.
Lets raise it right to up the limit and let the people lower it if they
think that 3.5Mb is too much for a process.
IMO this is better than silently dropping connections.
Yasuo Ohgaki [Tue, 22 Oct 2013 03:29:41 +0000 (12:29 +0900)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src: (270 commits)
Fixed bug #65939 (Space before ";" breaks php.ini parsing). (brainstorm at nopcode dot org)
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
fix bug #65936 (dangling context pointer causes crash)
remove TRAVIS check in test source
Fixed compilation warning
Just SKIP that test on travis
Fixed issue #115 (path issue when using phar).
fix memory leak on error (from Coverity scan)
fix argument type & remove warning
fix const warnings in intl methods
Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
fix possibility of access to *storedType without initialization
Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
5.4.21 release date
fix argument type & remove warning
fix const warnings in intl methods
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 coverity issue with -1 returned by findOffset not being handled by getPreferredTag
...
Yasuo Ohgaki [Tue, 22 Oct 2013 03:27:47 +0000 (12:27 +0900)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src: (178 commits)
Fixed bug #65939 (Space before ";" breaks php.ini parsing). (brainstorm at nopcode dot org)
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
fix bug #65936 (dangling context pointer causes crash)
remove TRAVIS check in test source
Fixed compilation warning
Just SKIP that test on travis
Fixed issue #115 (path issue when using phar).
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
fix argument type & remove warning
fix const warnings in intl methods
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 coverity issue with -1 returned by findOffset not being handled by getPreferredTag
fix possibility of access to *storedType without initialization
5.4.21 release date
Fix typo
These getpwnam('') tests are silly and not portable
...
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
...
projects / php / log