]> granicus.if.org Git - php/log
php
9 years agoSquashed commit of the following:
Dmitry Stogov [Fri, 10 Apr 2015 20:01:00 +0000 (23:01 +0300)]
Squashed commit of the following:

commit 2399fc84c541da9c2176c5b7f6dd039a3c84dc64
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Apr 10 12:38:08 2015 +0300

    Removed useless assignment

commit 796b6338174348eee0d74a67706d77b7ce1a60c3
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Apr 10 12:35:31 2015 +0300

    Fixed execution with overriden zend_execute_ex()

commit 4a9fb125aa999059f8bc42ebb6ee573c7866b35b
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Apr 10 02:02:58 2015 +0300

    Fixed executor without global registers

commit d456c30e00589ccda35a4b57ae903ef2d3c07d95
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Apr 10 01:30:35 2015 +0300

    Restored original behavior for tests/classes/__call_004.phpt

commit 479646d37fef050536f1afb12b082618f1f1a3d0
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Apr 10 00:32:17 2015 +0300

    Fixed test. We don't keep stack frame for fake function anymore.

commit 9ae61e33e24b2c811d4ab1ca4ab22847c64a780e
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Apr 10 00:30:09 2015 +0300

    Use ZEND_ACC_CALL_VIA_TRAMPOLINE instead of ZEND_ACC_CALL_VIA_HANDLER. Keep ZEND_ACC_CALL_VIA_HANDLER for compatibility.

commit 0a8403a2a0c27aa3db271774f8559739a6b8400e
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Fri Apr 10 00:05:43 2015 +0300

    Rename PROXY_CALL into CALL_TRAMPLINE.
    Generalize API to allow reuse EG(trampline) for other purposes.

commit 4ea0525c10554e36185a0b8b6303106813b6a1c2
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Apr 9 23:22:25 2015 +0300

    Reuse EG(proxy_call_op) for all proxy. Move proxy related functions from zend_objects_API to zend_object_handlers.

commit 529bf737ca388ad56fb4ae20ccb81e6276f25ec0
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Apr 9 21:42:23 2015 +0300

    Accurate use of proxy_call

commit 5d62837d5ba3855743fe1981786ebd65d9da0b63
Merge: 83e749f 690843f
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Apr 9 19:40:00 2015 +0300

    Merge branch 'master' into opcodefy-call

    * master:
      Fixed GOTO executor
      Fixed typo
      Changed ArrayIterator implementation using zend_hash_iterator_... API. Allowed modification of itterated ArrayObject using the same behavior as proposed in `Fix "foreach" behavior`. Removed "Array was modified outside object and internal position is no longer valid" hack.

commit 83e749ff3b6623e39b236a72e9b907d5b788ae5e
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Apr 9 19:39:10 2015 +0300

    Improved ZEND_PROXY_CALL

commit 0c829afc534e6d5ff27a0dea3a4815da303bd1ef
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Apr 9 15:14:49 2015 +0300

    Reverted white-space changes

commit df65144488afa3e9020d75e1ada5529b138afc5a
Merge: 5fd2f97 97756d9
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Apr 9 14:37:07 2015 +0300

    Merge branch 'opcodefy-call' of github.com:laruence/php-src into opcodefy-call

    * 'opcodefy-call' of github.com:laruence/php-src:
      Ready for PR
      Fixed static call
      Improve performance by using prealloated op_arrray
      Respect called_scope
      Support internal magical __call/__callStatic
      opcode-fy magical __callStatic
      Opcode-fy magical __call

commit 97756d9190e07a072a7b48135304dc25a964845f
Author: Xinchen Hui <laruence@gmail.com>
Date:   Thu Apr 9 19:07:59 2015 +0800

    Ready for PR

commit 74f993084627061e783645a866390b68e2981698
Author: Xinchen Hui <laruence@gmail.com>
Date:   Thu Apr 9 19:03:00 2015 +0800

    Fixed static call

