]> granicus.if.org Git - php/log
php
11 years agofix uninitialized memory usage
Anatol Belski [Sun, 14 Jul 2013 18:44:29 +0000 (20:44 +0200)]
fix uninitialized memory usage

11 years agoFixed bug #65254 (Exception not catchable when exception thrown in autoload with...
Xinchen Hui [Sun, 14 Jul 2013 03:47:06 +0000 (11:47 +0800)]
Fixed bug #65254 (Exception not catchable when exception thrown in autoload with a namespace).

11 years ago- BFN
Felipe Pena [Sat, 13 Jul 2013 20:55:50 +0000 (17:55 -0300)]
- BFN

11 years ago- Bug #65228 (FTPs memory leak) patch by: marco dot beierer at mbsecurity dot ch
Felipe Pena [Sat, 13 Jul 2013 20:54:31 +0000 (17:54 -0300)]
- Bug #65228 (FTPs memory leak) patch by: marco dot beierer at mbsecurity dot ch

11 years ago- Fixed bug #65227 (Memory leak in gmp_cmp second parameter)
Felipe Pena [Fri, 12 Jul 2013 23:23:00 +0000 (20:23 -0300)]
- Fixed bug #65227 (Memory leak in gmp_cmp second parameter)

11 years agoFixed meta data retrieve when OID is larger than 2^31
Yasuo Ohgaki [Thu, 11 Jul 2013 03:23:11 +0000 (12:23 +0900)]
Fixed meta data retrieve when OID is larger than 2^31

11 years agofix the date for 5.4.17
Stanislav Malyshev [Fri, 12 Jul 2013 17:57:59 +0000 (10:57 -0700)]
fix the date for 5.4.17

11 years agoupdate 5.4.17 date
Stanislav Malyshev [Fri, 12 Jul 2013 17:55:24 +0000 (10:55 -0700)]
update 5.4.17 date

11 years agoupdate 5.4.17 date
Stanislav Malyshev [Fri, 12 Jul 2013 17:53:23 +0000 (10:53 -0700)]
update 5.4.17 date

