]> granicus.if.org Git - php/log
php
12 years ago- Fixed ZTS build
Felipe Pena [Fri, 30 Nov 2012 11:07:35 +0000 (09:07 -0200)]
- Fixed ZTS build

12 years agoFixed bug #63066 (Calling an undefined method in a generator results in a seg fault...
Dmitry Stogov [Fri, 30 Nov 2012 10:14:36 +0000 (14:14 +0400)]
Fixed bug #63066 (Calling an undefined method in a generator results in a seg fault) (fixed with previous commit).

12 years ago. The VM stacks for passing function arguments and syntaticaly nested calls were...
Dmitry Stogov [Fri, 30 Nov 2012 09:39:23 +0000 (13:39 +0400)]
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more.
. Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Fri, 30 Nov 2012 06:50:01 +0000 (14:50 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Fri, 30 Nov 2012 06:49:35 +0000 (14:49 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoFixed bug #63377 (Segfault on output buffer)
Xinchen Hui [Fri, 30 Nov 2012 06:48:51 +0000 (14:48 +0800)]
Fixed bug #63377 (Segfault on output buffer)

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Fri, 30 Nov 2012 06:33:52 +0000 (14:33 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoformat
Xinchen Hui [Fri, 30 Nov 2012 06:33:29 +0000 (14:33 +0800)]
format

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Fri, 30 Nov 2012 06:33:24 +0000 (14:33 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoFormat
Xinchen Hui [Fri, 30 Nov 2012 06:32:15 +0000 (14:32 +0800)]
Format

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Fri, 30 Nov 2012 06:30:37 +0000 (14:30 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Fri, 30 Nov 2012 06:29:13 +0000 (14:29 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoFixed bug #63398 (Segfault when polling closed link)
Xinchen Hui [Fri, 30 Nov 2012 06:28:32 +0000 (14:28 +0800)]
Fixed bug #63398 (Segfault when polling closed link)

12 years agoFixed bug #63271 (SOAP wsdl cache is not enabled after initial requests)
Dmitry Stogov [Thu, 29 Nov 2012 12:44:19 +0000 (16:44 +0400)]
Fixed bug #63271 (SOAP wsdl cache is not enabled after initial requests)

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Dmitry Stogov [Thu, 29 Nov 2012 12:41:09 +0000 (16:41 +0400)]
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

12 years agoFixed bug #63271 (SOAP wsdl cache is not enabled after initial requests)
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)

12 years agoFixed bug #61557 (Crasher in tt-rss backend.php)
Dmitry Stogov [Thu, 29 Nov 2012 10:41:20 +0000 (14:41 +0400)]
Fixed bug #61557 (Crasher in tt-rss backend.php)

12 years agoFixed bug #61557 (Crasher in tt-rss backend.php)
Dmitry Stogov [Thu, 29 Nov 2012 10:38:18 +0000 (14:38 +0400)]
Fixed bug #61557 (Crasher in tt-rss backend.php)

12 years agoFixed bug #63635 (Segfault in gc_collect_cycles)
Dmitry Stogov [Thu, 29 Nov 2012 09:06:12 +0000 (13:06 +0400)]
Fixed bug #63635 (Segfault in gc_collect_cycles)

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
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

12 years agoFixed bug #63635 (Segfault in gc_collect_cycles)
Dmitry Stogov [Thu, 29 Nov 2012 08:25:20 +0000 (12:25 +0400)]
Fixed bug #63635 (Segfault in gc_collect_cycles)

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

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

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
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

12 years agoFixed Bug #63581 Possible buffer overflow
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.

12 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
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)

12 years agoMerge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
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)

12 years agoFixed Bug #63581 Possible null dereference
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.

12 years agoMerge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3
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)

12 years agoBFN #61272
Michael Wallner [Wed, 28 Nov 2012 09:23:26 +0000 (10:23 +0100)]
BFN #61272

12 years agofix bug #61272 ob_start callback get passed empty string
Michael Wallner [Wed, 28 Nov 2012 09:19:44 +0000 (10:19 +0100)]
fix bug #61272 ob_start callback get passed empty string

12 years agoupdated NEWS
Anatoliy Belsky [Tue, 27 Nov 2012 15:59:27 +0000 (16:59 +0100)]
updated NEWS

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

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
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

12 years agoFixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
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

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

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
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

12 years agoThis test isn't supposed to pass on windows
Anatoliy Belsky [Tue, 27 Nov 2012 15:02:55 +0000 (16:02 +0100)]
This test isn't supposed to pass on windows

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Tue, 27 Nov 2012 05:37:50 +0000 (13:37 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Xinchen Hui [Tue, 27 Nov 2012 05:35:41 +0000 (13:35 +0800)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoFixed Bug #63614 (Fatal error on Reflection)
Xinchen Hui [Tue, 27 Nov 2012 05:34:36 +0000 (13:34 +0800)]
Fixed Bug #63614 (Fatal error on Reflection)

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

12 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
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)

12 years agoRelated bug #63588 fix length computation + optimize for speed
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.

12 years agoMerge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
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

12 years agocount($test_files) already be checked above : if ($test_cnt)
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

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

12 years agoFixed bug #63588 Duplicate implementation of php_next_utf8_char
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.

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

12 years agoFixed Bug #63361 Header not installed
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.

12 years agoNEWS entries
Remi Collet [Sun, 25 Nov 2012 06:40:39 +0000 (07:40 +0100)]
NEWS entries

12 years agoXFAIL test should not be considered as failed
Xinchen Hui [Sun, 25 Nov 2012 03:46:35 +0000 (11:46 +0800)]
XFAIL test should not be considered as failed

12 years agolet make test report the run-test result
Xinchen Hui [Sun, 25 Nov 2012 03:45:36 +0000 (11:45 +0800)]
let make test report the run-test result

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

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

12 years ago5.4.10-dev
Stanislav Malyshev [Sat, 10 Nov 2012 08:07:44 +0000 (00:07 -0800)]
5.4.10-dev

12 years agoFix bug #63596: finally in generators segfaults
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.

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

12 years agoFixed Bug #63149 Feature missing with system SQLite
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

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

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
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

12 years agoadd unit test for bug 63126
Remi Collet [Sat, 24 Nov 2012 16:30:48 +0000 (17:30 +0100)]
add unit test for bug 63126

12 years agoNEWS
Remi Collet [Sat, 24 Nov 2012 14:23:25 +0000 (15:23 +0100)]
NEWS

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Remi Collet [Sat, 24 Nov 2012 14:03:09 +0000 (15:03 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Remi Collet [Sat, 24 Nov 2012 14:01:24 +0000 (15:01 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array

12 years agoFixed Bug #63126 DISABLE_AUTHENTICATOR ignores array
Remi Collet [Sat, 24 Nov 2012 14:00:03 +0000 (15:00 +0100)]
Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatoliy Belsky [Fri, 23 Nov 2012 13:01:28 +0000 (14:01 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Backported the fix for bug #63248 from 5.4+

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Fri, 23 Nov 2012 13:00:30 +0000 (14:00 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Backported the fix for bug #63248 from 5.4+

12 years agoBackported the fix for bug #63248 from 5.4+
Anatoliy Belsky [Fri, 23 Nov 2012 12:58:22 +0000 (13:58 +0100)]
Backported the fix for bug #63248 from 5.4+

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Anatoliy Belsky [Thu, 22 Nov 2012 18:05:31 +0000 (19:05 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed test for bug #63297

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Anatoliy Belsky [Thu, 22 Nov 2012 18:04:49 +0000 (19:04 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed test for bug #63297

12 years agoFixed test for bug #63297
Anatoliy Belsky [Thu, 22 Nov 2012 18:01:09 +0000 (19:01 +0100)]
Fixed test for bug #63297

12 years agoImproved "finally" im[plementation
Dmitry Stogov [Thu, 22 Nov 2012 11:17:05 +0000 (15:17 +0400)]
Improved "finally" im[plementation

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Wed, 21 Nov 2012 20:11:27 +0000 (21:11 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Wed, 21 Nov 2012 20:09:57 +0000 (21:09 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4

12 years agoPHP 5.3.19
Johannes Schlüter [Wed, 21 Nov 2012 20:09:25 +0000 (21:09 +0100)]
PHP 5.3.19

12 years agoAdd myself to QA
David Soria Parra [Wed, 21 Nov 2012 17:42:01 +0000 (18:42 +0100)]
Add myself to QA

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Wed, 21 Nov 2012 04:30:54 +0000 (12:30 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5

12 years agoUnused variable copystr
Xinchen Hui [Wed, 21 Nov 2012 04:30:03 +0000 (12:30 +0800)]
Unused variable copystr

copystr is declared again blow

12 years agoUpdate credits for 5.5
Xinchen Hui [Wed, 21 Nov 2012 04:17:41 +0000 (12:17 +0800)]
Update credits for 5.5

12 years agoAdd the new password functions to UPGRADING.
Adam Harvey [Wed, 21 Nov 2012 01:25:05 +0000 (09:25 +0800)]
Add the new password functions to UPGRADING.

As a public service announcement on behalf of the documentation team, please
remember to update UPGRADING as well as NEWS when adding features to master or
an alpha branch. :)

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Dmitry Stogov [Tue, 20 Nov 2012 08:58:16 +0000 (12:58 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #63468 (wrong called method as callback with inheritance)

Conflicts:
NEWS

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Dmitry Stogov [Tue, 20 Nov 2012 08:54:40 +0000 (12:54 +0400)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #63468 (wrong called method as callback with inheritance)

Conflicts:
NEWS

12 years agoFixed bug #63468 (wrong called method as callback with inheritance)
Dmitry Stogov [Tue, 20 Nov 2012 08:51:55 +0000 (12:51 +0400)]
Fixed bug #63468 (wrong called method as callback with inheritance)

12 years agoMerge branch 'add_ver_to_upgrading' into PHP-5.5
Christopher Jones [Sun, 18 Nov 2012 22:44:00 +0000 (14:44 -0800)]
Merge branch 'add_ver_to_upgrading' into PHP-5.5

* add_ver_to_upgrading:
  Add actual branch version number to UPGRADING

12 years agoAdd actual branch version number to UPGRADING
Christopher Jones [Sun, 18 Nov 2012 22:43:26 +0000 (14:43 -0800)]
Add actual branch version number to UPGRADING

12 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Sun, 18 Nov 2012 22:20:57 +0000 (14:20 -0800)]
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:
  Put the new php.ini directives together.
  Move the deprecated functions up to the Deprecated Functionality section so they're more visible.
  Regenerate Zend ini scanner
  Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value

12 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Sun, 18 Nov 2012 22:20:53 +0000 (14:20 -0800)]
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:
  Regenerate Zend ini scanner
  Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value

12 years agoMerge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3
Christopher Jones [Sun, 18 Nov 2012 22:20:49 +0000 (14:20 -0800)]
Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3

* 'PHP-5.3' of https://git.php.net/repository/php-src:
  Regenerate Zend ini scanner
  Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value

12 years agoPut the new php.ini directives together.
Adam Harvey [Fri, 16 Nov 2012 04:34:10 +0000 (04:34 +0000)]
Put the new php.ini directives together.

(And make colon usage more consistent.)

12 years agoMove the deprecated functions up to the Deprecated Functionality section so
Adam Harvey [Fri, 16 Nov 2012 04:33:17 +0000 (04:33 +0000)]
Move the deprecated functions up to the Deprecated Functionality section so
they're more visible.

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Pierrick Charron [Fri, 16 Nov 2012 23:28:04 +0000 (18:28 -0500)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Regenerate Zend ini scanner

Conflicts:
Zend/zend_ini_scanner.c
Zend/zend_ini_scanner_defs.h

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Pierrick Charron [Fri, 16 Nov 2012 23:24:42 +0000 (18:24 -0500)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Regenerate Zend ini scanner

Conflicts:
Zend/zend_ini_scanner.c
Zend/zend_ini_scanner_defs.h

12 years agoRegenerate Zend ini scanner
Pierrick Charron [Fri, 16 Nov 2012 23:16:21 +0000 (18:16 -0500)]
Regenerate Zend ini scanner

Regenerate both zend_ini_scanner.c and zend_ini_scanner_defs.h

12 years agoMerge branch 'PHP-5.4' into PHP-5.5
Pierrick Charron [Fri, 16 Nov 2012 23:08:19 +0000 (18:08 -0500)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value

12 years agoMerge branch 'PHP-5.3' into PHP-5.4
Pierrick Charron [Fri, 16 Nov 2012 23:07:02 +0000 (18:07 -0500)]
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value

12 years agoFixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value
Pierrick Charron [Fri, 16 Nov 2012 23:04:14 +0000 (18:04 -0500)]
Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value

Restore the old behavior but keep bug 51094 fixed

12 years agoMerge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Christopher Jones [Fri, 16 Nov 2012 03:29:53 +0000 (19:29 -0800)]
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 ext/intl/tests/timezone_createDefault_basic.phpt
  Skip test if directory does not exist
  Fixed ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
  Fixed test sapi/cli/tests/006.phpt
  Fixed compiler reenterability
  Fixed compiler reenterability
  Updated NEWS
  UPdated NEWS
  Updated NEWS

12 years agoMerge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
Christopher Jones [Fri, 16 Nov 2012 03:29:48 +0000 (19:29 -0800)]
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:
  Skip test if directory does not exist
  Fixed test sapi/cli/tests/006.phpt
  Fixed compiler reenterability
  Fixed compiler reenterability
  UPdated NEWS
  Updated NEWS

12 years agoMerge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3
Christopher Jones [Fri, 16 Nov 2012 03:29:44 +0000 (19:29 -0800)]
Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3

* 'PHP-5.3' of https://git.php.net/repository/php-src:
  Skip test if directory does not exist
  Updated NEWS