commit ec1d9eb592db0c3b7b0e3d21e7f445ed8bccfd4d
Author: Xinchen Hui <laruence@gmail.com>
Date:   Thu Apr 9 18:23:17 2015 +0800

    Improve performance by using prealloated op_arrray

commit df7fbbf949c99f2c5ae3da2a1199235651c7cc82
Author: Xinchen Hui <laruence@gmail.com>
Date:   Thu Apr 9 15:10:02 2015 +0800

    Respect called_scope

commit 769d1d59fb48b6f7f93d7412eefbf26135fa3e59
Author: Xinchen Hui <laruence@gmail.com>
Date:   Thu Apr 9 12:19:23 2015 +0800

    Support internal magical __call/__callStatic

commit a980fedd5b0e0683713dd4f6eaad62adf4b4732f
Author: Xinchen Hui <laruence@gmail.com>
Date:   Wed Apr 8 18:35:41 2015 +0800

    opcode-fy magical __callStatic

commit 73855f7d53baa2efc2b8a88314f51c784c81b59d
Author: Xinchen Hui <laruence@gmail.com>
Date:   Wed Apr 8 14:21:55 2015 +0800

    Opcode-fy magical __call

9 years agoAdded GC debug code and some small optimizations.
Dmitry Stogov [Fri, 10 Apr 2015 19:06:01 +0000 (22:06 +0300)]
Added GC debug code and some small optimizations.

9 years agoMerge branch 'PHP-5.6'
Xinchen Hui [Fri, 10 Apr 2015 14:50:15 +0000 (22:50 +0800)]
Merge branch 'PHP-5.6'

Conflicts:
Zend/zend_compile.c

9 years agoUpdate NEWs
Xinchen Hui [Fri, 10 Apr 2015 14:48:48 +0000 (22:48 +0800)]
Update NEWs

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Fri, 10 Apr 2015 14:48:36 +0000 (22:48 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6

9 years agoFixed bug #69420 (Invalid read in zend_std_get_method)
Xinchen Hui [Fri, 10 Apr 2015 14:47:06 +0000 (22:47 +0800)]
Fixed bug #69420 (Invalid read in zend_std_get_method)

9 years agoFix bug #69413
Nikita Popov [Fri, 10 Apr 2015 07:49:07 +0000 (09:49 +0200)]
Fix bug #69413

9 years agoAdd NEWS file for password_hash salt deprecation
Anthony Ferrara [Thu, 9 Apr 2015 20:01:12 +0000 (16:01 -0400)]
Add NEWS file for password_hash salt deprecation

9 years agoDeprecate password_hash salt option
Anthony Ferrara [Thu, 9 Apr 2015 19:51:04 +0000 (15:51 -0400)]
Deprecate password_hash salt option

9 years agoFix test for systems where openssl's time_t have an offset set
Kalle Sommer Nielsen [Thu, 9 Apr 2015 17:57:44 +0000 (19:57 +0200)]
Fix test for systems where openssl's time_t have an offset set

9 years agoFix undeclared identifier 'PHP_STREAM_KEEP_RSRC'
Di Wu [Thu, 9 Apr 2015 15:24:01 +0000 (23:24 +0800)]
Fix undeclared identifier 'PHP_STREAM_KEEP_RSRC'

Identifier named `PHP_STREAM_FREE_KEEP_RSRC`  but use `PHP_STREAM_KEEP_RSRC`

Reference Line 131

9 years agoFixed GOTO executor
Dmitry Stogov [Thu, 9 Apr 2015 15:18:10 +0000 (18:18 +0300)]
Fixed GOTO executor

9 years agoFixed typo
Dmitry Stogov [Thu, 9 Apr 2015 12:47:34 +0000 (15:47 +0300)]
Fixed typo

9 years agoChanged ArrayIterator implementation using zend_hash_iterator_... API. Allowed modifi...
Dmitry Stogov [Thu, 9 Apr 2015 12:40:17 +0000 (15:40 +0300)]
Changed ArrayIterator implementation using zend_hash_iterator_... API. Allowed modification of itterated ArrayObject using the same behavior as proposed in `Fix "foreach" behavior`. Removed "Array was modified outside object and internal position is no longer valid" hack.

9 years agoUnnecessary UNDEF
Xinchen Hui [Thu, 9 Apr 2015 06:16:04 +0000 (14:16 +0800)]
Unnecessary UNDEF

9 years agoFix test on systems where EOL isn't "\n", like Windows
Kalle Sommer Nielsen [Wed, 8 Apr 2015 21:56:29 +0000 (23:56 +0200)]
Fix test on systems where EOL isn't "\n", like Windows

9 years agoFixed resource leak
Dmitry Stogov [Wed, 8 Apr 2015 20:37:05 +0000 (23:37 +0300)]
Fixed resource leak

9 years agoFixed typo
Dmitry Stogov [Wed, 8 Apr 2015 20:15:43 +0000 (23:15 +0300)]
Fixed typo

9 years agoMerge branch 'master' of git.php.net:php-src
Dmitry Stogov [Wed, 8 Apr 2015 19:19:24 +0000 (22:19 +0300)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Fix leak of closure used as generator

9 years agoAddef test for bug #63734 (Garbage collector can free zvals that are still referenced)
Dmitry Stogov [Wed, 8 Apr 2015 19:18:10 +0000 (22:18 +0300)]
Addef test for bug #63734 (Garbage collector can free zvals that are still referenced)

9 years agoFix leak of closure used as generator
Nikita Popov [Wed, 8 Apr 2015 19:11:42 +0000 (21:11 +0200)]
Fix leak of closure used as generator

Also remove obsolete code for copying the closure op_array. It
should no longer be possible for the closure object to be destroyed
while the generator is still live.

9 years agoMerge branch 'PHP-5.6'
Dmitry Stogov [Wed, 8 Apr 2015 18:26:45 +0000 (21:26 +0300)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer)

Conflicts:
NEWS
Zend/zend_execute_API.c

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
Dmitry Stogov [Wed, 8 Apr 2015 18:24:24 +0000 (21:24 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer)
  Fixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer)

9 years agoFixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer)
Dmitry Stogov [Wed, 8 Apr 2015 18:22:25 +0000 (21:22 +0300)]
Fixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer)

9 years agoFixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer)
Dmitry Stogov [Wed, 8 Apr 2015 18:20:35 +0000 (21:20 +0300)]
Fixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer)