11 years agoFixed bug #65226 chroot() does not get enabled
Anatol Belski [Wed, 10 Jul 2013 22:48:12 +0000 (00:48 +0200)]
Fixed bug #65226 chroot() does not get enabled

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Wed, 10 Jul 2013 18:13:18 +0000 (11:13 -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:
  Merge PHP 5.3.27 NEWS
  add test for bug #65236
  fix possible resource leak and make sure there's something to qsort()
  - Updated to version 2013.4 (2013d)

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Wed, 10 Jul 2013 17:46:37 +0000 (19:46 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

11 years agoMerge PHP 5.3.27 NEWS
Johannes Schlüter [Wed, 10 Jul 2013 17:45:45 +0000 (19:45 +0200)]
Merge PHP 5.3.27 NEWS

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Wed, 10 Jul 2013 17:36:12 +0000 (19:36 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

11 years agoadd test for bug #65236
Johannes Schlüter [Wed, 10 Jul 2013 17:35:18 +0000 (19:35 +0200)]
add test for bug #65236

11 years agofix possible resource leak and make sure there's something to qsort()
Anatol Belski [Wed, 10 Jul 2013 11:00:47 +0000 (13:00 +0200)]
fix possible resource leak and make sure there's something to qsort()

11 years ago- Updated to version 2013.4 (2013d)
Derick Rethans [Tue, 9 Jul 2013 08:07:16 +0000 (09:07 +0100)]
- Updated to version 2013.4 (2013d)

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Mon, 8 Jul 2013 20:30:54 +0000 (13:30 -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:
  Fixed segfault in mysqlnd when doing long prepare

11 years agoMerge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4
Andrey Hristov [Mon, 8 Jul 2013 18:28:51 +0000 (20:28 +0200)]
Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4

Conflicts:
NEWS

11 years agoFixed segfault in mysqlnd when doing long prepare
Andrey Hristov [Mon, 8 Jul 2013 18:23:32 +0000 (20:23 +0200)]
Fixed segfault in mysqlnd when doing long prepare

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Rob Richards [Sat, 6 Jul 2013 11:59:20 +0000 (07:59 -0400)]
Merge branch 'PHP-5.3' into PHP-5.4

# By Rob Richards (1)
* PHP-5.3:
  truncate results at depth of 255 to prevent corruption

11 years agotruncate results at depth of 255 to prevent corruption
Rob Richards [Sat, 6 Jul 2013 11:53:07 +0000 (07:53 -0400)]
truncate results at depth of 255 to prevent corruption

11 years agofix assembly of safe_address() for x86 and x86_64
Nuno Lopes [Wed, 3 Jul 2013 22:02:28 +0000 (18:02 -0400)]
fix assembly of safe_address() for x86 and x86_64

11 years agofix assembly of safe_address() for x86 and x86_64
Nuno Lopes [Wed, 3 Jul 2013 21:53:46 +0000 (17:53 -0400)]
fix assembly of safe_address() for x86 and x86_64

11 years ago- Fixed build on FreeTDS 0.82
Felipe Pena [Wed, 3 Jul 2013 18:02:03 +0000 (15:02 -0300)]
- Fixed build on FreeTDS 0.82

11 years agoMake sure return value is initialised in case transaction startup fails
Johannes Schlüter [Wed, 3 Jul 2013 15:08:14 +0000 (17:08 +0200)]
Make sure return value is initialised in case transaction startup fails

11 years agoMake sure result is initilized
Johannes Schlüter [Wed, 3 Jul 2013 14:53:09 +0000 (16:53 +0200)]
Make sure result is initilized

Practically this could only be an issue when overriding mysqlnd from
an extension, but makes static analysis happy

11 years agoMerge branch 'PHP-5.3' into PHP-5.4
Sebastian Bergmann [Wed, 3 Jul 2013 04:37:04 +0000 (06:37 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4

11 years agoAdd bison 2.6.4 to the list of supported versions
Sebastian Bergmann [Wed, 3 Jul 2013 04:36:54 +0000 (06:36 +0200)]
Add bison 2.6.4 to the list of supported versions

11 years agofix typo in php man page
Remi Collet [Tue, 2 Jul 2013 10:19:09 +0000 (12:19 +0200)]
fix typo in php man page

11 years agoFixed Bug #65142 Missing phar man page
Remi Collet [Tue, 2 Jul 2013 08:46:50 +0000 (10:46 +0200)]
Fixed Bug #65142 Missing phar man page

Simple man page from phar help output.

11 years agoNEWS
Remi Collet [Tue, 2 Jul 2013 08:46:21 +0000 (10:46 +0200)]
NEWS

11 years agoFixed Bug #65143 Missing php-cgi man page
Remi Collet [Tue, 2 Jul 2013 08:42:47 +0000 (10:42 +0200)]
Fixed Bug #65143 Missing php-cgi man page

Currently php-cgi man page is a simple redirect to
php (CLI) man page.

Could be splited / improved in the future.

11 years agoFixed mysql tests parsing phpinfo()
Anatol Belski [Tue, 2 Jul 2013 06:23:33 +0000 (08:23 +0200)]
Fixed mysql tests parsing phpinfo()

11 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Mon, 1 Jul 2013 20:45:41 +0000 (13:45 -0700)]
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

# By Stanislav Malyshev (3) and others
# Via Stanislav Malyshev (1) and Yasuo Ohgaki (1)
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Update NEWS
  Fixed bug #35703: when session_name("123") consist only digits, should warning
  Fixed bug #49175: mod_files.sh does not support hash bits
  add fix for  #60560 into upgrading
  Add a __wakeup() method to SplFixedArray, thereby fixing serialising an
  small optimization
  fix bug #61860: use USearch for searches, it does the right thing

11 years agoUpdate NEWS
Yasuo Ohgaki [Sat, 29 Jun 2013 02:35:27 +0000 (11:35 +0900)]
Update NEWS

11 years agoFixed bug #35703: when session_name("123") consist only digits, should warning
Yasuo Ohgaki [Fri, 28 Jun 2013 23:07:44 +0000 (08:07 +0900)]
Fixed bug #35703: when session_name("123") consist only digits, should warning

11 years agoFixed bug #49175: mod_files.sh does not support hash bits
Yasuo Ohgaki [Fri, 28 Jun 2013 21:45:18 +0000 (06:45 +0900)]
Fixed bug #49175: mod_files.sh does not support hash bits

11 years agoadd fix for #60560 into upgrading
Stanislav Malyshev [Fri, 28 Jun 2013 21:01:25 +0000 (14:01 -0700)]
add fix for  #60560 into upgrading

11 years agoMerge branch 'bug61860' into PHP-5.4
Stanislav Malyshev [Fri, 28 Jun 2013 20:53:13 +0000 (13:53 -0700)]
Merge branch 'bug61860' into PHP-5.4

* bug61860:
  small optimization
  fix bug #61860: use USearch for searches, it does the right thing

11 years agoAdd a __wakeup() method to SplFixedArray, thereby fixing serialising an
Adam Harvey [Tue, 21 Feb 2012 10:34:42 +0000 (10:34 +0000)]
Add a __wakeup() method to SplFixedArray, thereby fixing serialising an

SplFixedArray object and bug #60560 (SplFixedArray un-/serialize, getSize(),
count() return 0, keys are strings).

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

# By Felipe Pena (9) and others
# Via Arpad Ray (1) and Felipe Pena (1)
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Update NEWS
  Fix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented
  Fixed bug #65136 (RecursiveDirectoryIterator segfault)
  - BFN
  - Fixed bug #64467 (Segmentation fault after imap_reopen failure) patch by: askalski at gmail dot com
  - Reclassify bug
  - BFN
  - Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at web dot de
  - Fixed bug #63409 (php-dba function test fails on big-endian machine) patch by: tianhonglouis at gmail dot com
  - Fixed test
  add new test
  Update NEWS
  Fixed bug #65015 (pg_send_query does not flush send buffer) patch submitted by: adam at vektah dot net
  - BFN
  - Fixed bug #62475 (variant_* functions causes crash when null given as an argument)

11 years agoUpdate NEWS
Arpad Ray [Thu, 27 Jun 2013 18:23:58 +0000 (19:23 +0100)]
Update NEWS

11 years agoFix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented
Arpad Ray [Thu, 27 Jun 2013 18:05:23 +0000 (19:05 +0100)]
Fix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented

When uploading multiple files, the array in the session where the progress
data is stored (and cancel_upload key is set) was overwritten whenever the
progress data was updated, so pending uploads would proceed anyway.

11 years agoFixed bug #65136 (RecursiveDirectoryIterator segfault)
Xinchen Hui [Thu, 27 Jun 2013 04:37:57 +0000 (12:37 +0800)]
Fixed bug #65136 (RecursiveDirectoryIterator segfault)

11 years ago- BFN
Felipe Pena [Wed, 26 Jun 2013 22:16:13 +0000 (19:16 -0300)]
- BFN

11 years ago- Fixed bug #64467 (Segmentation fault after imap_reopen failure) patch by: askalski...
Felipe Pena [Wed, 26 Jun 2013 22:15:19 +0000 (19:15 -0300)]
- Fixed bug #64467 (Segmentation fault after imap_reopen failure) patch by: askalski at gmail dot com

11 years ago- Reclassify bug
Felipe Pena [Wed, 26 Jun 2013 18:15:37 +0000 (15:15 -0300)]
- Reclassify bug

11 years ago- BFN
Felipe Pena [Wed, 26 Jun 2013 18:08:33 +0000 (15:08 -0300)]
- BFN

11 years ago- Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at...
Felipe Pena [Wed, 26 Jun 2013 18:06:27 +0000 (15:06 -0300)]
- Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at web dot de

11 years ago- Fixed bug #63409 (php-dba function test fails on big-endian machine) patch by:...
Felipe Pena [Wed, 26 Jun 2013 16:50:37 +0000 (13:50 -0300)]
- Fixed bug #63409 (php-dba function test fails on big-endian machine) patch by: tianhonglouis at gmail dot com

11 years ago- Fixed test
Felipe Pena [Wed, 26 Jun 2013 16:36:36 +0000 (13:36 -0300)]
- Fixed test

11 years agoadd new test
Andrey Hristov [Wed, 26 Jun 2013 14:44:26 +0000 (16:44 +0200)]
add new test

11 years agoUpdate NEWS
Yasuo Ohgaki [Wed, 26 Jun 2013 07:31:34 +0000 (16:31 +0900)]
Update NEWS

11 years agoFixed bug #65015 (pg_send_query does not flush send buffer) patch submitted by: adam...
Yasuo Ohgaki [Wed, 26 Jun 2013 07:17:57 +0000 (16:17 +0900)]
Fixed bug #65015 (pg_send_query does not flush send buffer) patch submitted by: adam at vektah dot net

11 years ago- BFN
Felipe Pena [Wed, 26 Jun 2013 00:43:23 +0000 (21:43 -0300)]
- 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:30:21 +0000 (17:30 -0700)]
Update NEWS

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 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 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' 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 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 '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 #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 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 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 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 agosmall optimization
Stanislav Malyshev [Mon, 24 Jun 2013 06:52:28 +0000 (23:52 -0700)]
small optimization

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 agofix bug #61860: use USearch for searches, it does the right thing
Stanislav Malyshev [Mon, 24 Jun 2013 06:24:12 +0000 (23:24 -0700)]
fix bug #61860: use USearch for searches, it does the right thing

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 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 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 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 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 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.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 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 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 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 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 agosync NEWS
Stanislav Malyshev [Wed, 19 Jun 2013 06:06:20 +0000 (23:06 -0700)]
sync NEWS

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 agoFix test typo
Xinchen Hui [Wed, 19 Jun 2013 03:15:52 +0000 (11:15 +0800)]
Fix test typo

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 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.