php
11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Felipe Pena [Wed, 26 Jun 2013 00:40:24 +0000 (21:40 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Fixed bug #62475 (variant_* functions causes crash when null given as an argument)
  Update NEWS
  - BFN

11 years agoMerge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
Felipe Pena [Wed, 26 Jun 2013 00:39:17 +0000 (21:39 -0300)]
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4

11 years ago- Fixed bug #62475 (variant_* functions causes crash when null given as an argument)
Felipe Pena [Wed, 26 Jun 2013 00:36:50 +0000 (21:36 -0300)]
- Fixed bug #62475 (variant_* functions causes crash when null given as an argument)

11 years agoUpdate NEWS
Christopher Jones [Wed, 26 Jun 2013 00:31:13 +0000 (17:31 -0700)]
Update NEWS

11 years agoUpdate NEWS
Christopher Jones [Wed, 26 Jun 2013 00:30:21 +0000 (17:30 -0700)]
Update NEWS

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Wed, 26 Jun 2013 00:28:12 +0000 (17:28 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

# By Felipe Pena
# Via Felipe Pena
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  - Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
  - BFN
  - Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Wed, 26 Jun 2013 00:28:11 +0000 (17:28 -0700)]
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

# By Felipe Pena
# Via Felipe Pena
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  - BFN
  - Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
  - BFN
  - Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com

11 years ago- BFN
Felipe Pena [Wed, 26 Jun 2013 00:19:56 +0000 (21:19 -0300)]
- BFN

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Felipe Pena [Wed, 26 Jun 2013 00:18:34 +0000 (21:18 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
  - BFN

11 years ago- Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend...
Felipe Pena [Wed, 26 Jun 2013 00:18:09 +0000 (21:18 -0300)]
- Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com

11 years ago- BFN
Felipe Pena [Tue, 25 Jun 2013 21:04:25 +0000 (18:04 -0300)]
- BFN

11 years agoMerge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
Felipe Pena [Tue, 25 Jun 2013 21:01:46 +0000 (18:01 -0300)]
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4

11 years agoMerge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
Felipe Pena [Tue, 25 Jun 2013 21:01:40 +0000 (18:01 -0300)]
Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Felipe Pena [Tue, 25 Jun 2013 21:00:42 +0000 (18:00 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
  - BFN

11 years ago- Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david...
Felipe Pena [Tue, 25 Jun 2013 21:00:33 +0000 (18:00 -0300)]
- Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Christopher Jones [Tue, 25 Jun 2013 20:25:04 +0000 (13:25 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - BFN

11 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Tue, 25 Jun 2013 20:23:50 +0000 (13:23 -0700)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/repository/php-src:
  - Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Tue, 25 Jun 2013 20:23:25 +0000 (13:23 -0700)]
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  - BFN
  - Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana

11 years ago- BFN
Felipe Pena [Tue, 25 Jun 2013 19:27:30 +0000 (16:27 -0300)]
- BFN

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Felipe Pena [Tue, 25 Jun 2013 19:26:36 +0000 (16:26 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana

11 years ago- Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana
Felipe Pena [Tue, 25 Jun 2013 19:26:26 +0000 (16:26 -0300)]
- Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Christopher Jones [Tue, 25 Jun 2013 19:00:24 +0000 (12:00 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Minium changes to allow PDO_OCI to build with Oracle Database 12c libraries. (note OCI8 already builds with Oracle Database 12c)

11 years agoMerge branch 'configure12c' into PHP-5.4
Christopher Jones [Tue, 25 Jun 2013 19:00:08 +0000 (12:00 -0700)]
Merge branch 'configure12c' into PHP-5.4

* configure12c:
  Minium changes to allow PDO_OCI to build with Oracle Database 12c libraries. (note OCI8 already builds with Oracle Database 12c)

11 years agoMinium changes to allow PDO_OCI to build with Oracle Database 12c libraries.
Christopher Jones [Tue, 25 Jun 2013 18:55:41 +0000 (11:55 -0700)]
Minium changes to allow PDO_OCI to build with Oracle Database 12c libraries.
(note OCI8 already builds with Oracle Database 12c)

11 years agoFixed bug #64827 Segfault in zval_mark_grey (zend_gc.c)
Xinchen Hui [Tue, 25 Jun 2013 05:47:50 +0000 (13:47 +0800)]
Fixed bug #64827 Segfault in zval_mark_grey (zend_gc.c)

I can not get a reproduce script since the context is very strict.

Of course I will try to make one, but for now, I just commit this first.

11 years agoUpdate NEWS
Xinchen Hui [Tue, 25 Jun 2013 05:39:31 +0000 (13:39 +0800)]
Update NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Tue, 25 Jun 2013 05:38:50 +0000 (13:38 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoFixed Bug #61828 (Memleak when calling Directory(Recursive)Iterator/Spl(Temp)FileObje...
Xinchen Hui [Tue, 25 Jun 2013 05:37:56 +0000 (13:37 +0800)]
Fixed Bug #61828 (Memleak when calling Directory(Recursive)Iterator/Spl(Temp)FileObject ctor twice)

11 years agoSome tidy-ups: Don't mention Logo GUIDs in three places; mention
Christopher Jones [Tue, 25 Jun 2013 00:12:35 +0000 (17:12 -0700)]
Some tidy-ups: Don't mention Logo GUIDs in three places; mention
password_hash functionality; add some doc URLs for new features;
grammar & typos; formatting changes.

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Felipe Pena [Mon, 24 Jun 2013 19:49:22 +0000 (16:49 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Fixed bug #61594 (ext/session/mod_mm.c: missing free of ps_mm_instance) patch by: jlawall at hotmail dot com
  - BFN

11 years ago- Fixed bug #61594 (ext/session/mod_mm.c: missing free of ps_mm_instance) patch by...
Felipe Pena [Mon, 24 Jun 2013 19:49:15 +0000 (16:49 -0300)]
- Fixed bug #61594 (ext/session/mod_mm.c: missing free of ps_mm_instance) patch by: jlawall at hotmail dot com

11 years ago- BFN
Felipe Pena [Mon, 24 Jun 2013 17:50:14 +0000 (14:50 -0300)]
- BFN

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Felipe Pena [Mon, 24 Jun 2013 17:47:40 +0000 (14:47 -0300)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Fixed bug #61387 (NULL valued anonymous column causes segfault in odbc_fetch_array) patch by: Brandon Kirsch

11 years ago- Fixed bug #61387 (NULL valued anonymous column causes segfault in odbc_fetch_array...
Felipe Pena [Mon, 24 Jun 2013 17:43:35 +0000 (14:43 -0300)]
- Fixed bug #61387 (NULL valued anonymous column causes segfault in odbc_fetch_array) patch by: Brandon Kirsch

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Xinchen Hui [Mon, 24 Jun 2013 15:49:45 +0000 (23:49 +0800)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Mon, 24 Jun 2013 15:49:30 +0000 (23:49 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
Zend/zend_API.c

11 years agoFixed bug (is_callable() triggers Fatal Error)
Xinchen Hui [Mon, 24 Jun 2013 15:45:08 +0000 (23:45 +0800)]
Fixed bug (is_callable() triggers Fatal Error)

This bug is also exists in 5.4, and previous fix by dsp is not complete
for __callStatic stituation, see test script

11 years agoNotify doc team BEFORE we release
David Soria Parra [Mon, 24 Jun 2013 15:44:00 +0000 (17:44 +0200)]
Notify doc team BEFORE we release

11 years agoFix #65108 (is_callable() triggers Fatal Error)
David Soria Parra [Mon, 24 Jun 2013 13:38:48 +0000 (15:38 +0200)]
Fix #65108 (is_callable() triggers Fatal Error)

We have to check if the fcall info cache contains a pointer if we
use __call, otherwise we endup in a static lookup.

11 years agofix imagecreatefromwebp and imagewebp protos
Remi Collet [Mon, 24 Jun 2013 09:15:50 +0000 (11:15 +0200)]
fix imagecreatefromwebp and imagewebp protos

11 years agoUse same logic to load WebP image that other formats
Remi Collet [Mon, 24 Jun 2013 09:10:52 +0000 (11:10 +0200)]
Use same logic to load WebP image that other formats

11 years agoUpstream fix from https://bitbucket.org/libgd/gd-libgd/issue/75
Remi Collet [Mon, 24 Jun 2013 09:03:12 +0000 (11:03 +0200)]
Upstream fix from https://bitbucket.org/libgd/gd-libgd/issue/75

11 years agoOPcache must be compatible with LiteSpeed SAPI
Dmitry Stogov [Mon, 24 Jun 2013 07:59:50 +0000 (11:59 +0400)]
OPcache must be compatible with LiteSpeed SAPI

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Mon, 24 Jun 2013 06:37:10 +0000 (23:37 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  seems to be working fine for me on 32-bit

11 years agoseems to be working fine for me on 32-bit
Stanislav Malyshev [Mon, 24 Jun 2013 06:36:43 +0000 (23:36 -0700)]
seems to be working fine for me on 32-bit

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Mon, 24 Jun 2013 04:26:43 +0000 (21:26 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #62759: Buggy grapheme_substr() on edge case

11 years agoFix bug #62759: Buggy grapheme_substr() on edge case
Stanislav Malyshev [Mon, 24 Jun 2013 04:25:12 +0000 (21:25 -0700)]
Fix bug #62759: Buggy grapheme_substr() on edge case

11 years agoRequire second parameter of imagecrop()
Jakub Vrana [Wed, 15 May 2013 19:40:49 +0000 (12:40 -0700)]
Require second parameter of imagecrop()

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Sun, 23 Jun 2013 22:21:45 +0000 (15:21 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Implements feature Bug #63472 ability to set SO_BINDTODEVICE on socket.

Conflicts:
ext/sockets/sockets.c

11 years agoImplements feature Bug #63472 ability to set SO_BINDTODEVICE on socket.
Damjan Cvetko [Mon, 10 Jun 2013 10:11:14 +0000 (12:11 +0200)]
Implements feature Bug #63472 ability to set SO_BINDTODEVICE on socket.

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Sun, 23 Jun 2013 20:54:50 +0000 (13:54 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Adding test to verify that __sleep can handle parent classes' private members
  Adding test to stabelize keys used when converting objects to arrays

11 years agoAdding test to verify that __sleep can handle parent classes' private members
Marco Pivetta [Thu, 20 Jun 2013 08:34:45 +0000 (10:34 +0200)]
Adding test to verify that __sleep can handle parent classes' private members

11 years agoAdding test to stabelize keys used when converting objects to arrays
Marco Pivetta [Thu, 20 Jun 2013 08:17:32 +0000 (10:17 +0200)]
Adding test to stabelize keys used when converting objects to arrays

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Adam Harvey [Sun, 23 Jun 2013 18:04:10 +0000 (11:04 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #65088 (Generated configure script is malformed on OpenBSD).

11 years agoFix bug #65088 (Generated configure script is malformed on OpenBSD).
Adam Harvey [Sun, 23 Jun 2013 18:01:36 +0000 (11:01 -0700)]
Fix bug #65088 (Generated configure script is malformed on OpenBSD).

We fell foul of a "common urban legend"[0], which resulted in us backslash
escaping double quotes that we didn't need to in acinclude.m4. This worked fine
on most shells, but OpenBSD's ksh implementation really didn't like it.

[0] http://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.69/html_node/Shell-Substitutions.html

11 years agoFixed Bug #65060 imagecreatefrom... crashes with user streams
Remi Collet [Fri, 21 Jun 2013 12:11:04 +0000 (14:11 +0200)]
Fixed Bug #65060 imagecreatefrom... crashes with user streams
Fixed Bug #65084 imagecreatefromjpeg fails with URL

Regression introduced in 8a90aad (drop of USE_GD_IOCTX)
Secure with php_stream_can_cast to avoid segfault in php_stream_cast.
(encountered when imagecreatefromxpm with URL)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Ard Biesheuvel [Fri, 21 Jun 2013 09:26:37 +0000 (11:26 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
Zend/zend_vm_def.h

11 years agoFix non-specialized executor build
Ard Biesheuvel [Fri, 21 Jun 2013 09:07:30 +0000 (11:07 +0200)]
Fix non-specialized executor build

Removed a couple of calls to FREE_OP2() that were left behind in
the handlers for break and continue opcodes after commit 7628da98

11 years agofix #65070, bgcolor does not use the same format as the input image with imagerotate
Pierre Joye [Thu, 20 Jun 2013 20:22:07 +0000 (22:22 +0200)]
fix #65070, bgcolor does not use the same format as the input image with imagerotate

11 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Pierre Joye [Thu, 20 Jun 2013 20:19:53 +0000 (22:19 +0200)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

11 years agofix #65070, bgcolor does not use the same format as the input image with imagerotate
Pierre Joye [Thu, 20 Jun 2013 20:19:33 +0000 (22:19 +0200)]
fix #65070, bgcolor does not use the same format as the input image with imagerotate

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Adam Harvey [Thu, 20 Jun 2013 16:39:37 +0000 (09:39 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix the spelling of the php_cli_server_http_response_status_code_pair typedef.
  Change the search in get_status_string() to correctly handle unknown codes.

11 years agoFix the spelling of the php_cli_server_http_response_status_code_pair typedef.
Adam Harvey [Thu, 20 Jun 2013 16:34:21 +0000 (09:34 -0700)]
Fix the spelling of the php_cli_server_http_response_status_code_pair typedef.

Specifically: php_cli_server_http_reponse_status_code_pair →
php_cli_server_http_response_status_code_pair.

11 years agoChange the search in get_status_string() to correctly handle unknown codes.
Adam Harvey [Wed, 19 Jun 2013 18:32:37 +0000 (11:32 -0700)]
Change the search in get_status_string() to correctly handle unknown codes.

This previously used a buggy implementation of binary search that would loop
infinitely for unknown codes when searching in reason arrays of particular
sizes (such as the one we have at the moment). Since C provides bsearch(),
we'll just use that instead, since libc authors hopefully get this right.

There was also an additional bug that was masked by the first one: the design
was that an unknown code would result in get_status_string() returning NULL,
which would then result in a segfault in append_http_status_line(), since it
assumed that it would always receive a valid string pointer that could be
handed off to smart_str_appends_ex(). We'll now return a placeholder in that
case.

Fixes bug #65066 (Cli server not responsive when responding with 422 http
status code).

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Thu, 20 Jun 2013 09:57:10 +0000 (11:57 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Thu, 20 Jun 2013 09:52:29 +0000 (11:52 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

11 years agoUpdate git rules (5.5 is stable, 5.3 sec only)
Johannes Schlüter [Thu, 20 Jun 2013 09:51:21 +0000 (11:51 +0200)]
Update git rules (5.5 is stable, 5.3 sec only)

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Remi Collet [Thu, 20 Jun 2013 06:42:30 +0000 (08:42 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  skip test for bug #64936 when tokenizer not built

11 years agoskip test for bug #64936 when tokenizer not built
Remi Collet [Thu, 20 Jun 2013 06:42:07 +0000 (08:42 +0200)]
skip test for bug #64936 when tokenizer not built

11 years agoBump version
David Soria Parra [Wed, 19 Jun 2013 20:11:52 +0000 (22:11 +0200)]
Bump version

11 years agoUpdate credits
David Soria Parra [Wed, 19 Jun 2013 20:03:02 +0000 (22:03 +0200)]
Update credits

11 years agoMerge NEWS from PHP 5.4 branch
David Soria Parra [Wed, 19 Jun 2013 19:54:34 +0000 (21:54 +0200)]
Merge NEWS from PHP 5.4 branch

11 years agoReorder NEWS for PHP 5.5.0 final
David Soria Parra [Wed, 19 Jun 2013 19:50:05 +0000 (21:50 +0200)]
Reorder NEWS for PHP 5.5.0 final

11 years agoadd notes about opcache windows issue and migration from APC
Pierre Joye [Wed, 19 Jun 2013 15:57:08 +0000 (17:57 +0200)]
add notes about opcache windows issue and migration from APC

11 years agoadded some tests based on bug #64395
Anatol Belski [Wed, 19 Jun 2013 14:24:30 +0000 (16:24 +0200)]
added some tests based on bug #64395

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Wed, 19 Jun 2013 13:09:33 +0000 (15:09 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Wed, 19 Jun 2013 13:09:04 +0000 (15:09 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

11 years agoThis will be PHP 5.3.28
Johannes Schlüter [Wed, 19 Jun 2013 13:08:02 +0000 (15:08 +0200)]
This will be PHP 5.3.28

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Remi Collet [Wed, 19 Jun 2013 10:26:53 +0000 (12:26 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Related to bug #65047 (Test skip on client / server version)

11 years agoRelated to bug #65047 (Test skip on client / server version)
Remi Collet [Wed, 19 Jun 2013 10:26:21 +0000 (12:26 +0200)]
Related to bug #65047 (Test skip on client / server version)

bug46274.phpt and bug46274_2.phpt
Make query silent (when server don't know bytea_output option)

bug_49985.phpt
Make result "locale" independent

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Matteo Beccati [Wed, 19 Jun 2013 09:53:05 +0000 (11:53 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #65047 (Test skip on client / server version)
  Remove broken client version checking
  Clean up leftover file after the test

11 years agoFixed bug #65047 (Test skip on client / server version)
Matteo Beccati [Wed, 19 Jun 2013 09:46:11 +0000 (11:46 +0200)]
Fixed bug #65047 (Test skip on client / server version)

11 years agoRemove broken client version checking
Matteo Beccati [Wed, 19 Jun 2013 06:34:48 +0000 (08:34 +0200)]
Remove broken client version checking

11 years agoClean up leftover file after the test
Matteo Beccati [Wed, 19 Jun 2013 06:28:47 +0000 (08:28 +0200)]
Clean up leftover file after the test

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Wed, 19 Jun 2013 06:09:29 +0000 (23:09 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  sync NEWS

11 years agosync NEWS
Stanislav Malyshev [Wed, 19 Jun 2013 06:06:20 +0000 (23:06 -0700)]
sync NEWS

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Wed, 19 Jun 2013 05:59:26 +0000 (22:59 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.18 next

Conflicts:
configure.in
main/php_version.h

11 years ago5.4.18 next
Stanislav Malyshev [Wed, 19 Jun 2013 05:58:11 +0000 (22:58 -0700)]
5.4.18 next

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Wed, 19 Jun 2013 03:17:44 +0000 (11:17 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

11 years agoFix test typo
Xinchen Hui [Wed, 19 Jun 2013 03:15:52 +0000 (11:15 +0800)]
Fix test typo

11 years agoFix bug #65051: count() off by one inside unset()
Nikita Popov [Mon, 17 Jun 2013 21:44:13 +0000 (23:44 +0200)]
Fix bug #65051: count() off by one inside unset()

nNumOfElements was incremented after the pDestructor code, so any
code in the dtor would get a wrong number of elements.

Right now the bucket deletion code is replicated in four places,
it should probably be moved off into one function (or rather,
zend_hash_apply_deleter should be used everywhere). The codes are
subtly different though in that the HANDLE_UNBLOCK_INTERRUPTIONS()
happens in different places. In particular it seems odd that in
some cases interruptions stay blocked during the destructor call.

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Mon, 17 Jun 2013 08:06:28 +0000 (01:06 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Merge branch 'pull-request/320'

11 years agoMerge branch 'pull-request/320'
Stanislav Malyshev [Mon, 17 Jun 2013 08:03:20 +0000 (01:03 -0700)]
Merge branch 'pull-request/320'

* pull-request/320:
  this is test 5 not 6
  fix race condition
  more shared names that create race conditions
  change to a unique filename
  more shared filenames
  yet another shared filename
  don't share a filename to stop race conditions
  fix race condition for 2-4 and normalize names for others
  fix race condition when running tests in parallel
  clean up after test
  Fix #64572: Clean up after the test
  Fix #64572: Clean up after the test

11 years agoMerge branch 'pull-request/320'
Stanislav Malyshev [Mon, 17 Jun 2013 08:03:20 +0000 (01:03 -0700)]
Merge branch 'pull-request/320'

* pull-request/320:
  this is test 5 not 6
  fix race condition
  more shared names that create race conditions
  change to a unique filename
  more shared filenames
  yet another shared filename
  don't share a filename to stop race conditions
  fix race condition for 2-4 and normalize names for others
  fix race condition when running tests in parallel
  clean up after test
  Fix #64572: Clean up after the test
  Fix #64572: Clean up after the test

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Mon, 17 Jun 2013 07:41:46 +0000 (00:41 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Tests: PDO Mysql - update for fixed getColumnMeta()
  fix bug #48724

11 years agoTests: PDO Mysql - update for fixed getColumnMeta()
Daniel Beardsley [Wed, 2 Jan 2013 17:55:23 +0000 (10:55 -0700)]
Tests: PDO Mysql - update for fixed getColumnMeta()

The test has always been disabled... so it's never run anyway. Oh well.

11 years agofix bug #48724
Antony Dovgal [Fri, 13 Apr 2012 09:59:52 +0000 (13:59 +0400)]
fix bug #48724

PDO's getColumnMeta() doesn't return native_type for BIT, TINYINT and YEAR

11 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Mon, 17 Jun 2013 07:15:59 +0000 (00:15 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  readline can output control codes
  Bug #55694: Update readline test to support attempted_completion_over variable
  Bug #55694: Expose attempted_completion_over variable from readline library

11 years agoreadline can output control codes
Stanislav Malyshev [Mon, 17 Jun 2013 07:15:31 +0000 (00:15 -0700)]
readline can output control codes

11 years agoBug #55694: Update readline test to support attempted_completion_over variable
Hartmel [Tue, 28 May 2013 07:59:43 +0000 (09:59 +0200)]
Bug #55694: Update readline test to support attempted_completion_over variable