9 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Wed, 8 Apr 2015 17:00:35 +0000 (19:00 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix irc notification for build failure/recover

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
Ferenc Kovacs [Wed, 8 Apr 2015 17:00:21 +0000 (19:00 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix irc notification for build failure/recover

9 years agofix irc notification for build failure/recover
Ferenc Kovacs [Wed, 8 Apr 2015 17:00:03 +0000 (19:00 +0200)]
fix irc notification for build failure/recover

9 years agoRemove SSLv3 test dependencies
Rasmus Lerdorf [Wed, 8 Apr 2015 16:55:55 +0000 (09:55 -0700)]
Remove SSLv3 test dependencies
SSLv3 is going away. Debian8 already ships with an openssl
with no SSLv3 support which was causing these tests to fail.

9 years agoFixed unsigned underflow
Dmitry Stogov [Wed, 8 Apr 2015 14:06:03 +0000 (17:06 +0300)]
Fixed unsigned underflow

9 years agoFixed test
Dmitry Stogov [Wed, 8 Apr 2015 13:29:29 +0000 (16:29 +0300)]
Fixed test

9 years agoFixed access to uninitialized value (in case of exception)
Dmitry Stogov [Wed, 8 Apr 2015 13:01:22 +0000 (16:01 +0300)]
Fixed access to uninitialized value (in case of exception)

9 years agoMerge branch 'PHP-5.6'
Dmitry Stogov [Wed, 8 Apr 2015 12:54:47 +0000 (15:54 +0300)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed typo

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

9 years agoFixed typo
Dmitry Stogov [Wed, 8 Apr 2015 12:53:28 +0000 (15:53 +0300)]
Fixed typo

9 years agoFixed reference counting
Dmitry Stogov [Wed, 8 Apr 2015 12:47:31 +0000 (15:47 +0300)]
Fixed reference counting

9 years agoFixed bug #68887 (resources are not freed correctly)
Dmitry Stogov [Wed, 8 Apr 2015 10:29:42 +0000 (13:29 +0300)]
Fixed bug #68887 (resources are not freed correctly)

9 years agoFixed bug #69325 (php_copy_file_ex does not pass the argument)
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)

9 years agoUse new macros
Xinchen Hui [Wed, 8 Apr 2015 06:30:47 +0000 (14:30 +0800)]
Use new macros

9 years agoMerge branch 'master' of https://github.com/bixuehujin/php-src
Xinchen Hui [Wed, 8 Apr 2015 06:26:57 +0000 (14:26 +0800)]
Merge branch 'master' of https://github.com/bixuehujin/php-src

9 years agoFix zend_hash_find documentation.
matason [Tue, 7 Apr 2015 21:26:16 +0000 (22:26 +0100)]
Fix zend_hash_find documentation.

9 years agoRename prefixed mysqlnd functions - prefixed with undescore, which were
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.

9 years agoSplit mysqlnd_stmt::execute in 2 logical parts :
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.

9 years agoAdd more info to the calls:
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

9 years agoAdded RETURN_ARR and RETVAL_ARR macros
Jin Hu [Tue, 7 Apr 2015 16:33:11 +0000 (00:33 +0800)]
Added RETURN_ARR and RETVAL_ARR macros

9 years agoFixed implicit declaration of function warning
Reeze Xia [Tue, 7 Apr 2015 14:22:42 +0000 (22:22 +0800)]
Fixed implicit declaration of function warning

9 years agoCleanup
Dmitry Stogov [Tue, 7 Apr 2015 11:19:12 +0000 (14:19 +0300)]
Cleanup

9 years agoFixed bug #69376 (Wrong ref counting).
Dmitry Stogov [Mon, 6 Apr 2015 23:35:52 +0000 (02:35 +0300)]
Fixed bug #69376 (Wrong ref counting).

9 years agoAvoid reallocation
Dmitry Stogov [Mon, 6 Apr 2015 23:35:21 +0000 (02:35 +0300)]
Avoid reallocation

9 years agoMerge branch 'PHP-5.6'
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

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

9 years agoFix bug #60022
Nikita Popov [Mon, 6 Apr 2015 20:03:04 +0000 (22:03 +0200)]
Fix bug #60022

9 years agoUndef results for new arithmetic exceptions
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.

9 years agoMerge branch 'PHP-5.6'
Nikita Popov [Mon, 6 Apr 2015 19:45:20 +0000 (21:45 +0200)]
Merge branch 'PHP-5.6'

9 years agoMerge branch 'PHP-5.5' into 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

9 years agoFix static member destruction
Nikita Popov [Mon, 6 Apr 2015 19:37:19 +0000 (21:37 +0200)]
Fix static member destruction

9 years agoFixed test
Dmitry Stogov [Mon, 6 Apr 2015 19:07:18 +0000 (22:07 +0300)]
Fixed test

9 years ago0.0 / 0.0 = NaN
Dmitry Stogov [Mon, 6 Apr 2015 19:03:44 +0000 (22:03 +0300)]
0.0 / 0.0 = NaN

9 years agoMerge branch 'PHP-5.6'
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

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

9 years agoFixed bug #68652 (segmentation fault in destructor)
Dmitry Stogov [Mon, 6 Apr 2015 15:11:41 +0000 (18:11 +0300)]
Fixed bug #68652 (segmentation fault in destructor)

9 years agoRemoved wrong error messages
Dmitry Stogov [Mon, 6 Apr 2015 15:10:45 +0000 (18:10 +0300)]
Removed wrong error messages

9 years agoMerge branch 'master' of git.php.net:php-src
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

9 years agocatch 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

9 years agoFixed error messages
Dmitry Stogov [Mon, 6 Apr 2015 14:24:32 +0000 (17:24 +0300)]
Fixed error messages

9 years agofix build
Anatol Belski [Mon, 6 Apr 2015 11:56:47 +0000 (13:56 +0200)]
fix build

9 years agoFixed weird operators behavior. Division by zero now emits warning and returns +...
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.

9 years agoFix EH_THROW replacement in PDO constructor
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.

9 years agoAlways throw TypeException on throwing zpp failures
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.

9 years agoMerge branch 'PHP-5.6'
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)

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
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)

9 years agoMerge branch 'PHP-5.4' into PHP-5.5
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)

