]>
granicus.if.org Git - php/log
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 04:57:33 +0000 (21:57 -0700)]
fix possibility of access to *storedType without initialization
Rasmus Lerdorf [Mon, 21 Oct 2013 05:18:33 +0000 (22:18 -0700)]
Merge branch 'PHP-5.5'
* PHP-5.5:
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 05:18:15 +0000 (22:18 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
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 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:56:24 +0000 (17:56 -0700)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Fix typo
Rasmus Lerdorf [Mon, 21 Oct 2013 00:56:14 +0000 (17:56 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix typo
Rasmus Lerdorf [Mon, 21 Oct 2013 00:55:55 +0000 (17:55 -0700)]
Fix typo
Rasmus Lerdorf [Sun, 20 Oct 2013 21:05:29 +0000 (14:05 -0700)]
Merge branch 'PHP-5.5'
* PHP-5.5:
These getpwnam('') tests are silly and not portable
Rasmus Lerdorf [Sun, 20 Oct 2013 21:04:47 +0000 (14:04 -0700)]
These getpwnam('') tests are silly and not portable
Rasmus Lerdorf [Sun, 20 Oct 2013 16:37:40 +0000 (09:37 -0700)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Clean up this weird safe_emalloc() call
Rasmus Lerdorf [Sun, 20 Oct 2013 16:37:25 +0000 (09:37 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Clean up this weird safe_emalloc() call
Rasmus Lerdorf [Sun, 20 Oct 2013 16:36:50 +0000 (09:36 -0700)]
Clean up this weird safe_emalloc() call
Rasmus Lerdorf [Sun, 20 Oct 2013 15:56:41 +0000 (08:56 -0700)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Minor Coverity tweaks
Rasmus Lerdorf [Sun, 20 Oct 2013 15:56:24 +0000 (08:56 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Minor Coverity tweaks
Rasmus Lerdorf [Sun, 20 Oct 2013 15:55:48 +0000 (08:55 -0700)]
Minor Coverity tweaks
Felipe Pena [Sun, 20 Oct 2013 11:50:17 +0000 (09:50 -0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
- Moved NULL check before dereferencing
Felipe Pena [Sun, 20 Oct 2013 11:50:13 +0000 (09:50 -0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- Moved NULL check before dereferencing
Felipe Pena [Sun, 20 Oct 2013 11:50:11 +0000 (09:50 -0200)]
- Moved NULL check before dereferencing
Felipe Pena [Sun, 20 Oct 2013 11:04:36 +0000 (09:04 -0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
- Fixed possible NULL ptr dereference
Felipe Pena [Sun, 20 Oct 2013 11:04:27 +0000 (09:04 -0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- Fixed possible NULL ptr dereference
Felipe Pena [Sun, 20 Oct 2013 11:04:24 +0000 (09:04 -0200)]
- Fixed possible NULL ptr dereference
Felipe Pena [Sun, 20 Oct 2013 10:52:31 +0000 (08:52 -0200)]
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
Felipe Pena [Sun, 20 Oct 2013 10:51:27 +0000 (08:51 -0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
- Fixed possible uninitialized scalar variable usage (spotted by Coverity)
Felipe Pena [Sun, 20 Oct 2013 10:51:17 +0000 (08:51 -0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- Fixed possible uninitialized scalar variable usage (spotted by Coverity)
Felipe Pena [Sun, 20 Oct 2013 10:51:09 +0000 (08:51 -0200)]
- Fixed possible uninitialized scalar variable usage (spotted by Coverity)
Rasmus Lerdorf [Sun, 20 Oct 2013 03:57:02 +0000 (20:57 -0700)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Remove senseless check here
Rasmus Lerdorf [Sun, 20 Oct 2013 03:56:01 +0000 (20:56 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Remove senseless check here
Rasmus Lerdorf [Sun, 20 Oct 2013 03:55:02 +0000 (20:55 -0700)]
Remove senseless check here
Felipe Pena [Sun, 20 Oct 2013 03:16:15 +0000 (01:16 -0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
- Fix extern declaration according to definition
Felipe Pena [Sun, 20 Oct 2013 03:16:10 +0000 (01:16 -0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- Fix extern declaration according to definition
Felipe Pena [Sun, 20 Oct 2013 03:16:07 +0000 (01:16 -0200)]
- Fix extern declaration according to definition
Felipe Pena [Sun, 20 Oct 2013 03:05:06 +0000 (01:05 -0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
- Fix possible memory leak
Felipe Pena [Sun, 20 Oct 2013 03:05:00 +0000 (01:05 -0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- Fix possible memory leak
Felipe Pena [Sun, 20 Oct 2013 03:04:55 +0000 (01:04 -0200)]
- Fix possible memory leak
Felipe Pena [Sun, 20 Oct 2013 02:36:41 +0000 (23:36 -0300)]
Merge branch 'PHP-5.5'
* PHP-5.5:
- Moved allocation to if block to make Coverity happy
Felipe Pena [Sun, 20 Oct 2013 02:36:36 +0000 (23:36 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- Moved allocation to if block to make Coverity happy
Felipe Pena [Sun, 20 Oct 2013 02:36:28 +0000 (23:36 -0300)]
- Moved allocation to if block to make Coverity happy
Felipe Pena [Sun, 20 Oct 2013 02:30:53 +0000 (23:30 -0300)]
Merge branch 'PHP-5.5'
* PHP-5.5:
- Fixed possible memory leak
Felipe Pena [Sun, 20 Oct 2013 02:30:12 +0000 (23:30 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- Fixed possible memory leak
Felipe Pena [Sun, 20 Oct 2013 02:29:34 +0000 (23:29 -0300)]
- Fixed possible memory leak
Rasmus Lerdorf [Sun, 20 Oct 2013 02:25:47 +0000 (19:25 -0700)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Fix unitialized opened_path here - found by Coverity
Rasmus Lerdorf [Sun, 20 Oct 2013 02:25:25 +0000 (19:25 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix unitialized opened_path here - found by Coverity
Rasmus Lerdorf [Sun, 20 Oct 2013 02:24:17 +0000 (19:24 -0700)]
Fix unitialized opened_path here - found by Coverity
Rasmus Lerdorf [Sun, 20 Oct 2013 00:56:21 +0000 (17:56 -0700)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Trivial Coverity fix
Rasmus Lerdorf [Sun, 20 Oct 2013 00:55:34 +0000 (17:55 -0700)]
Trivial Coverity fix
Rasmus Lerdorf [Sun, 20 Oct 2013 00:42:36 +0000 (17:42 -0700)]
Merge branch 'PHP-5.5'
* 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
Rasmus Lerdorf [Sun, 20 Oct 2013 00:41:04 +0000 (17:41 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* 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
Rasmus Lerdorf [Sun, 20 Oct 2013 00:37:59 +0000 (17:37 -0700)]
Initialize these to make Coverity happy
Nikita Popov [Sat, 19 Oct 2013 21:52:23 +0000 (23:52 +0200)]
Remove extraneous NULL check of Z_ARRVAL_P()
Z_ARRVAL_P() is never NULL
Nikita Popov [Sat, 19 Oct 2013 21:46:09 +0000 (23:46 +0200)]
Remove dead comparison (size_t < 0)
Nikita Popov [Sat, 19 Oct 2013 21:43:05 +0000 (23:43 +0200)]
Fix misleading sizeof
An array of zval* is allocated, but sizeof(zval **) is used.
Makes no practical difference as sizeof(zval *) == sizeof(zval **).
Nikita Popov [Sat, 19 Oct 2013 21:25:31 +0000 (23:25 +0200)]
Fix assignment in dummy_encoding_list_parser
Nikita Popov [Sat, 19 Oct 2013 21:22:20 +0000 (23:22 +0200)]
Use zend_error_noreturn for all E_COMPILE_ERRORs
Lior Kaplan [Sat, 19 Oct 2013 20:53:23 +0000 (23:53 +0300)]
Typo fix: managment -> management
Lior Kaplan [Sat, 19 Oct 2013 20:52:43 +0000 (23:52 +0300)]
Use minus sign instead of hyphen
Xinchen Hui [Sat, 19 Oct 2013 14:19:11 +0000 (22:19 +0800)]
Merge branch 'PHP-5.5'
Xinchen Hui [Sat, 19 Oct 2013 14:18:37 +0000 (22:18 +0800)]
Revert "Need a way to check whether this API exists"
hmm, we can check whether the head file exists instead
This reverts commit
4d7d85640dd8e48166e4fd5dbf04aeb18a9e01c4 .
Xinchen Hui [Sat, 19 Oct 2013 14:17:06 +0000 (22:17 +0800)]
Merge branch 'PHP-5.5'
Xinchen Hui [Sat, 19 Oct 2013 14:16:31 +0000 (22:16 +0800)]
Need a way to check whether this API exists
Rasmus Lerdorf [Sat, 19 Oct 2013 07:01:13 +0000 (00:01 -0700)]
Merge branch 'pull-request/499'
Fix RFC 6598 IPv4 Reserved Range Checks
Rasmus Lerdorf [Sat, 19 Oct 2013 07:01:13 +0000 (00:01 -0700)]
Merge branch 'pull-request/499'
Fix RFC 6598 IPv4 Reserved Range Checks
Rasmus Lerdorf [Sat, 19 Oct 2013 07:01:13 +0000 (00:01 -0700)]
Merge branch 'pull-request/499'
Fix RFC 6598 IPv4 Reserved Range Checks
Xinchen Hui [Sat, 19 Oct 2013 05:29:42 +0000 (13:29 +0800)]
Merge branch 'PHP-5.5'
Xinchen Hui [Sat, 19 Oct 2013 05:27:36 +0000 (13:27 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Michael Wallner [Fri, 9 Aug 2013 06:32:39 +0000 (08:32 +0200)]
use $YACC instead of 'bison' as suggested by Yasuo
Conflicts:
Zend/acinclude.m4
Michael Wallner [Fri, 18 Oct 2013 10:03:02 +0000 (12:03 +0200)]
Merge branch 'openssl_compile_warning_fix' of https://github.com/bukka/php-src
* 'openssl_compile_warning_fix' of https://github.com/bukka/php-src:
Fix compiler warnings in openssl.c
Michael Wallner [Fri, 18 Oct 2013 09:34:24 +0000 (11:34 +0200)]
fix compiler warnings and type usage
Michael Wallner [Fri, 18 Oct 2013 09:17:41 +0000 (11:17 +0200)]
Merge branch 'ldap_escape-dev' of https://github.com/DaveRandom/php-src
* 'ldap_escape-dev' of https://github.com/DaveRandom/php-src:
Add ldap_escape()
jrchamp [Fri, 18 Oct 2013 06:04:15 +0000 (02:04 -0400)]
Fix RFC 6598 IPv4 Range
jrchamp [Fri, 18 Oct 2013 06:01:06 +0000 (02:01 -0400)]
Fix 100.64 IPv4 Range Check
Xinchen Hui [Fri, 18 Oct 2013 02:40:44 +0000 (10:40 +0800)]
Merge branch 'zend-documentation-fix' of https://github.com/AskDrCatcher/php-src-1
Xinchen Hui [Fri, 18 Oct 2013 02:34:59 +0000 (10:34 +0800)]
Merge branch 'PHP-5.5'
Xinchen Hui [Fri, 18 Oct 2013 02:34:36 +0000 (10:34 +0800)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Xinchen Hui [Fri, 18 Oct 2013 02:33:53 +0000 (10:33 +0800)]
Retruning SUCCESS/FAILURE instead of int
ArunSK [Fri, 18 Oct 2013 02:00:40 +0000 (22:00 -0400)]
fixed typo and few grammar mistakes
Christopher Jones [Thu, 17 Oct 2013 20:49:50 +0000 (13:49 -0700)]
Add missing test to package.xml
Christopher Jones [Thu, 17 Oct 2013 19:15:45 +0000 (12:15 -0700)]
Prepare for OCI8 2.0.5 release
Christopher Jones [Thu, 17 Oct 2013 16:23:15 +0000 (09:23 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
TLS news
previous revert killed that file
Revert "TLS news"
Revert "Added support for TLSv1.1 and TLSv1.2"
TLS news
fix ws
Added support for TLSv1.1 and TLSv1.2
Added support for TLSv1.1 and TLSv1.2
Christopher Jones [Thu, 17 Oct 2013 16:21:39 +0000 (09:21 -0700)]
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:
Revert "TLS news"
Revert "Added support for TLSv1.1 and TLSv1.2"
TLS news
Added support for TLSv1.1 and TLSv1.2
Michael Wallner [Thu, 17 Oct 2013 13:47:55 +0000 (15:47 +0200)]
TLS news
Michael Wallner [Thu, 17 Oct 2013 13:32:18 +0000 (15:32 +0200)]
previous revert killed that file
Michael Wallner [Thu, 17 Oct 2013 13:27:15 +0000 (15:27 +0200)]
Merge branch 'updated_tls_support' of https://github.com/rdlowrey/php-src
* 'updated_tls_support' of https://github.com/rdlowrey/php-src:
Added support for TLSv1.1 and TLSv1.2
Conflicts:
ext/openssl/xp_ssl.c
Michael Wallner [Thu, 17 Oct 2013 13:22:07 +0000 (15:22 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Revert "TLS news"
Revert "Added support for TLSv1.1 and TLSv1.2"
Michael Wallner [Thu, 17 Oct 2013 13:21:34 +0000 (15:21 +0200)]
Michael Wallner [Thu, 17 Oct 2013 13:20:38 +0000 (15:20 +0200)]
Revert "Added support for TLSv1.1 and TLSv1.2"
This reverts commit
2aaa3d538a7b93d92c52aec95707d8230f21be65 .
Michael Wallner [Thu, 17 Oct 2013 13:13:25 +0000 (15:13 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
TLS news
Michael Wallner [Thu, 17 Oct 2013 13:13:12 +0000 (15:13 +0200)]
TLS news
Michael Wallner [Thu, 17 Oct 2013 13:09:28 +0000 (15:09 +0200)]
fix ws
Michael Wallner [Thu, 17 Oct 2013 12:53:50 +0000 (14:53 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Added support for TLSv1.1 and TLSv1.2
Conflicts:
ext/openssl/xp_ssl.c
Daniel Lowrey [Tue, 8 Oct 2013 17:54:22 +0000 (13:54 -0400)]
Added support for TLSv1.1 and TLSv1.2
Conflicts:
ext/openssl/xp_ssl.c
Christopher Jones [Thu, 17 Oct 2013 12:41:53 +0000 (05:41 -0700)]
Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
Assume the free space is correct on Travis CI.
Christopher Jones [Thu, 17 Oct 2013 12:40:57 +0000 (05:40 -0700)]
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:
Assume the free space is correct on Travis CI.
Michael Wallner [Thu, 17 Oct 2013 10:12:26 +0000 (12:12 +0200)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Assume the free space is correct on Travis CI.
Tjerk Meesters [Wed, 9 Oct 2013 01:06:33 +0000 (09:06 +0800)]
Assume the free space is correct on Travis CI.
Christopher Jones [Thu, 17 Oct 2013 05:33:34 +0000 (22:33 -0700)]
OCI8: More test updates
Christopher Jones [Thu, 17 Oct 2013 05:02:32 +0000 (22:02 -0700)]
OCI8: Mostly SKIPIF version updates to simplify version checks at the expense of not testing some edge cases with older Oracle patch set versions.
Delete two obsolete .phpt's.
Xinchen Hui [Thu, 17 Oct 2013 04:25:01 +0000 (12:25 +0800)]
Merge branch 'PHP-5.5'
Xinchen Hui [Thu, 17 Oct 2013 04:23:09 +0000 (12:23 +0800)]
Add ability of alias resolving (it cause problem while work with opcache)
Nikita Popov [Wed, 16 Oct 2013 16:39:13 +0000 (18:39 +0200)]
Merge branch 'PHP-5.5'