]>
granicus.if.org Git - php/log
Dmitry Stogov [Tue, 5 Aug 2014 14:17:05 +0000 (18:17 +0400)]
Fixed argument numbering
Dmitry Stogov [Tue, 5 Aug 2014 11:38:43 +0000 (15:38 +0400)]
Fixed bug #67725 (now we create immutable arrays only in SHM)
Dmitry Stogov [Mon, 4 Aug 2014 18:51:41 +0000 (22:51 +0400)]
Don't waste SHM for unused Buckets
Dmitry Stogov [Mon, 4 Aug 2014 17:31:13 +0000 (21:31 +0400)]
Fixed incorrect arguments handling
Dmitry Stogov [Mon, 4 Aug 2014 16:20:12 +0000 (20:20 +0400)]
Delete immutable arrays copied into SHM (related to bug #67725)
Dmitry Stogov [Mon, 4 Aug 2014 09:56:27 +0000 (13:56 +0400)]
Merge branch 'master' into phpng
* master: (46 commits)
PHP_INT_MIN and _MAX tests
NEWS and UPGRADING
Added PHP_INT_MIN
Fix wrong lenght size
Bug #51096 - Remove unnecessary ? for first/last day of
Moved streams related functions to xp_ssl.c
Remove duplicate NEWS
Update NEWS
Update NEWS
Update NEWS
BFN
BFN
Fixed bug #67715 (php-milter does not build and crashes randomly).
We need to turn off any strict mode here for this warning to show up
Disable restrictions regarding arrays in constants at run-time. For the discussion around it, see the thread on the mailing list: http://www.mail-archive.com/internals@lists.php.net/msg68245.html
Revert "Fix bug #67064 in a BC safe way"
Updated NEWS for #67693
Updated NEWS for #67693
Fixed bug #67693 - incorrect push to the empty array
add missing entry to NEWS
...
Conflicts:
Zend/tests/errmsg_040.phpt
Zend/tests/ns_059.phpt
Zend/zend_language_parser.y
Zend/zend_vm_def.h
ext/openssl/openssl.c
ext/reflection/php_reflection.c
ext/session/session.c
ext/spl/spl_directory.c
ext/spl/spl_iterators.c
ext/sqlite3/sqlite3.c
ext/standard/array.c
Andrea Faulds [Fri, 1 Aug 2014 16:01:17 +0000 (17:01 +0100)]
PHP_INT_MIN and _MAX tests
Andrea Faulds [Fri, 1 Aug 2014 15:29:34 +0000 (16:29 +0100)]
Merge branch 'PHP_INT_MIN'
Andrea Faulds [Fri, 1 Aug 2014 15:28:20 +0000 (16:28 +0100)]
NEWS and UPGRADING
Andrea Faulds [Fri, 1 Aug 2014 13:29:50 +0000 (14:29 +0100)]
Added PHP_INT_MIN
Andrey Hristov [Thu, 31 Jul 2014 18:28:19 +0000 (21:28 +0300)]
Merge branch 'PHP-5.6'
Andrey Hristov [Thu, 31 Jul 2014 18:28:09 +0000 (21:28 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
Andrey Hristov [Thu, 31 Jul 2014 18:27:51 +0000 (21:27 +0300)]
Fix wrong lenght size
Peter Cowburn [Thu, 31 Jul 2014 13:35:13 +0000 (14:35 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Bug #51096 - Remove unnecessary ? for first/last day of
Peter Cowburn [Thu, 31 Jul 2014 13:34:50 +0000 (14:34 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Bug #51096 - Remove unnecessary ? for first/last day of
Peter Cowburn [Thu, 31 Jul 2014 13:33:55 +0000 (14:33 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Bug #51096 - Remove unnecessary ? for first/last day of
Conflicts:
ext/date/lib/parse_date.c
Peter Cowburn [Thu, 31 Jul 2014 13:30:39 +0000 (14:30 +0100)]
Merge branch 'pull-request/754' into PHP-5.4
Peter Cowburn [Thu, 31 Jul 2014 13:21:38 +0000 (14:21 +0100)]
Bug #51096 - Remove unnecessary ? for first/last day of
Xinchen Hui [Thu, 31 Jul 2014 10:16:08 +0000 (18:16 +0800)]
Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng
Xinchen Hui [Thu, 31 Jul 2014 10:15:47 +0000 (18:15 +0800)]
Fixed valgrind issues
Dmitry Stogov [Thu, 31 Jul 2014 06:55:39 +0000 (10:55 +0400)]
Merge branch 'phpng' of git.php.net:php-src into phpng
* 'phpng' of git.php.net:php-src:
Fixed getDefaultProperties (it should not return reference)
Fixed invalid free
Fixed segfault
Dmitry Stogov [Thu, 31 Jul 2014 06:53:31 +0000 (10:53 +0400)]
Fixed resource leak
Dmitry Stogov [Thu, 31 Jul 2014 06:52:48 +0000 (10:52 +0400)]
Fixed check for eval()
Dmitry Stogov [Thu, 31 Jul 2014 06:51:49 +0000 (10:51 +0400)]
execute_data->return_value should be initialized when call internal constructors
Dmitry Stogov [Thu, 31 Jul 2014 06:50:27 +0000 (10:50 +0400)]
EA must be initialized
Xinchen Hui [Thu, 31 Jul 2014 04:57:37 +0000 (12:57 +0800)]
Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng
Xinchen Hui [Thu, 31 Jul 2014 04:55:53 +0000 (12:55 +0800)]
Fixed getDefaultProperties (it should not return reference)
Tjerk Meesters [Thu, 31 Jul 2014 04:18:19 +0000 (12:18 +0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Moved streams related functions to xp_ssl.c
Tjerk Meesters [Thu, 31 Jul 2014 04:17:17 +0000 (12:17 +0800)]
Moved streams related functions to xp_ssl.c
Keyur Govande [Wed, 30 Jul 2014 18:50:07 +0000 (18:50 +0000)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Remove duplicate NEWS
Update NEWS
Update NEWS
Update NEWS
Keyur Govande [Wed, 30 Jul 2014 18:48:43 +0000 (18:48 +0000)]
Remove duplicate NEWS
Keyur Govande [Wed, 30 Jul 2014 18:41:13 +0000 (18:41 +0000)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Update NEWS
Update NEWS
Keyur Govande [Wed, 30 Jul 2014 18:39:59 +0000 (18:39 +0000)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Update NEWS
Keyur Govande [Wed, 30 Jul 2014 18:36:09 +0000 (18:36 +0000)]
Update NEWS
Keyur Govande [Wed, 30 Jul 2014 18:37:25 +0000 (18:37 +0000)]
Update NEWS
Keyur Govande [Wed, 30 Jul 2014 18:33:19 +0000 (18:33 +0000)]
Update NEWS
Michael Wallner [Wed, 30 Jul 2014 18:14:40 +0000 (20:14 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
BFN
BFN
Fixed bug #67715 (php-milter does not build and crashes randomly).
Michael Wallner [Wed, 30 Jul 2014 18:14:03 +0000 (20:14 +0200)]
BFN
Michael Wallner [Wed, 30 Jul 2014 18:13:39 +0000 (20:13 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
BFN
Fixed bug #67715 (php-milter does not build and crashes randomly).
Michael Wallner [Wed, 30 Jul 2014 18:13:17 +0000 (20:13 +0200)]
BFN
Michael Wallner [Wed, 30 Jul 2014 18:12:50 +0000 (20:12 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #67715 (php-milter does not build and crashes randomly).
Michael Wallner [Wed, 30 Jul 2014 18:12:13 +0000 (20:12 +0200)]
Fixed bug #67715 (php-milter does not build and crashes randomly).
Rasmus Lerdorf [Wed, 30 Jul 2014 16:23:46 +0000 (12:23 -0400)]
Merge commit '
8b9719d '
* commit '
8b9719d ':
We need to turn off any strict mode here for this warning to show up
Rasmus Lerdorf [Wed, 30 Jul 2014 16:23:36 +0000 (12:23 -0400)]
Merge commit '
8b9719d ' into PHP-5.6
* commit '
8b9719d ':
We need to turn off any strict mode here for this warning to show up
Rasmus Lerdorf [Wed, 30 Jul 2014 16:23:24 +0000 (12:23 -0400)]
Merge commit '
8b9719d ' into PHP-5.5
* commit '
8b9719d ':
We need to turn off any strict mode here for this warning to show up
Rasmus Lerdorf [Wed, 30 Jul 2014 16:22:48 +0000 (12:22 -0400)]
We need to turn off any strict mode here for this warning to show up
Bob Weinand [Wed, 30 Jul 2014 16:07:01 +0000 (18:07 +0200)]
Merge branch 'PHP-5.6'
Bob Weinand [Wed, 30 Jul 2014 15:57:07 +0000 (17:57 +0200)]
Disable restrictions regarding arrays in constants at run-time.
For the discussion around it, see the thread on the mailing list:
http://www.mail-archive.com/internals@lists.php.net/msg68245.html
Bob Weinand [Wed, 30 Jul 2014 15:18:05 +0000 (17:18 +0200)]
Revert "Fix bug #67064 in a BC safe way"
This reverts commit
1a4a9eede59b853f11e8e8b965e5f715f53da8f7 .
Conflicts:
ext/standard/array.c
ext/standard/tests/array/bug67064.phpt
Tjerk Meesters [Wed, 30 Jul 2014 10:28:23 +0000 (18:28 +0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Updated NEWS for #67693
Fixed bug #67693 - incorrect push to the empty array
Tjerk Meesters [Wed, 30 Jul 2014 10:27:29 +0000 (18:27 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Updated NEWS for #67693
Fixed bug #67693 - incorrect push to the empty array
Tjerk Meesters [Wed, 30 Jul 2014 10:17:36 +0000 (18:17 +0800)]
Updated NEWS for #67693
Tjerk Meesters [Wed, 30 Jul 2014 10:17:13 +0000 (18:17 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Updated NEWS for #67693
Fixed bug #67693 - incorrect push to the empty array
Tjerk Meesters [Wed, 30 Jul 2014 10:16:56 +0000 (18:16 +0800)]
Updated NEWS for #67693
Tjerk Meesters [Wed, 30 Jul 2014 09:54:09 +0000 (17:54 +0800)]
Fixed bug #67693 - incorrect push to the empty array
Ferenc Kovacs [Wed, 30 Jul 2014 09:47:29 +0000 (11:47 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
add missing entry to NEWS
Ferenc Kovacs [Wed, 30 Jul 2014 09:47:14 +0000 (11:47 +0200)]
add missing entry to NEWS
Ferenc Kovacs [Wed, 30 Jul 2014 09:27:13 +0000 (11:27 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
add missing entries to NEWS
Ferenc Kovacs [Wed, 30 Jul 2014 09:26:55 +0000 (11:26 +0200)]
add missing entries to NEWS
Ferenc Kovacs [Wed, 30 Jul 2014 08:51:44 +0000 (10:51 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
add NEWS block for the next RC
Ferenc Kovacs [Wed, 30 Jul 2014 08:51:28 +0000 (10:51 +0200)]
add NEWS block for the next RC
Ferenc Kovacs [Wed, 30 Jul 2014 08:46:31 +0000 (10:46 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS entry for #67713
update the exception message to better match the actual check
ReflectionClass::newInstanceWithoutConstructor() should be allowed to instantiate every class except those internal classes with a final __construct()
Ferenc Kovacs [Wed, 30 Jul 2014 08:45:35 +0000 (10:45 +0200)]
NEWS entry for #67713
Ferenc Kovacs [Wed, 30 Jul 2014 08:23:29 +0000 (10:23 +0200)]
Merge branch 'newInstanceWithoutConstructor' into PHP-5.6
* newInstanceWithoutConstructor:
update the exception message to better match the actual check
ReflectionClass::newInstanceWithoutConstructor() should be allowed to instantiate every class except those internal classes with a final __construct()
Ferenc Kovacs [Wed, 30 Jul 2014 08:08:26 +0000 (10:08 +0200)]
update the exception message to better match the actual check
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:32 +0000 (10:40 +0400)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed usage after free
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
Xinchen Hui [Wed, 30 Jul 2014 03:21:40 +0000 (11:21 +0800)]
Fixed invalid free
Keyur Govande [Wed, 30 Jul 2014 02:47:44 +0000 (02:47 +0000)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Undo inadvertent commit of php_version
Corrected patch for bug #60616
Xinchen Hui [Wed, 30 Jul 2014 02:47:03 +0000 (10:47 +0800)]
Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng
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.
Dmitry Stogov [Tue, 29 Jul 2014 16:27:48 +0000 (20:27 +0400)]
Fixed incinsitency in passing arguments by reference to call_user_func()
Dmitry Stogov [Tue, 29 Jul 2014 14:19:41 +0000 (18:19 +0400)]
Fixed ext/standard/tests/array/unexpected_array_mod_bug.phpt
Dmitry Stogov [Tue, 29 Jul 2014 12:23:56 +0000 (16:23 +0400)]
Fixed callback registraion order in spl_autoload_register()
Dmitry Stogov [Tue, 29 Jul 2014 11:29:22 +0000 (15:29 +0400)]
fixed support for references
Tjerk Meesters [Tue, 29 Jul 2014 11:15:20 +0000 (19:15 +0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Wildcards should only be used in the first name component; fixed comment style
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
Dmitry Stogov [Tue, 29 Jul 2014 10:34:43 +0000 (14:34 +0400)]
Fixed Zend/tests/bug54265.phpt
Dmitry Stogov [Tue, 29 Jul 2014 08:13:47 +0000 (12:13 +0400)]
Fixed incorrect destruction (it might lead to crash)
Dmitry Stogov [Tue, 29 Jul 2014 06:15:01 +0000 (10:15 +0400)]
ext/interbase support (incomplete)
Xinchen Hui [Tue, 29 Jul 2014 06:14:45 +0000 (14:14 +0800)]
Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng
Keyur Govande [Mon, 28 Jul 2014 23:17:23 +0000 (23:17 +0000)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix bug #60616 (odbc_fetch_into returns junk at end of multi-byte char fields)
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 [Mon, 28 Jul 2014 18:38:20 +0000 (11:38 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix SOAP for uninitialzed object
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:24 +0000 (00:39 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix NEWS
Fix missing type checks in various functions
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 02:37:37 +0000 (19:37 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix SPL objects initialization checks