9 years agoFixed 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)

9 years agoMerge branch 'PHP-5.6'
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

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
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)

9 years agoMerge branch 'PHP-5.4' into PHP-5.5
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)

9 years agoFix 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)

9 years agoMerge branch 'PHP-5.6'
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.

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
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.

9 years agoMerge branch 'PHP-5.4' into PHP-5.5
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.

9 years agoBetter fix for #68601 for perf
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

9 years agoFix bug #68601 buffer read overflow in gd_gif_in.c
Remi Collet [Sat, 13 Dec 2014 08:03:44 +0000 (09:03 +0100)]
Fix bug #68601 buffer read overflow in gd_gif_in.c

9 years agoMerge branch 'PHP-5.6'
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

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

9 years agoadd 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

9 years agofix build
Ferenc Kovacs [Sun, 5 Apr 2015 20:45:58 +0000 (22:45 +0200)]
fix build

9 years agofix nts windows_version_info and reorganize
Anatol Belski [Sun, 5 Apr 2015 17:45:04 +0000 (19:45 +0200)]
fix nts windows_version_info and reorganize

9 years agoFixed bug #69371 (Hash table collision leads to inaccessible array keys)
Xinchen Hui [Sun, 5 Apr 2015 10:45:14 +0000 (18:45 +0800)]
Fixed bug #69371 (Hash table collision leads to inaccessible array keys)

9 years agoFix build
Kalle Sommer Nielsen [Sat, 4 Apr 2015 20:11:37 +0000 (22:11 +0200)]
Fix build

9 years agoMerge branch 'master' of https://git.php.net/push/php-src
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

9 years agoThis part here was moved to the EG constructor by Anatol in f51a9c71dd011f7d6879b3262...
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

9 years agoMerge branch 'PHP-5.6'
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

9 years agoupdated NEWS
Anatol Belski [Sat, 4 Apr 2015 19:50:50 +0000 (21:50 +0200)]
updated NEWS

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
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

9 years agoupdated NEWS
Anatol Belski [Sat, 4 Apr 2015 19:49:09 +0000 (21:49 +0200)]
updated NEWS

fixes for bug #69354 was cherrypicked from master

9 years agoadded test for bug #69354
Anatol Belski [Thu, 2 Apr 2015 16:50:16 +0000 (18:50 +0200)]
added test for bug #69354

9 years agorevert skipif, this should run everywhere
Anatol Belski [Thu, 2 Apr 2015 13:37:08 +0000 (15:37 +0200)]
revert skipif, this should run everywhere

9 years agofurther ODBC 3.0 compliance
Anatol Belski [Thu, 2 Apr 2015 13:30:31 +0000 (15:30 +0200)]
further ODBC 3.0 compliance

9 years agomore compliance with the ODBC 3.0
Anatol Belski [Thu, 2 Apr 2015 12:23:23 +0000 (14:23 +0200)]
more compliance with the ODBC 3.0

9 years agotest fixes
Anatol Belski [Thu, 2 Apr 2015 12:22:56 +0000 (14:22 +0200)]
test fixes