]>
granicus.if.org Git - php/log
Ferenc Kovacs [Wed, 23 Jul 2014 05:45:02 +0000 (07:45 +0200)]
ReflectionClass::newInstanceWithoutConstructor() should be allowed to instantiate every class except those internal classes with a final __construct()
Dmitry Stogov [Wed, 30 Jul 2014 06:40:06 +0000 (10:40 +0400)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed usage after free
Dmitry Stogov [Wed, 30 Jul 2014 06:39:25 +0000 (10:39 +0400)]
Fixed usage after free
Keyur Govande [Wed, 30 Jul 2014 02:41:01 +0000 (02:41 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Undo inadvertent commit of php_version
Corrected patch for bug #60616
Keyur Govande [Wed, 30 Jul 2014 02:34:46 +0000 (02:34 +0000)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Undo inadvertent commit of php_version
Corrected patch for bug #60616
Keyur Govande [Wed, 30 Jul 2014 02:34:21 +0000 (02:34 +0000)]
Undo inadvertent commit of php_version
Keyur Govande [Wed, 30 Jul 2014 02:28:31 +0000 (02:28 +0000)]
Corrected patch for bug #60616
For unixODBC, use ODBC version as defined by it (as of v2.2.14 it is 3.5).
This allows us to use newer features like SQL_DESC_OCTET_LENGTH (which
returns the number of bytes required to store the data). This fixes the issue
in #60616. If the newer version is not available, over-allocate to accomodate
4-byte Unicode characters for CHAR and VARCHAR datatypes (and their Wide
counterparts).
version.
Fixed a couple of failing tests.
Tjerk Meesters [Tue, 29 Jul 2014 11:15:01 +0000 (19:15 +0800)]
Wildcards should only be used in the first name component; fixed comment style
Keyur Govande [Mon, 28 Jul 2014 23:16:52 +0000 (23:16 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #60616 (odbc_fetch_into returns junk at end of multi-byte char fields)
Keyur Govande [Mon, 28 Jul 2014 23:16:20 +0000 (23:16 +0000)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #60616 (odbc_fetch_into returns junk at end of multi-byte char fields)
Keyur Govande [Mon, 28 Jul 2014 23:15:23 +0000 (23:15 +0000)]
Fix bug #60616 (odbc_fetch_into returns junk at end of multi-byte char fields)
The ODBC extension did not support WVARCHAR. WVARCHAR ends up being handled by
the default handler where vallen is set by the driver to the actual bytes
needed for the field. If it is larger than default-lrl then the output is
corrupted (reading past the buffer) because the return functions don't expect
that to happen. The patch add support to handle WVARCHAR just like a regular
VARCHAR.
Stanislav Malyshev [Sun, 27 Jul 2014 07:14:28 +0000 (00:14 -0700)]
fix SOAP for uninitialzed object
Stanislav Malyshev [Mon, 28 Jul 2014 07:39:00 +0000 (00:39 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix NEWS
Stanislav Malyshev [Mon, 28 Jul 2014 07:38:19 +0000 (00:38 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix NEWS
Stanislav Malyshev [Mon, 28 Jul 2014 07:38:10 +0000 (00:38 -0700)]
fix NEWS
Stanislav Malyshev [Mon, 28 Jul 2014 07:37:32 +0000 (00:37 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix missing type checks in various functions
Conflicts:
ext/openssl/openssl.c
Stanislav Malyshev [Mon, 28 Jul 2014 04:51:55 +0000 (21:51 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix missing type checks in various functions
Stanislav Malyshev [Sun, 27 Jul 2014 09:40:27 +0000 (02:40 -0700)]
Fix missing type checks in various functions
Stanislav Malyshev [Sun, 27 Jul 2014 01:00:16 +0000 (18:00 -0700)]
Fix SPL objects initialization checks
Stanislav Malyshev [Sat, 26 Jul 2014 22:52:51 +0000 (15:52 -0700)]
Add object initialization checks for sqlite3 classes
Ferenc Kovacs [Fri, 25 Jul 2014 11:15:27 +0000 (13:15 +0200)]
Revert "Fix bug #66568: the second arg for unserialize is optional." as we already reverted the introduction of the second arg.
This reverts commit
aefc8f22b35999624f3a579696cf68b389f41ae8 .
Conflicts:
NEWS
Stanislav Malyshev [Fri, 25 Jul 2014 05:58:29 +0000 (22:58 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
update NEWS
Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting)
Fixed Bug #67538 (SPL Iterators use-after-free)
Stanislav Malyshev [Fri, 25 Jul 2014 05:58:06 +0000 (22:58 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
update NEWS
Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting)
Fixed Bug #67538 (SPL Iterators use-after-free)
Stanislav Malyshev [Fri, 25 Jul 2014 05:55:39 +0000 (22:55 -0700)]
update NEWS
Xinchen Hui [Wed, 2 Jul 2014 09:57:42 +0000 (17:57 +0800)]
Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting)
Xinchen Hui [Wed, 2 Jul 2014 09:45:09 +0000 (17:45 +0800)]
Fixed Bug #67538 (SPL Iterators use-after-free)
Xinchen Hui [Fri, 25 Jul 2014 02:52:46 +0000 (10:52 +0800)]
Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
Xinchen Hui [Fri, 25 Jul 2014 02:52:41 +0000 (10:52 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Fri, 25 Jul 2014 02:52:27 +0000 (10:52 +0800)]
Add CVE no
Johannes Schlüter [Thu, 24 Jul 2014 16:01:35 +0000 (18:01 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
Johannes Schlüter [Thu, 24 Jul 2014 16:00:58 +0000 (18:00 +0200)]
BFN
Johannes Schlüter [Thu, 24 Jul 2014 16:00:06 +0000 (18:00 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Dmitry Saprykin [Thu, 24 Jul 2014 15:58:39 +0000 (17:58 +0200)]
Fix bug #67496 Save command history when exiting interactive shell with control-c
Johannes Schlüter [Thu, 24 Jul 2014 14:58:50 +0000 (16:58 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
Johannes Schlüter [Thu, 24 Jul 2014 14:58:05 +0000 (16:58 +0200)]
BFN
Johannes Schlüter [Thu, 24 Jul 2014 14:56:05 +0000 (16:56 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Thu, 24 Jul 2014 14:53:51 +0000 (16:53 +0200)]
Fix bug #55496 Interactive mode doesn't force a newline before the prompt
Tjerk Meesters [Thu, 24 Jul 2014 06:39:18 +0000 (14:39 +0800)]
Updated NEWS for #67666
Tjerk Meesters [Thu, 24 Jul 2014 06:36:31 +0000 (14:36 +0800)]
Fixed #67666 - Subject altName doesn't match wildcards
Dmitry Stogov [Wed, 23 Jul 2014 21:16:00 +0000 (01:16 +0400)]
Removed second zval_copy_ctor()
Dmitry Stogov [Wed, 23 Jul 2014 20:37:15 +0000 (00:37 +0400)]
Fixed crash on self-referencing constant expression (part of a constant AST)
Dmitry Stogov [Wed, 23 Jul 2014 18:47:58 +0000 (22:47 +0400)]
Fixed support for constant arrays in context of "const" statement (Zend/tests/constant_expressions_arrays.phpt failed when opcache.protect_memort was set)
Anatol Belski [Mon, 21 Jul 2014 12:47:40 +0000 (14:47 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix nmake snap when ext name is different in target dll
Anatol Belski [Mon, 21 Jul 2014 12:46:57 +0000 (14:46 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix nmake snap when ext name is different in target dll
Anatol Belski [Mon, 21 Jul 2014 12:45:49 +0000 (14:45 +0200)]
fix nmake snap when ext name is different in target dll
Anatol Belski [Mon, 21 Jul 2014 07:52:52 +0000 (09:52 +0200)]
force atoll macro usage on windows
Lior Kaplan [Sun, 20 Jul 2014 22:49:31 +0000 (01:49 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Enable $ replacement in exif, ldap, pdo_pgsql and tidy
Update NEWS
Lior Kaplan [Sun, 20 Jul 2014 22:47:19 +0000 (01:47 +0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Enable $ replacement in exif, ldap, pdo_pgsql and tidy
Update NEWS
Lior Kaplan [Sun, 20 Jul 2014 22:45:36 +0000 (01:45 +0300)]
Enable $ replacement in exif, ldap, pdo_pgsql and tidy
Remi Collet [Sun, 20 Jul 2014 09:15:59 +0000 (11:15 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
See bug #67635
Remi Collet [Sun, 20 Jul 2014 09:14:43 +0000 (11:14 +0200)]
See bug #67635
Improve previous fix:
- also rely on pkg-config for systemd < 209
- always check for header
- comments
Remi Collet [Sat, 19 Jul 2014 16:47:14 +0000 (18:47 +0200)]
NEWS
Remi Collet [Sat, 19 Jul 2014 16:46:46 +0000 (18:46 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
improve previous, add message during configure
Fixed bug #67635 php links to systemd libraries without using pkg-config
Remi Collet [Sat, 19 Jul 2014 16:46:17 +0000 (18:46 +0200)]
NEWS
Remi Collet [Sat, 19 Jul 2014 16:42:40 +0000 (18:42 +0200)]
improve previous, add message during configure
Remi Collet [Sat, 19 Jul 2014 16:40:20 +0000 (18:40 +0200)]
Fixed bug #67635 php links to systemd libraries without using pkg-config
Patch from pacho at gentoo dot org
Rely on pkg-config for systemd >= 209
Failback on old check
Xinchen Hui [Sat, 19 Jul 2014 09:19:39 +0000 (17:19 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Sat, 19 Jul 2014 09:19:01 +0000 (17:19 +0800)]
Improve fix for #66608
Xinchen Hui [Sat, 19 Jul 2014 07:30:50 +0000 (15:30 +0800)]
Fixed segfault with empty break
Xinchen Hui [Sat, 19 Jul 2014 05:12:42 +0000 (13:12 +0800)]
Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
Xinchen Hui [Sat, 19 Jul 2014 05:12:36 +0000 (13:12 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Sat, 19 Jul 2014 05:12:26 +0000 (13:12 +0800)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Xinchen Hui [Sat, 19 Jul 2014 04:53:34 +0000 (12:53 +0800)]
New added opcodes don't need to be resloved
Yasuo Ohgaki [Sat, 19 Jul 2014 01:13:15 +0000 (10:13 +0900)]
Update NEWS
Yasuo Ohgaki [Sat, 19 Jul 2014 01:12:28 +0000 (10:12 +0900)]
Update NEWS
Yasuo Ohgaki [Sat, 19 Jul 2014 01:11:42 +0000 (10:11 +0900)]
Update NEWS
Yasuo Ohgaki [Sat, 19 Jul 2014 00:59:51 +0000 (09:59 +0900)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #66827 Session raises E_NOTICE when session name variable is array
Yasuo Ohgaki [Sat, 19 Jul 2014 00:53:04 +0000 (09:53 +0900)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #66827 Session raises E_NOTICE when session name variable is array
Yasuo Ohgaki [Sat, 19 Jul 2014 00:52:01 +0000 (09:52 +0900)]
Fixed bug #66827 Session raises E_NOTICE when session name variable is array
Anatol Belski [Fri, 18 Jul 2014 16:40:58 +0000 (18:40 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
implemented copy libs of core exts in phpize mode
Anatol Belski [Fri, 18 Jul 2014 16:40:09 +0000 (18:40 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
implemented copy libs of core exts in phpize mode
Anatol Belski [Fri, 18 Jul 2014 16:38:57 +0000 (18:38 +0200)]
implemented copy libs of core exts in phpize mode
Rasmus Lerdorf [Fri, 18 Jul 2014 15:14:08 +0000 (08:14 -0700)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src:
fix copy the ext dll into the prefix path in phpize mode
fix default prefix in phpize mode
fix file with zero size usage in phpize mode
Update NEWS
Fixed bug #66608 (Incorrect behavior with nested "finally" blocks)
Enable build without atoll (e.g old AIX flavours)
Enable build without atoll (e.g old AIX flavours)
implemented usage of the non core ext deps in phpize mode
implemented force usage of generated .h and .js deps in phpize mode
basic routines for phpize mode to
Easier to read
Add some trace info as well as update CLIENT_ flags
Fix my name in the given credit
Update NEWS for PR#723 merge
Add ifdef on ecdh for single_ecdh_use
fix C89 compat
This test depends on expose_php being on
Test output relies on expose_php being on
1.2 is a problematic float to print out Lower the default display precision for this test
The test output is dependent on expose_php ini
Anatol Belski [Fri, 18 Jul 2014 09:42:24 +0000 (11:42 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix copy the ext dll into the prefix path in phpize mode
fix default prefix in phpize mode
fix file with zero size usage in phpize mode
Anatol Belski [Fri, 18 Jul 2014 09:40:53 +0000 (11:40 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix copy the ext dll into the prefix path in phpize mode
fix default prefix in phpize mode
fix file with zero size usage in phpize mode
Anatol Belski [Fri, 18 Jul 2014 09:39:38 +0000 (11:39 +0200)]
fix copy the ext dll into the prefix path in phpize mode
Anatol Belski [Fri, 18 Jul 2014 09:36:44 +0000 (11:36 +0200)]
fix default prefix in phpize mode
Anatol Belski [Fri, 18 Jul 2014 09:35:32 +0000 (11:35 +0200)]
fix file with zero size usage in phpize mode
Xinchen Hui [Fri, 18 Jul 2014 07:51:10 +0000 (15:51 +0800)]
Update NEWS
Xinchen Hui [Fri, 18 Jul 2014 07:48:56 +0000 (15:48 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Xinchen Hui [Fri, 18 Jul 2014 07:45:56 +0000 (15:45 +0800)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Xinchen Hui [Fri, 18 Jul 2014 07:45:31 +0000 (15:45 +0800)]
Fixed bug #66608 (Incorrect behavior with nested "finally" blocks)
Lior Kaplan [Thu, 17 Jul 2014 20:10:08 +0000 (23:10 +0300)]
Enable build without atoll (e.g old AIX flavours)
Lior Kaplan [Thu, 17 Jul 2014 20:09:54 +0000 (23:09 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Enable build without atoll (e.g old AIX flavours)
Lior Kaplan [Thu, 17 Jul 2014 20:04:23 +0000 (23:04 +0300)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Enable build without atoll (e.g old AIX flavours)
Lior Kaplan [Thu, 17 Jul 2014 19:58:36 +0000 (22:58 +0300)]
Enable build without atoll (e.g old AIX flavours)
Anatol Belski [Thu, 17 Jul 2014 19:49:08 +0000 (21:49 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
implemented usage of the non core ext deps in phpize mode
Anatol Belski [Thu, 17 Jul 2014 19:48:46 +0000 (21:48 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
implemented usage of the non core ext deps in phpize mode
Anatol Belski [Thu, 17 Jul 2014 19:47:15 +0000 (21:47 +0200)]
implemented usage of the non core ext deps in phpize mode
Anatol Belski [Thu, 17 Jul 2014 07:32:31 +0000 (09:32 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
implemented force usage of generated .h and .js deps in phpize mode
Anatol Belski [Thu, 17 Jul 2014 07:26:46 +0000 (09:26 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
implemented force usage of generated .h and .js deps in phpize mode
Anatol Belski [Thu, 17 Jul 2014 07:25:57 +0000 (09:25 +0200)]
implemented force usage of generated .h and .js deps in phpize mode
Anatol Belski [Wed, 16 Jul 2014 19:35:04 +0000 (21:35 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
basic routines for phpize mode to
This test depends on expose_php being on
Test output relies on expose_php being on
1.2 is a problematic float to print out Lower the default display precision for this test
The test output is dependent on expose_php ini
Anatol Belski [Wed, 16 Jul 2014 19:34:19 +0000 (21:34 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
basic routines for phpize mode to
Anatol Belski [Wed, 16 Jul 2014 19:33:07 +0000 (21:33 +0200)]
basic routines for phpize mode to
- generate headers for non core ext defines
- generate js deps for non core exts
Andrey Hristov [Wed, 16 Jul 2014 16:50:28 +0000 (19:50 +0300)]
Easier to read
Andrey Hristov [Wed, 16 Jul 2014 16:24:39 +0000 (19:24 +0300)]
Add some trace info as well as update CLIENT_ flags
Lior Kaplan [Wed, 16 Jul 2014 14:45:23 +0000 (17:45 +0300)]
Fix my name in the given credit
Daniel Lowrey [Wed, 16 Jul 2014 03:55:30 +0000 (23:55 -0400)]
Update NEWS for PR#723 merge
Lior Kaplan [Tue, 15 Jul 2014 21:10:29 +0000 (00:10 +0300)]
Add ifdef on ecdh for single_ecdh_use
Allows build with OpenSSL < 0.9.8