granicus.if.org Git

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fixed bug #63271 (SOAP wsdl cache is not enabled after initial requests)

Conflicts:
NEWS
ext/soap/soap.c

commit | commitdiff | tree

Dmitry Stogov [Thu, 29 Nov 2012 12:31:08 +0000 (16:31 +0400)]

Fixed bug #63271 (SOAP wsdl cache is not enabled after initial requests)

commit | commitdiff | tree

Dmitry Stogov [Thu, 29 Nov 2012 10:43:46 +0000 (14:43 +0400)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Fixed bug #61557 (Crasher in tt-rss backend.php)

commit | commitdiff | tree

Dmitry Stogov [Thu, 29 Nov 2012 10:41:20 +0000 (14:41 +0400)]

Fixed bug #61557 (Crasher in tt-rss backend.php)

commit | commitdiff | tree

Dmitry Stogov [Thu, 29 Nov 2012 10:38:18 +0000 (14:38 +0400)]

Fixed bug #61557 (Crasher in tt-rss backend.php)

commit | commitdiff | tree

Dmitry Stogov [Thu, 29 Nov 2012 09:48:44 +0000 (13:48 +0400)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Fixed bug #63635 (Segfault in gc_collect_cycles)

commit | commitdiff | tree

Dmitry Stogov [Thu, 29 Nov 2012 09:06:12 +0000 (13:06 +0400)]

Fixed bug #63635 (Segfault in gc_collect_cycles)

commit | commitdiff | tree

Dmitry Stogov [Thu, 29 Nov 2012 08:38:34 +0000 (12:38 +0400)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fixed bug #63635 (Segfault in gc_collect_cycles)

Conflicts:
NEWS

commit | commitdiff | tree

Dmitry Stogov [Thu, 29 Nov 2012 08:25:20 +0000 (12:25 +0400)]

Fixed bug #63635 (Segfault in gc_collect_cycles)

commit | commitdiff | tree

Remi Collet [Wed, 28 Nov 2012 09:45:23 +0000 (10:45 +0100)]

NEWS

commit | commitdiff | tree

Remi Collet [Wed, 28 Nov 2012 09:39:23 +0000 (10:39 +0100)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Fixed Bug #63581 Possible buffer overflow
Fixed Bug #63581 Possible null dereference

commit | commitdiff | tree

Remi Collet [Wed, 28 Nov 2012 09:38:37 +0000 (10:38 +0100)]

Merge branch 'PHP-5.3' into PHP-5.5

* PHP-5.3:
Fixed Bug #63581 Possible buffer overflow
Fixed Bug #63581 Possible null dereference

commit | commitdiff | tree

Remi Collet [Wed, 28 Nov 2012 09:38:13 +0000 (10:38 +0100)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fixed Bug #63581 Possible buffer overflow
Fixed Bug #63581 Possible null dereference

commit | commitdiff | tree

Remi Collet [Wed, 28 Nov 2012 09:35:04 +0000 (10:35 +0100)]

Fixed Bug #63581 Possible buffer overflow

In fpm-log, possible buffer overflow. Check for length is done at
the beginning of the loop, so is not done when overflow occurs
on the last loop (len = 1024 or 1025). (ack from fat).

This issue where found from by static code analysis tool and, so,
I can't provide any reproducer.

commit | commitdiff | tree

Remi Collet [Wed, 28 Nov 2012 09:32:23 +0000 (10:32 +0100)]

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

* 'master' of git.php.net:php-src:
BFN #61272
fix bug #61272 ob_start callback get passed empty string

commit | commitdiff | tree

Remi Collet [Wed, 28 Nov 2012 09:32:00 +0000 (10:32 +0100)]

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

* 'PHP-5.5' of git.php.net:php-src:
  updated NEWS
  Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
  This test isn't supposed to pass on windows
  Fixed Bug #63614 (Fatal error on Reflection)

commit | commitdiff | tree

Remi Collet [Wed, 28 Nov 2012 09:31:49 +0000 (10:31 +0100)]

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

* 'PHP-5.4' of git.php.net:php-src:
  BFN #61272
  fix bug #61272 ob_start callback get passed empty string
  Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
  This test isn't supposed to pass on windows
  Fixed Bug #63614 (Fatal error on Reflection)

commit | commitdiff | tree

Remi Collet [Wed, 28 Nov 2012 09:28:18 +0000 (10:28 +0100)]

Fixed Bug #63581 Possible null dereference

Possible NULL dereference when trying to delete the single item
of a list (ack from fat).

This issues where found from by static code analysis tool and,
so, I can't provide any reproducer.

commit | commitdiff | tree

Michael Wallner [Wed, 28 Nov 2012 09:24:42 +0000 (10:24 +0100)]

Merge branch 'PHP-5.4'

commit | commitdiff | tree

Remi Collet [Wed, 28 Nov 2012 09:24:32 +0000 (10:24 +0100)]

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

* 'PHP-5.3' of git.php.net:php-src:
  Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
  This test isn't supposed to pass on windows
  Fixed Bug #63614 (Fatal error on Reflection)

commit | commitdiff | tree

Remi Collet [Wed, 28 Nov 2012 09:23:50 +0000 (10:23 +0100)]

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

* 'master' of git.php.net:php-src:
  updated NEWS
  Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
  This test isn't supposed to pass on windows
  Fixed Bug #63614 (Fatal error on Reflection)

commit | commitdiff | tree

Michael Wallner [Wed, 28 Nov 2012 09:23:26 +0000 (10:23 +0100)]

BFN #61272

commit | commitdiff | tree

Michael Wallner [Wed, 28 Nov 2012 09:19:44 +0000 (10:19 +0100)]

fix bug #61272 ob_start callback get passed empty string

commit | commitdiff | tree

Anatoliy Belsky [Tue, 27 Nov 2012 16:05:48 +0000 (17:05 +0100)]

Merge branch 'PHP-5.5'

* PHP-5.5:
updated NEWS
Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows

Conflicts:
NEWS

commit | commitdiff | tree

Anatoliy Belsky [Tue, 27 Nov 2012 15:59:27 +0000 (16:59 +0100)]

updated NEWS

commit | commitdiff | tree

Anatoliy Belsky [Tue, 27 Nov 2012 15:55:47 +0000 (16:55 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows

Conflicts:
NEWS

commit | commitdiff | tree

Anatoliy Belsky [Tue, 27 Nov 2012 15:45:25 +0000 (16:45 +0100)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows

Conflicts:
NEWS
ext/fileinfo/libmagic.patch
ext/fileinfo/tests/finfo_open_error-win32.phpt

commit | commitdiff | tree

Anatoliy Belsky [Tue, 27 Nov 2012 15:33:58 +0000 (16:33 +0100)]

Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows

commit | commitdiff | tree

Anatoliy Belsky [Tue, 27 Nov 2012 15:14:00 +0000 (16:14 +0100)]

Merge branch 'PHP-5.5'

* PHP-5.5:
This test isn't supposed to pass on windows

commit | commitdiff | tree

Anatoliy Belsky [Tue, 27 Nov 2012 15:13:19 +0000 (16:13 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
This test isn't supposed to pass on windows

commit | commitdiff | tree

Anatoliy Belsky [Tue, 27 Nov 2012 15:11:53 +0000 (16:11 +0100)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
This test isn't supposed to pass on windows

commit | commitdiff | tree

Anatoliy Belsky [Tue, 27 Nov 2012 15:02:55 +0000 (16:02 +0100)]

This test isn't supposed to pass on windows

commit | commitdiff | tree

Xinchen Hui [Tue, 27 Nov 2012 05:38:38 +0000 (13:38 +0800)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Xinchen Hui [Tue, 27 Nov 2012 05:37:50 +0000 (13:37 +0800)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Xinchen Hui [Tue, 27 Nov 2012 05:35:41 +0000 (13:35 +0800)]

Merge branch 'PHP-5.3' into PHP-5.4

commit | commitdiff | tree

Xinchen Hui [Tue, 27 Nov 2012 05:34:36 +0000 (13:34 +0800)]

Fixed Bug #63614 (Fatal error on Reflection)

commit | commitdiff | tree

Remi Collet [Mon, 26 Nov 2012 12:06:00 +0000 (13:06 +0100)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Related bug #63588 fix length computation + optimize for speed

commit | commitdiff | tree

Remi Collet [Mon, 26 Nov 2012 12:05:37 +0000 (13:05 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Related bug #63588 fix length computation + optimize for speed

commit | commitdiff | tree

Remi Collet [Mon, 26 Nov 2012 12:04:34 +0000 (13:04 +0100)]

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

* 'master' of git.php.net:php-src:
count($test_files) already be checked above : if ($test_cnt)

commit | commitdiff | tree

Remi Collet [Mon, 26 Nov 2012 12:04:04 +0000 (13:04 +0100)]

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

* 'PHP-5.5' of git.php.net:php-src:
count($test_files) already be checked above : if ($test_cnt)

commit | commitdiff | tree

Remi Collet [Mon, 26 Nov 2012 11:59:08 +0000 (12:59 +0100)]

Related bug #63588 fix length computation + optimize for speed

Following comment from Yoram "The patch looks fine, except of testing
for true value of utf16 in each iteration."
Also fix the length computation during check phase.

commit | commitdiff | tree

Xinchen Hui [Sun, 25 Nov 2012 08:20:30 +0000 (16:20 +0800)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Xinchen Hui [Sun, 25 Nov 2012 08:19:58 +0000 (16:19 +0800)]

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

commit | commitdiff | tree

Xinchen Hui [Sun, 25 Nov 2012 08:18:20 +0000 (16:18 +0800)]

count($test_files) already be checked above : if ($test_cnt)

thus we can use $sum_results instead of the preg_match

commit | commitdiff | tree

Remi Collet [Sun, 25 Nov 2012 07:21:35 +0000 (08:21 +0100)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Fixed bug #63588 Duplicate implementation of php_next_utf8_char

commit | commitdiff | tree

Remi Collet [Sun, 25 Nov 2012 07:21:10 +0000 (08:21 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #63588 Duplicate implementation of php_next_utf8_char

commit | commitdiff | tree

Remi Collet [Sun, 25 Nov 2012 07:14:23 +0000 (08:14 +0100)]

Fixed bug #63588 Duplicate implementation of php_next_utf8_char

Json use an utf8 parser from a third party library, switch to
our implementation of php_next_utf8_char.
This also helps on solving #63520. All the unit tests succeed.
Our implementation also seems a little faster.

json.dsp need to be regenerated.

commit | commitdiff | tree

Remi Collet [Sun, 25 Nov 2012 06:49:27 +0000 (07:49 +0100)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Fixed Bug #63361 Header not installed
NEWS entries

commit | commitdiff | tree

Remi Collet [Sun, 25 Nov 2012 06:48:44 +0000 (07:48 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed Bug #63361 Header not installed

commit | commitdiff | tree

Remi Collet [Sun, 25 Nov 2012 06:46:02 +0000 (07:46 +0100)]

Fixed Bug #63361 Header not installed

ext/mysqli/php_mysqli_structs.h is installed and includes
mysqli_mysqlnd.h or mysqli_libmysql.h. So this header must also
be installed.

commit | commitdiff | tree

Remi Collet [Sun, 25 Nov 2012 06:40:39 +0000 (07:40 +0100)]

NEWS entries

commit | commitdiff | tree

Xinchen Hui [Sun, 25 Nov 2012 04:05:09 +0000 (12:05 +0800)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Xinchen Hui [Sun, 25 Nov 2012 03:46:35 +0000 (11:46 +0800)]

XFAIL test should not be considered as failed

commit | commitdiff | tree

Xinchen Hui [Sun, 25 Nov 2012 03:45:36 +0000 (11:45 +0800)]

let make test report the run-test result

commit | commitdiff | tree

Xinchen Hui [Sun, 25 Nov 2012 03:46:35 +0000 (11:46 +0800)]

XFAIL test should not be considered as failed

commit | commitdiff | tree

Xinchen Hui [Sun, 25 Nov 2012 03:45:36 +0000 (11:45 +0800)]

let make test report the run-test result

(patch by reeze.xia@gmail.com)

commit | commitdiff | tree

Xinchen Hui [Sun, 25 Nov 2012 03:24:32 +0000 (11:24 +0800)]

Merge branch 'php.ini_text_fix' of https://github.com/BryanH/php-src

commit | commitdiff | tree

Stanislav Malyshev [Sun, 25 Nov 2012 00:30:23 +0000 (16:30 -0800)]

Merge branch 'PHP-5.5'

* PHP-5.5:
fix NEWS
5.4.10-dev

commit | commitdiff | tree

Stanislav Malyshev [Sun, 25 Nov 2012 00:30:00 +0000 (16:30 -0800)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix NEWS
5.4.10-dev

Conflicts:
configure.in
main/php_version.h

commit | commitdiff | tree

Stanislav Malyshev [Sun, 25 Nov 2012 00:28:56 +0000 (16:28 -0800)]

fix NEWS

commit | commitdiff | tree

Stanislav Malyshev [Sat, 10 Nov 2012 08:07:44 +0000 (00:07 -0800)]

5.4.10-dev

commit | commitdiff | tree

Nikita Popov [Sat, 24 Nov 2012 18:24:40 +0000 (19:24 +0100)]

Merge branch 'PHP-5.5'

commit | commitdiff | tree

Nikita Popov [Sat, 24 Nov 2012 17:21:11 +0000 (18:21 +0100)]

Fix bug #63596: finally in generators segfaults

EX(fast_ret) wasn't initialized in this case so the code ended up
dereferencing an invalid pointer after the jump.

commit | commitdiff | tree

Remi Collet [Sat, 24 Nov 2012 16:57:08 +0000 (17:57 +0100)]

Merge branch 'PHP-5.5'

* PHP-5.5:
Fixed Bug #63149 Feature missing with system SQLite

commit | commitdiff | tree

Remi Collet [Sat, 24 Nov 2012 16:56:23 +0000 (17:56 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed Bug #63149 Feature missing with system SQLite

commit | commitdiff | tree

Remi Collet [Sat, 24 Nov 2012 16:47:51 +0000 (17:47 +0100)]

Fixed Bug #63149 Feature missing with system SQLite

In pdo_sqlite, getColumnMeta should return the table name.
With bundled SQLite library, -DSQLITE_ENABLE_COLUMN_METADATA=1 (other_flags)
enable the feature in SQLite (function sqlite3_column_table_name).
With system SQLite library, this fix detects if sqlite3_column_table_name is
available and add SQLITE_ENABLE_COLUMN_METADATA macro to get the same behavior.

Test already exists: ext/pdo_sqlite/tests/bug_42589.phpt

commit | commitdiff | tree

Remi Collet [Sat, 24 Nov 2012 16:35:30 +0000 (17:35 +0100)]

Merge branch 'PHP-5.5'

* PHP-5.5:
add unit test for bug 63126

commit | commitdiff | tree

Remi Collet [Sat, 24 Nov 2012 16:32:05 +0000 (17:32 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
add unit test for bug 63126
NEWS

commit | commitdiff | tree

Remi Collet [Sat, 24 Nov 2012 16:31:18 +0000 (17:31 +0100)]

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
add unit test for bug 63126
NEWS

commit | commitdiff | tree

Remi Collet [Sat, 24 Nov 2012 16:30:48 +0000 (17:30 +0100)]

add unit test for bug 63126