granicus.if.org Git

Dmitry Stogov [Thu, 28 Nov 2013 07:46:11 +0000 (11:46 +0400)]

Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
Fixed bug #53879 (DateTime::createFromFormat() fails to parse cookie expiration date)

commit | commitdiff | tree

Dmitry Stogov [Thu, 28 Nov 2013 07:45:47 +0000 (11:45 +0400)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Don't check argument types for internal functions without type hinting

commit | commitdiff | tree

Dmitry Stogov [Thu, 28 Nov 2013 07:44:14 +0000 (11:44 +0400)]

Don't check argument types for internal functions without type hinting

commit | commitdiff | tree

Derick Rethans [Wed, 27 Nov 2013 22:01:16 +0000 (22:01 +0000)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Derick Rethans [Wed, 27 Nov 2013 22:01:09 +0000 (22:01 +0000)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Derick Rethans [Wed, 27 Nov 2013 22:01:03 +0000 (22:01 +0000)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Derick Rethans [Wed, 27 Nov 2013 22:00:53 +0000 (22:00 +0000)]

Merge branch 'bug53879' into PHP-5.4

commit | commitdiff | tree

Derick Rethans [Wed, 27 Nov 2013 21:59:46 +0000 (21:59 +0000)]

Fixed bug #53879 (DateTime::createFromFormat() fails to parse cookie expiration date)

commit | commitdiff | tree

Dmitry Stogov [Wed, 27 Nov 2013 17:04:23 +0000 (21:04 +0400)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed tests

commit | commitdiff | tree

Dmitry Stogov [Wed, 27 Nov 2013 17:04:00 +0000 (21:04 +0400)]

commit | commitdiff | tree

Dmitry Stogov [Wed, 27 Nov 2013 16:32:21 +0000 (20:32 +0400)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Removed deprecated AI_SET_PTR()s

commit | commitdiff | tree

Dmitry Stogov [Wed, 27 Nov 2013 16:30:35 +0000 (20:30 +0400)]

Removed deprecated AI_SET_PTR()s

commit | commitdiff | tree

Dmitry Stogov [Wed, 27 Nov 2013 10:58:54 +0000 (14:58 +0400)]

Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

* 'PHP-5.4' of git.php.net:php-src:
Fixed bug #66060 (Heap buffer over-read in DateInterval)

commit | commitdiff | tree

Dmitry Stogov [Wed, 27 Nov 2013 10:58:35 +0000 (14:58 +0400)]

Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
NEWS
Fixed bug #66060 (Heap buffer over-read in DateInterval)

commit | commitdiff | tree

Dmitry Stogov [Wed, 27 Nov 2013 10:58:23 +0000 (14:58 +0400)]

Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

* 'PHP-5.6' of git.php.net:php-src:
NEWS
Fixed bug #66060 (Heap buffer over-read in DateInterval)

commit | commitdiff | tree

Dmitry Stogov [Wed, 27 Nov 2013 10:58:08 +0000 (14:58 +0400)]

Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
NEWS
Fixed bug #66060 (Heap buffer over-read in DateInterval)

commit | commitdiff | tree

Dmitry Stogov [Wed, 27 Nov 2013 10:56:48 +0000 (14:56 +0400)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed bug #65969 (Chain assignment with T_LIST failure)

commit | commitdiff | tree

Dmitry Stogov [Wed, 27 Nov 2013 10:56:18 +0000 (14:56 +0400)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed bug #65969 (Chain assignment with T_LIST failure)

Conflicts:
NEWS
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

commit | commitdiff | tree

Dmitry Stogov [Wed, 27 Nov 2013 10:39:40 +0000 (14:39 +0400)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #65969 (Chain assignment with T_LIST failure)

Conflicts:
NEWS
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

commit | commitdiff | tree

Dmitry Stogov [Wed, 27 Nov 2013 10:26:34 +0000 (14:26 +0400)]

Fixed bug #65969 (Chain assignment with T_LIST failure)

commit | commitdiff | tree

Remi Collet [Wed, 27 Nov 2013 10:16:18 +0000 (11:16 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
NEWS
Fixed bug #66060 (Heap buffer over-read in DateInterval)

commit | commitdiff | tree

Remi Collet [Wed, 27 Nov 2013 10:15:58 +0000 (11:15 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
NEWS
Fixed bug #66060 (Heap buffer over-read in DateInterval)

commit | commitdiff | tree

Remi Collet [Wed, 27 Nov 2013 10:15:34 +0000 (11:15 +0100)]

commit | commitdiff | tree

Remi Collet [Wed, 27 Nov 2013 10:15:08 +0000 (11:15 +0100)]

Fixed bug #66060 (Heap buffer over-read in DateInterval)

commit | commitdiff | tree

Remi Collet [Wed, 27 Nov 2013 10:13:16 +0000 (11:13 +0100)]

Fixed bug #66060 (Heap buffer over-read in DateInterval)

commit | commitdiff | tree

Julien Pauli [Wed, 27 Nov 2013 09:33:05 +0000 (10:33 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
5.5.8-dev now

commit | commitdiff | tree

Julien Pauli [Wed, 27 Nov 2013 09:32:05 +0000 (10:32 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Julien Pauli [Wed, 27 Nov 2013 08:34:40 +0000 (09:34 +0100)]

commit | commitdiff | tree

Stanislav Malyshev [Wed, 27 Nov 2013 08:19:30 +0000 (00:19 -0800)]

Merge branch 'PHP-5.6'

* PHP-5.6:

commit | commitdiff | tree

Stanislav Malyshev [Wed, 27 Nov 2013 08:18:54 +0000 (00:18 -0800)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  5.4.24-dev now
  merge fix
  add test
  Fix for Bug #66141 (mysqlnd quote function is wrong with NO_BACKSLASH_ESCAPES after failed query)

commit | commitdiff | tree

Stanislav Malyshev [Wed, 27 Nov 2013 08:15:03 +0000 (00:15 -0800)]

Merge branch 'PHP-5.5'

* PHP-5.5:
5.4.24-dev now

commit | commitdiff | tree

Stanislav Malyshev [Wed, 27 Nov 2013 08:14:42 +0000 (00:14 -0800)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
5.4.24-dev now

Conflicts:
configure.in
main/php_version.h

commit | commitdiff | tree

Stanislav Malyshev [Wed, 27 Nov 2013 08:13:45 +0000 (00:13 -0800)]

commit | commitdiff | tree

George Wang [Tue, 26 Nov 2013 23:53:35 +0000 (18:53 -0500)]

commit | commitdiff | tree

Andrey Hristov [Tue, 26 Nov 2013 18:10:30 +0000 (20:10 +0200)]

Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

commit | commitdiff | tree

Andrey Hristov [Tue, 26 Nov 2013 18:10:17 +0000 (20:10 +0200)]

Merge branch 'master' of git.php.net:php-src

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 17:59:19 +0000 (21:59 +0400)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed opcahce_reset() crash when opcache.protect_memory is set

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 17:59:02 +0000 (21:59 +0400)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed opcahce_reset() crash when opcache.protect_memory is set

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 17:57:32 +0000 (21:57 +0400)]

Fixed opcahce_reset() crash when opcache.protect_memory is set

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 17:44:54 +0000 (21:44 +0400)]

Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
Fixed a wrong test

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 17:44:32 +0000 (21:44 +0400)]

Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

* 'PHP-5.6' of git.php.net:php-src:
Fixed a wrong test

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 17:43:51 +0000 (21:43 +0400)]

Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
Fixed a wrong test

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 17:43:19 +0000 (21:43 +0400)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Added an optimization of class constants and constant calls to some internal functions
Added an optimization of class constants and constant calls to some internal functions

Conflicts:
NEWS

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 17:38:40 +0000 (21:38 +0400)]

Added an optimization of class constants and constant calls to some internal functions

commit | commitdiff | tree

Andrey Hristov [Tue, 26 Nov 2013 17:37:43 +0000 (19:37 +0200)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 17:37:31 +0000 (21:37 +0400)]

Added an optimization of class constants and constant calls to some internal functions

commit | commitdiff | tree

Andrey Hristov [Tue, 26 Nov 2013 17:15:43 +0000 (19:15 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Andrey Hristov [Tue, 26 Nov 2013 17:15:30 +0000 (19:15 +0200)]

commit | commitdiff | tree

Andrey Hristov [Tue, 26 Nov 2013 17:15:12 +0000 (19:15 +0200)]

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 17:03:34 +0000 (21:03 +0400)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed bug #66176 (Invalid constant substitution)
Fixed bug #66176 (Invalid constant substitution)

commit | commitdiff | tree

Andrey Hristov [Tue, 26 Nov 2013 17:02:45 +0000 (19:02 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
NEWS
ext/mysqlnd/mysqlnd.c

commit | commitdiff | tree

Andrey Hristov [Tue, 26 Nov 2013 17:01:49 +0000 (19:01 +0200)]

Fix for Bug #66141 (mysqlnd quote function is wrong with NO_BACKSLASH_ESCAPES after failed query)

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 17:01:01 +0000 (21:01 +0400)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed bug #66176 (Invalid constant substitution)
Fixed bug #66176 (Invalid constant substitution)

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 17:00:00 +0000 (21:00 +0400)]

Fixed bug #66176 (Invalid constant substitution)

commit | commitdiff | tree

Julien Pauli [Tue, 26 Nov 2013 16:44:52 +0000 (17:44 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed a wrong test

commit | commitdiff | tree

Julien Pauli [Tue, 26 Nov 2013 16:43:45 +0000 (17:43 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed a wrong test

commit | commitdiff | tree

Julien Pauli [Tue, 26 Nov 2013 16:43:31 +0000 (17:43 +0100)]

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 15:55:49 +0000 (19:55 +0400)]

Fixed bug #66176 (Invalid constant substitution)

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 13:49:38 +0000 (17:49 +0400)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Revert NEWS
Fixed bug #66176 (Invalid constant substitution)

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 13:48:59 +0000 (17:48 +0400)]

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 13:48:11 +0000 (17:48 +0400)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed bug #66176 (Invalid constant substitution)

Conflicts:
NEWS

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 13:47:02 +0000 (17:47 +0400)]

Fixed bug #66176 (Invalid constant substitution)

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 08:14:22 +0000 (12:14 +0400)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Added test

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 08:14:12 +0000 (12:14 +0400)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Added test

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 08:13:42 +0000 (12:13 +0400)]

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 07:37:05 +0000 (11:37 +0400)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed bug #65559 (Opcache: cache not cleared if changes occur while running)

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 07:36:23 +0000 (11:36 +0400)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed bug #65559 (Opcache: cache not cleared if changes occur while running)
bring the news

Conflicts:
NEWS

commit | commitdiff | tree

Dmitry Stogov [Tue, 26 Nov 2013 07:34:41 +0000 (11:34 +0400)]

Fixed bug #65559 (Opcache: cache not cleared if changes occur while running)

commit | commitdiff | tree

Andrey Hristov [Mon, 25 Nov 2013 19:33:14 +0000 (21:33 +0200)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Andrey Hristov [Mon, 25 Nov 2013 19:33:04 +0000 (21:33 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
NEWS

commit | commitdiff | tree

Andrey Hristov [Mon, 25 Nov 2013 19:31:51 +0000 (21:31 +0200)]

commit | commitdiff | tree

Dmitry Stogov [Mon, 25 Nov 2013 10:12:11 +0000 (14:12 +0400)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed compatibility with old PHP versions
Fixed bug #65915 (Inconsistent results with require return value)

commit | commitdiff | tree

Dmitry Stogov [Mon, 25 Nov 2013 10:11:45 +0000 (14:11 +0400)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed compatibility with old PHP versions
Fixed bug #65915 (Inconsistent results with require return value)

Conflicts:
NEWS

commit | commitdiff | tree

Dmitry Stogov [Mon, 25 Nov 2013 10:09:57 +0000 (14:09 +0400)]

Fixed compatibility with old PHP versions

commit | commitdiff | tree

Dmitry Stogov [Mon, 25 Nov 2013 10:07:24 +0000 (14:07 +0400)]

Fixed bug #65915 (Inconsistent results with require return value)

commit | commitdiff | tree

Anatol Belski [Thu, 21 Nov 2013 20:29:51 +0000 (21:29 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
fixed test
export more Zend API

commit | commitdiff | tree

Anatol Belski [Thu, 21 Nov 2013 20:29:35 +0000 (21:29 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fixed test
  And here is the real fix for #66124
  Fix for Bug #66124 (mysqli under mysqlnd loses precision when bind_param with 'i')

commit | commitdiff | tree

Anatol Belski [Thu, 21 Nov 2013 20:29:02 +0000 (21:29 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fixed test

commit | commitdiff | tree

Anatol Belski [Thu, 21 Nov 2013 20:24:47 +0000 (21:24 +0100)]

commit | commitdiff | tree

Andrey Hristov [Thu, 21 Nov 2013 19:30:36 +0000 (21:30 +0200)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Andrey Hristov [Thu, 21 Nov 2013 19:29:37 +0000 (21:29 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Andrey Hristov [Thu, 21 Nov 2013 19:29:21 +0000 (21:29 +0200)]

And here is the real fix for #66124

commit | commitdiff | tree

Andrey Hristov [Thu, 21 Nov 2013 19:15:22 +0000 (21:15 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Andrey Hristov [Thu, 21 Nov 2013 19:14:42 +0000 (21:14 +0200)]

Fix for Bug #66124 (mysqli under mysqlnd loses precision when bind_param with 'i')

commit | commitdiff | tree

krakjoe [Wed, 20 Nov 2013 16:26:21 +0000 (16:26 +0000)]

Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6

commit | commitdiff | tree

krakjoe [Sun, 17 Nov 2013 22:39:31 +0000 (22:39 +0000)]

export more Zend API

commit | commitdiff | tree

Anatol Belski [Wed, 20 Nov 2013 09:12:29 +0000 (10:12 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
permanently deactivate that place, not on runtime only

commit | commitdiff | tree

Anatol Belski [Wed, 20 Nov 2013 09:12:06 +0000 (10:12 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
permanently deactivate that place, not on runtime only

commit | commitdiff | tree

Anatol Belski [Wed, 20 Nov 2013 09:11:39 +0000 (10:11 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
permanently deactivate that place, not on runtime only

commit | commitdiff | tree

Anatol Belski [Wed, 20 Nov 2013 09:09:11 +0000 (10:09 +0100)]

permanently deactivate that place, not on runtime only

besides the two "if" checks, this fixes static analyze which is sometimes
broken because of this

commit | commitdiff | tree

Yasuo Ohgaki [Tue, 19 Nov 2013 22:25:45 +0000 (07:25 +0900)]

Merge branch 'PHP-5.6'

* PHP-5.6:
added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean

commit | commitdiff | tree

Yasuo Ohgaki [Tue, 19 Nov 2013 22:25:04 +0000 (07:25 +0900)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean

commit | commitdiff | tree

Yasuo Ohgaki [Tue, 19 Nov 2013 22:23:54 +0000 (07:23 +0900)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean

commit | commitdiff | tree

Yasuo Ohgaki [Tue, 19 Nov 2013 22:17:53 +0000 (07:17 +0900)]

Fix WS in serialization_error_002.phpt

commit | commitdiff | tree

Aaron Hamid [Mon, 18 Nov 2013 03:59:42 +0000 (22:59 -0500)]

added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean

commit | commitdiff | tree

Jeff Welch [Fri, 8 Nov 2013 18:07:22 +0000 (13:07 -0500)]

Fixed tests that fail with non-default `serialize_precision` configurations.

See:

* https://bugs.php.net/bug.php?id=64760
* 4dc4302

commit | commitdiff | tree

Jeff Welch [Fri, 8 Nov 2013 18:07:22 +0000 (13:07 -0500)]

Fixed tests that fail with non-default `serialize_precision` configurations.

See:

* https://bugs.php.net/bug.php?id=64760
* 4dc4302

commit | commitdiff | tree

Jeff Welch [Fri, 8 Nov 2013 18:07:22 +0000 (13:07 -0500)]

Fixed tests that fail with non-default `serialize_precision` configurations.

See:

* https://bugs.php.net/bug.php?id=64760
* 4dc4302

commit | commitdiff | tree

Jeff Welch [Fri, 8 Nov 2013 18:07:22 +0000 (13:07 -0500)]

Fixed tests that fail with non-default `serialize_precision` configurations.

See:

* https://bugs.php.net/bug.php?id=64760
* 4dc4302

commit | commitdiff | tree

Remi Collet [Tue, 19 Nov 2013 11:43:00 +0000 (12:43 +0100)]

Merge branch 'PHP-5.6'

* PHP-5.6:
avoid doing a stream_select on a closed stream

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom