]>
granicus.if.org Git - php/log
Dmitry Stogov [Wed, 8 Apr 2015 12:54:47 +0000 (15:54 +0300)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed typo
Dmitry Stogov [Wed, 8 Apr 2015 12:54:10 +0000 (15:54 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed typo
Dmitry Stogov [Wed, 8 Apr 2015 12:53:28 +0000 (15:53 +0300)]
Fixed typo
Dmitry Stogov [Wed, 8 Apr 2015 12:47:31 +0000 (15:47 +0300)]
Fixed reference counting
Dmitry Stogov [Wed, 8 Apr 2015 10:29:42 +0000 (13:29 +0300)]
Fixed bug #68887 (resources are not freed correctly)
Xinchen Hui [Wed, 8 Apr 2015 06:32:31 +0000 (14:32 +0800)]
Fixed bug #69325 (php_copy_file_ex does not pass the argument)
Xinchen Hui [Wed, 8 Apr 2015 06:30:47 +0000 (14:30 +0800)]
Use new macros
Xinchen Hui [Wed, 8 Apr 2015 06:26:57 +0000 (14:26 +0800)]
Merge branch 'master' of https://github.com/bixuehujin/php-src
matason [Tue, 7 Apr 2015 21:26:16 +0000 (22:26 +0100)]
Fix zend_hash_find documentation.
Andrey Hristov [Tue, 7 Apr 2015 19:48:08 +0000 (21:48 +0200)]
Rename prefixed mysqlnd functions - prefixed with undescore, which were
accessible through a macro. Also removing the access macros.
These prefixed functions were used, similarly to many functions in Zend2,
because of TSRMLS - the macro was adding the the tsrm pointer to the call.
However, as in Zend3 no TSRM pointers are passed down the stack, because of
the usage of cached TSRM pointer in a real thread local variable, these
macros and prefixed naming have lost their purpose.
Andrey Hristov [Tue, 7 Apr 2015 19:39:29 +0000 (21:39 +0200)]
Split mysqlnd_stmt::execute in 2 logical parts :
- mysqlnd_stmt::send_execute() which just creates the wire message by using
an aux function and sends it to the server
- mysqlnd_stmt::parse_execute_respose() which is responsible for handling
the bytes sent from the server in response to COM_EXECUTE.
This makes it possible to implement finer method overwriting in mysqlnd
plugins.
Andrey Hristov [Tue, 7 Apr 2015 18:45:17 +0000 (20:45 +0200)]
Add more info to the calls:
- let the callee knows whether it was called directly or indirectly
- two NULL zval * parameters for future extension in a pecl plugin
Jin Hu [Tue, 7 Apr 2015 16:33:11 +0000 (00:33 +0800)]
Added RETURN_ARR and RETVAL_ARR macros
Reeze Xia [Tue, 7 Apr 2015 14:22:42 +0000 (22:22 +0800)]
Fixed implicit declaration of function warning
Dmitry Stogov [Tue, 7 Apr 2015 11:19:12 +0000 (14:19 +0300)]
Cleanup
Dmitry Stogov [Mon, 6 Apr 2015 23:35:52 +0000 (02:35 +0300)]
Fixed bug #69376 (Wrong ref counting).
Dmitry Stogov [Mon, 6 Apr 2015 23:35:21 +0000 (02:35 +0300)]
Avoid reallocation
Nikita Popov [Mon, 6 Apr 2015 20:09:22 +0000 (22:09 +0200)]
Merge branch 'PHP-5.6'
Conflicts:
Zend/zend_compile.c
Zend/zend_compile.h
Zend/zend_language_parser.y
Nikita Popov [Mon, 6 Apr 2015 20:06:48 +0000 (22:06 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
Zend/zend_compile.c
Zend/zend_compile.h
Nikita Popov [Mon, 6 Apr 2015 20:03:04 +0000 (22:03 +0200)]
Fix bug #60022
Nikita Popov [Mon, 6 Apr 2015 19:52:20 +0000 (21:52 +0200)]
Undef results for new arithmetic exceptions
For the compound assing case (e.g. $a <<= $b) the result is going
to be dtored, so we have to set *some* value.
Nikita Popov [Mon, 6 Apr 2015 19:45:20 +0000 (21:45 +0200)]
Merge branch 'PHP-5.6'
Nikita Popov [Mon, 6 Apr 2015 19:44:52 +0000 (21:44 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
Nikita Popov [Mon, 6 Apr 2015 19:37:19 +0000 (21:37 +0200)]
Fix static member destruction
Dmitry Stogov [Mon, 6 Apr 2015 19:07:18 +0000 (22:07 +0300)]
Fixed test
Dmitry Stogov [Mon, 6 Apr 2015 19:03:44 +0000 (22:03 +0300)]
0.0 / 0.0 = NaN
Dmitry Stogov [Mon, 6 Apr 2015 15:19:07 +0000 (18:19 +0300)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #68652 (segmentation fault in destructor)
Conflicts:
NEWS
Dmitry Stogov [Mon, 6 Apr 2015 15:16:08 +0000 (18:16 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #68652 (segmentation fault in destructor)
Conflicts:
NEWS
Dmitry Stogov [Mon, 6 Apr 2015 15:11:41 +0000 (18:11 +0300)]
Fixed bug #68652 (segmentation fault in destructor)
Dmitry Stogov [Mon, 6 Apr 2015 15:10:45 +0000 (18:10 +0300)]
Removed wrong error messages
Dmitry Stogov [Mon, 6 Apr 2015 15:10:34 +0000 (18:10 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
catch up with INF handling under VS
Anatol Belski [Mon, 6 Apr 2015 15:01:19 +0000 (17:01 +0200)]
catch up with INF handling under VS
Dmitry Stogov [Mon, 6 Apr 2015 14:24:32 +0000 (17:24 +0300)]
Fixed error messages
Anatol Belski [Mon, 6 Apr 2015 11:56:47 +0000 (13:56 +0200)]
fix build
Dmitry Stogov [Mon, 6 Apr 2015 11:30:05 +0000 (14:30 +0300)]
Fixed weird operators behavior. Division by zero now emits warning and returns +/-INF, modulo by zero and intdid() throws an exception, shifts by negative offset throw exceptions. Compile-time evaluation of division by zero is disabled.
Nikita Popov [Mon, 6 Apr 2015 10:15:04 +0000 (12:15 +0200)]
Fix EH_THROW replacement in PDO constructor
Needs to happen for the "goto options" case as well, otherwise
will try to restore error handling that was never replaced.
Nikita Popov [Thu, 2 Apr 2015 16:52:32 +0000 (18:52 +0200)]
Always throw TypeException on throwing zpp failures
Introduces a ZEND_PARSE_PARAMS_THROW flag for zpp, which forces to
report FAILURE errors using a TypeException instead of a Warning,
like it would happen in strict mode.
Adds a zend_parse_parameters_throw() convenience function, which
invokes zpp with this flag.
Converts all cases I could identify, where we currently have
throwing zpp usage in constructors and replaces them with this API.
Error handling is still replaced to EH_THROW in some cases to handle
other, domain-specific errors in constructors.
Stanislav Malyshev [Mon, 6 Apr 2015 05:49:06 +0000 (22:49 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed bug #68740 (NULL Pointer Dereference)
Stanislav Malyshev [Mon, 6 Apr 2015 05:48:37 +0000 (22:48 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #68740 (NULL Pointer Dereference)
Stanislav Malyshev [Mon, 6 Apr 2015 05:48:27 +0000 (22:48 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #68740 (NULL Pointer Dereference)
Xinchen Hui [Tue, 31 Mar 2015 21:41:46 +0000 (00:41 +0300)]
Fixed bug #68740 (NULL Pointer Dereference)
(cherry picked from commit
124fb22a13fafa3648e4e15b4f207c7096d8155e )
Stanislav Malyshev [Mon, 6 Apr 2015 05:45:16 +0000 (22:45 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix bug #66550 (SQLite prepared statement use-after-free)
Conflicts:
ext/sqlite3/sqlite3.c
Stanislav Malyshev [Mon, 6 Apr 2015 05:38:03 +0000 (22:38 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #66550 (SQLite prepared statement use-after-free)
Stanislav Malyshev [Mon, 6 Apr 2015 05:36:55 +0000 (22:36 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #66550 (SQLite prepared statement use-after-free)
Stanislav Malyshev [Mon, 6 Apr 2015 05:27:02 +0000 (22:27 -0700)]
Fix bug #66550 (SQLite prepared statement use-after-free)
Stanislav Malyshev [Mon, 6 Apr 2015 00:37:44 +0000 (17:37 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/
81e9a993f2893d651d225646378e3fd1b7465467
Fix bug #68601 buffer read overflow in gd_gif_in.c
Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4"
Fixed bug #69293
Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable.
Stanislav Malyshev [Mon, 6 Apr 2015 00:37:12 +0000 (17:37 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/
81e9a993f2893d651d225646378e3fd1b7465467
Fix bug #68601 buffer read overflow in gd_gif_in.c
Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4"
Fixed bug #69293
Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable.
Stanislav Malyshev [Mon, 6 Apr 2015 00:36:52 +0000 (17:36 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Better fix for #68601 for perf https://bitbucket.org/libgd/gd-libgd/commits/
81e9a993f2893d651d225646378e3fd1b7465467
Fix bug #68601 buffer read overflow in gd_gif_in.c
Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4"
Fixed bug #69293
Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable.
Remi Collet [Wed, 17 Dec 2014 09:59:36 +0000 (10:59 +0100)]
Better fix for #68601 for perf
https://bitbucket.org/libgd/gd-libgd/commits/
81e9a993f2893d651d225646378e3fd1b7465467
Remi Collet [Sat, 13 Dec 2014 08:03:44 +0000 (09:03 +0100)]
Fix bug #68601 buffer read overflow in gd_gif_in.c
Ferenc Kovacs [Sun, 5 Apr 2015 20:55:28 +0000 (22:55 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
add travis failure/recover notification for our irc room
Ferenc Kovacs [Sun, 5 Apr 2015 20:54:57 +0000 (22:54 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
add travis failure/recover notification for our irc room
Ferenc Kovacs [Sun, 5 Apr 2015 20:54:30 +0000 (22:54 +0200)]
add travis failure/recover notification for our irc room
Ferenc Kovacs [Sun, 5 Apr 2015 20:45:58 +0000 (22:45 +0200)]
fix build
Anatol Belski [Sun, 5 Apr 2015 17:45:04 +0000 (19:45 +0200)]
fix nts windows_version_info and reorganize
Xinchen Hui [Sun, 5 Apr 2015 10:45:14 +0000 (18:45 +0800)]
Fixed bug #69371 (Hash table collision leads to inaccessible array keys)
Kalle Sommer Nielsen [Sat, 4 Apr 2015 20:11:37 +0000 (22:11 +0200)]
Fix build
Kalle Sommer Nielsen [Sat, 4 Apr 2015 20:05:21 +0000 (22:05 +0200)]
Merge branch 'master' of https://git.php.net/push/php-src
Kalle Sommer Nielsen [Sat, 4 Apr 2015 20:04:32 +0000 (22:04 +0200)]
This part here was moved to the EG constructor by Anatol in
f51a9c71dd011f7d6879b326280adc05ae45f7f7
Anatol Belski [Sat, 4 Apr 2015 19:52:35 +0000 (21:52 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
updated NEWS
added test for bug #69354
revert skipif, this should run everywhere
further ODBC 3.0 compliance
more compliance with the ODBC 3.0
test fixes
Anatol Belski [Sat, 4 Apr 2015 19:50:50 +0000 (21:50 +0200)]
updated NEWS
Anatol Belski [Sat, 4 Apr 2015 19:50:18 +0000 (21:50 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
added test for bug #69354
revert skipif, this should run everywhere
further ODBC 3.0 compliance
more compliance with the ODBC 3.0
test fixes
Anatol Belski [Sat, 4 Apr 2015 19:49:09 +0000 (21:49 +0200)]
updated NEWS
fixes for bug #69354 was cherrypicked from master
Anatol Belski [Thu, 2 Apr 2015 16:50:16 +0000 (18:50 +0200)]
added test for bug #69354
Anatol Belski [Thu, 2 Apr 2015 13:37:08 +0000 (15:37 +0200)]
revert skipif, this should run everywhere
Anatol Belski [Thu, 2 Apr 2015 13:30:31 +0000 (15:30 +0200)]
further ODBC 3.0 compliance
Anatol Belski [Thu, 2 Apr 2015 12:23:23 +0000 (14:23 +0200)]
more compliance with the ODBC 3.0
Anatol Belski [Thu, 2 Apr 2015 12:22:56 +0000 (14:22 +0200)]
test fixes
Anatol Belski [Sat, 4 Apr 2015 18:39:04 +0000 (20:39 +0200)]
no more winxp, but really
Anatol Belski [Sat, 4 Apr 2015 18:28:58 +0000 (20:28 +0200)]
initialize EG(windows_version_info)
there are more places refering to this, but seems it was never
initialized
Nikita Popov [Sat, 4 Apr 2015 13:58:00 +0000 (15:58 +0200)]
Try fixing PDO MySQL pconnect test
Use less aggressive conversion to exceptions, in particular
do not convert warnings that happen during check_liveness. If the
server has gone away this will just reconnect and we still end up
with a valid connection, so it shouldn't throw.
Also drop some unnecessary checks for malloc returning NULL.
Nikita Popov [Sat, 4 Apr 2015 11:10:29 +0000 (13:10 +0200)]
Drop now unnecessary start parameter
Nikita Popov [Sat, 4 Apr 2015 11:02:17 +0000 (13:02 +0200)]
Fix parameter parsing for mysqli_stmt_bind_result()
Also drops one unnecessary arg allocation
Nikita Popov [Sat, 4 Apr 2015 08:52:43 +0000 (10:52 +0200)]
Fix separation in array_multisort
This manifested in Zend/tests/bug52939.phpt when running without
opcache (no immutablization).
Nikita Popov [Sat, 4 Apr 2015 08:38:00 +0000 (10:38 +0200)]
Fix typo
Nikita Popov [Sat, 4 Apr 2015 08:24:00 +0000 (10:24 +0200)]
Clarify that some zpp errors are just for debugging
These occur when the extension author messed up, not during normal
script execution.
Make these core errors and show them even with PARAMS_QUIET.
Dmitry Stogov [Fri, 3 Apr 2015 13:35:06 +0000 (16:35 +0300)]
Don't relay on reference-counter when parameter expected to be a reference, but value given.
Xinchen Hui [Fri, 3 Apr 2015 07:55:39 +0000 (15:55 +0800)]
Unused var
Dmitry Stogov [Fri, 3 Apr 2015 07:48:55 +0000 (10:48 +0300)]
Improved "fust shutdown".
Dmitry Stogov [Thu, 2 Apr 2015 22:32:20 +0000 (01:32 +0300)]
Improved reference counting
Anatol Belski [Thu, 2 Apr 2015 16:50:16 +0000 (18:50 +0200)]
added test for bug #69354
Anatol Belski [Thu, 2 Apr 2015 13:37:08 +0000 (15:37 +0200)]
revert skipif, this should run everywhere
Anatol Belski [Thu, 2 Apr 2015 13:30:31 +0000 (15:30 +0200)]
further ODBC 3.0 compliance
Anatol Belski [Thu, 2 Apr 2015 18:18:11 +0000 (20:18 +0200)]
more compliance with the ODBC 3.x
Anatol Belski [Thu, 2 Apr 2015 12:22:56 +0000 (14:22 +0200)]
test fixes
Nikita Popov [Sat, 21 Mar 2015 19:10:19 +0000 (20:10 +0100)]
Throw ParseException from lexer
Primarily to avoid getting fatal errors from token_get_all().
Implemented using a magic E_ERROR token, which the lexer emits to
force a parser failure.
Dmitry Stogov [Thu, 2 Apr 2015 11:28:39 +0000 (14:28 +0300)]
Use PHP memory manager for mysqlnd memory pools.
Dmitry Stogov [Thu, 2 Apr 2015 11:19:52 +0000 (14:19 +0300)]
Convert fatal errors into EngineException
Dmitry Stogov [Thu, 2 Apr 2015 10:07:17 +0000 (13:07 +0300)]
Recalssify some E_ERROR into E_CORE_ERROR
Dmitry Stogov [Thu, 2 Apr 2015 09:38:16 +0000 (12:38 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
fix tests
Dmitry Stogov [Thu, 2 Apr 2015 09:37:34 +0000 (12:37 +0300)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Prevent GC from changing zval or object 'color' before they are actually inserted into possible roots buffer.
Conflicts:
NEWS
Zend/zend_gc.c
Anatol Belski [Wed, 1 Apr 2015 16:43:07 +0000 (18:43 +0200)]
fix tests
Dmitry Stogov [Thu, 2 Apr 2015 09:30:58 +0000 (12:30 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Prevent GC from changing zval or object 'color' before they are actually inserted into possible roots buffer.
Dmitry Stogov [Thu, 2 Apr 2015 09:29:15 +0000 (12:29 +0300)]
Prevent GC from changing zval or object 'color' before they are actually inserted into possible roots buffer.
Stanislav Malyshev [Thu, 2 Apr 2015 06:43:33 +0000 (23:43 -0700)]
Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4"
This reverts commit
fe0ca2745f00940a27bfc8e87db534541a19af70 , reversing
changes made to
968fbc6acf0bc27be17c0209be7f966e89a55943 .
Xinchen Hui [Thu, 2 Apr 2015 01:06:46 +0000 (09:06 +0800)]
Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
Xinchen Hui [Thu, 2 Apr 2015 01:06:38 +0000 (09:06 +0800)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Xinchen Hui [Thu, 2 Apr 2015 01:05:04 +0000 (09:05 +0800)]
Unused var
Xinchen Hui [Thu, 2 Apr 2015 01:03:48 +0000 (09:03 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src
Dmitry Stogov [Thu, 2 Apr 2015 00:56:42 +0000 (03:56 +0300)]
Fixed performance degradation introduced with lateast EnfineException related changes.
Restore original errors order in executor.