]>
granicus.if.org Git - php/log
Ferenc Kovacs [Fri, 15 Mar 2013 08:41:50 +0000 (09:41 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
explain the step updating the git submodule reference in web/php.git
Ferenc Kovacs [Fri, 15 Mar 2013 08:41:34 +0000 (09:41 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
explain the step updating the git submodule reference in web/php.git
Ferenc Kovacs [Fri, 15 Mar 2013 08:40:28 +0000 (09:40 +0100)]
explain the step updating the git submodule reference in web/php.git
Anatol Belski [Thu, 14 Mar 2013 13:39:47 +0000 (14:39 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix zts check
Anatol Belski [Thu, 14 Mar 2013 13:39:09 +0000 (14:39 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
fix zts check
Anatol Belski [Thu, 14 Mar 2013 13:38:20 +0000 (14:38 +0100)]
fix zts check
Dmitry Stogov [Thu, 14 Mar 2013 10:19:41 +0000 (14:19 +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:
fix the fix
fix for bug #63530 mysqlnd_stmt::bind_one_parameter uses wrong alloc for stmt->param_bind
Forgot to remove some now unused variables
Add support for non-scalar Iterator keys in foreach
fixed headers order
- Updated to version 2013.2 (2013b)
fixed the test
Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT'])
Disable zend_always_inline in debug build
Andrey Hristov [Wed, 13 Mar 2013 14:56:44 +0000 (15:56 +0100)]
fix the fix
Andrey Hristov [Wed, 13 Mar 2013 14:29:40 +0000 (15:29 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
NEWS
Dmitry Stogov [Wed, 13 Mar 2013 13:51:10 +0000 (17:51 +0400)]
Removed redundand code
Andrey Hristov [Wed, 13 Mar 2013 13:24:23 +0000 (14:24 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
Conflicts:
NEWS
Andrey Hristov [Wed, 13 Mar 2013 12:37:51 +0000 (13:37 +0100)]
fix for bug #63530 mysqlnd_stmt::bind_one_parameter uses wrong alloc for stmt->param_bind
Nikita Popov [Tue, 12 Mar 2013 16:39:20 +0000 (17:39 +0100)]
Forgot to remove some now unused variables
Nikita Popov [Sat, 16 Feb 2013 18:13:36 +0000 (19:13 +0100)]
Add support for non-scalar Iterator keys in foreach
RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
Anatol Belski [Tue, 12 Mar 2013 07:34:48 +0000 (08:34 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fixed headers order
Anatol Belski [Tue, 12 Mar 2013 07:34:16 +0000 (08:34 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
fixed headers order
Anatol Belski [Tue, 12 Mar 2013 07:33:36 +0000 (08:33 +0100)]
fixed headers order
Derick Rethans [Mon, 11 Mar 2013 21:36:41 +0000 (21:36 +0000)]
Merge branch 'PHP-5.4' into PHP-5.5
Derick Rethans [Mon, 11 Mar 2013 21:36:37 +0000 (21:36 +0000)]
Merge branch 'PHP-5.3' into PHP-5.4
Derick Rethans [Mon, 11 Mar 2013 21:36:36 +0000 (21:36 +0000)]
- Updated to version 2013.2 (2013b)
Anatol Belski [Mon, 11 Mar 2013 15:14:39 +0000 (16:14 +0100)]
fixed the test
Anatol Belski [Mon, 11 Mar 2013 15:04:37 +0000 (16:04 +0100)]
Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT'])
Xinchen Hui [Mon, 11 Mar 2013 07:16:47 +0000 (15:16 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Mon, 11 Mar 2013 07:15:22 +0000 (15:15 +0800)]
Disable zend_always_inline in debug build
it will be much more easier for debuging
Keyur Govande [Mon, 11 Mar 2013 00:20:57 +0000 (00:20 +0000)]
Adding in NEWS/UPGRADING about process title change support.
Keyur Govande [Mon, 11 Mar 2013 00:05:49 +0000 (00:05 +0000)]
Merge branch 'PHP-5.5' of https://git.php.net/push/php-src into PHP-5.5
* 'PHP-5.5' of https://git.php.net/push/php-src:
Fix tests after laruence unserialize change
Fix get_property_ptr_ptr declaration in simplexml
Update NEWS
Fixed confused exception message while user threw exception
Fixed bug #64354 (Unserialize array of objects whose class can't be autoloaded fail)
Fix date
use NEWS only
Fixed bug #61025 (__invoke() visibility not honored)
Nikita Popov [Sat, 9 Mar 2013 19:21:33 +0000 (20:21 +0100)]
Fix tests after laruence unserialize change
Nikita Popov [Sat, 9 Mar 2013 19:15:00 +0000 (20:15 +0100)]
Fix get_property_ptr_ptr declaration in simplexml
A new parameter was added to the API and simplexml wasn't adjusted,
thus causing crashes.
Xinchen Hui [Sat, 9 Mar 2013 15:11:48 +0000 (23:11 +0800)]
Update NEWS
Xinchen Hui [Sat, 9 Mar 2013 15:10:48 +0000 (23:10 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
ext/standard/var_unserializer.c
Xinchen Hui [Sat, 9 Mar 2013 15:08:14 +0000 (23:08 +0800)]
Fixed confused exception message while user threw exception
Xinchen Hui [Sat, 9 Mar 2013 15:00:58 +0000 (23:00 +0800)]
Fixed bug #64354 (Unserialize array of objects whose class can't be autoloaded fail)
about the __sleep one, since php_serialize_* are all void function,
so,,only check exception at the very begining
Xinchen Hui [Sat, 9 Mar 2013 03:38:32 +0000 (11:38 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Sat, 9 Mar 2013 03:37:41 +0000 (11:37 +0800)]
Fix date
David Soria Parra [Fri, 8 Mar 2013 10:12:35 +0000 (11:12 +0100)]
use NEWS only
Xinchen Hui [Fri, 8 Mar 2013 02:34:17 +0000 (10:34 +0800)]
Fixed bug #61025 (__invoke() visibility not honored)
Keyur Govande [Thu, 7 Mar 2013 23:51:37 +0000 (23:51 +0000)]
Merge branch 'pull-request/300' into PHP-5.5
* pull-request/300:
Support for CLI process title (https://wiki.php.net/rfc/cli_process_title)
Ralph Schindler [Tue, 5 Mar 2013 17:24:05 +0000 (11:24 -0600)]
Fix for https://bugs.php.net/bug.php?id=62649
Carson McDonald [Thu, 7 Mar 2013 13:43:54 +0000 (08:43 -0500)]
Typo fix: recieved to received
Keyur Govande [Thu, 7 Mar 2013 18:54:34 +0000 (18:54 +0000)]
Support for CLI process title (https://wiki.php.net/rfc/cli_process_title)
A new commit into branch 5.5
David Soria Parra [Thu, 7 Mar 2013 11:14:48 +0000 (12:14 +0100)]
News for next beta
David Soria Parra [Thu, 7 Mar 2013 11:14:26 +0000 (12:14 +0100)]
Do another Alpha instead of Beta because of ZO+ RFC being voted on
David Soria Parra [Wed, 6 Mar 2013 22:51:27 +0000 (23:51 +0100)]
NEWS for the next beta
David Soria Parra [Wed, 6 Mar 2013 21:39:54 +0000 (22:39 +0100)]
NEWS for PHP 5.5.0 Beta 1
Anatol Belski [Wed, 6 Mar 2013 15:48:51 +0000 (16:48 +0100)]
simplified the previous fix for #64359
Anatol Belski [Wed, 6 Mar 2013 11:37:57 +0000 (12:37 +0100)]
Fixed bug #64359 strftime crash with VS2012
Stanislav Malyshev [Wed, 6 Mar 2013 08:45:26 +0000 (00:45 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix NEWS
Stanislav Malyshev [Wed, 6 Mar 2013 08:44:43 +0000 (00:44 -0800)]
fix NEWS
Xinchen Hui [Tue, 5 Mar 2013 09:18:13 +0000 (17:18 +0800)]
skip if no IPv6 support
Xinchen Hui [Tue, 5 Mar 2013 08:56:00 +0000 (16:56 +0800)]
Fix tests temporary
seems IPV6_PKTINFO are not avaiable in some OS
Xinchen Hui [Tue, 5 Mar 2013 06:02:28 +0000 (14:02 +0800)]
Skip test on Apple
Xinchen Hui [Tue, 5 Mar 2013 05:58:20 +0000 (13:58 +0800)]
Revert "Fixed Bug #64340 (sockets tests failed) Patch by Reeze"
build break, will only leave the test script fix first
This reverts commit
f2246f352fc01295c370728d68a9bcd2bb546652 .
Pierre Joye [Mon, 4 Mar 2013 13:14:09 +0000 (14:14 +0100)]
- fix path
Pierre Joye [Mon, 4 Mar 2013 13:06:09 +0000 (14:06 +0100)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Pierre Joye [Mon, 4 Mar 2013 11:05:59 +0000 (12:05 +0100)]
- add noisy php logo for autocrop with threshold test
Anatol Belski [Mon, 4 Mar 2013 08:15:17 +0000 (09:15 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed PCRE locale crash in Windows/TS
Anatol Belski [Mon, 4 Mar 2013 08:14:14 +0000 (09:14 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed PCRE locale crash in Windows/TS
Stephen A. Zarkos [Mon, 4 Mar 2013 08:09:45 +0000 (09:09 +0100)]
Fixed PCRE locale crash in Windows/TS
Pierre Joye [Mon, 4 Mar 2013 06:26:07 +0000 (07:26 +0100)]
- add test for imagecropauto
Stanislav Malyshev [Sun, 3 Mar 2013 21:24:00 +0000 (13:24 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
rename NEWS back
updated NEWS
Stanislav Malyshev [Sun, 3 Mar 2013 21:20:57 +0000 (13:20 -0800)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
rename NEWS back
updated NEWS
Stanislav Malyshev [Sun, 3 Mar 2013 21:18:58 +0000 (13:18 -0800)]
rename NEWS back
Anatol Belski [Sun, 3 Mar 2013 18:23:06 +0000 (19:23 +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:
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
Anatol Belski [Sun, 3 Mar 2013 18:22:35 +0000 (19:22 +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:
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
Anatol Belski [Sun, 3 Mar 2013 18:21:45 +0000 (19:21 +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:
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
Anatol Belski [Sun, 3 Mar 2013 18:16:36 +0000 (19:16 +0100)]
updated NEWS
Anatol Belski [Sun, 3 Mar 2013 18:15:37 +0000 (19:15 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
updated NEWS
This commit was manufactured by cvs2svn to create tag 'NEWS'.
Anatol Belski [Sun, 3 Mar 2013 18:14:50 +0000 (19:14 +0100)]
updated NEWS
Anatol Belski [Sun, 3 Mar 2013 18:14:17 +0000 (19:14 +0100)]
Merge commit 'NEWS' into PHP-5.4
* commit 'NEWS':
This commit was manufactured by cvs2svn to create tag 'NEWS'.
Anatol Belski [Sun, 3 Mar 2013 18:13:38 +0000 (19:13 +0100)]
updated NEWS
Derick Rethans [Sun, 3 Mar 2013 18:10:24 +0000 (13:10 -0500)]
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
Anatol Belski [Sun, 3 Mar 2013 18:10:12 +0000 (19:10 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
merged PCRE 8.32
Derick Rethans [Sun, 3 Mar 2013 18:10:07 +0000 (13:10 -0500)]
Merge branch 'PHP-5.4' into PHP-5.5
Derick Rethans [Sun, 3 Mar 2013 18:09:52 +0000 (13:09 -0500)]
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
Derick Rethans [Sun, 3 Mar 2013 18:09:31 +0000 (13:09 -0500)]
Merge branch 'PHP-5.3' into PHP-5.4
Derick Rethans [Sun, 3 Mar 2013 18:08:19 +0000 (13:08 -0500)]
Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
Anatol Belski [Sun, 3 Mar 2013 18:07:49 +0000 (19:07 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
merged PCRE 8.32
Anatol Belski [Sun, 3 Mar 2013 18:06:22 +0000 (19:06 +0100)]
merged PCRE 8.32
- defined HAVE_CONFIG_H to simplify the future merges
- PCRE NEWS http://pcre.org/news.txt
Derick Rethans [Sun, 3 Mar 2013 17:58:42 +0000 (12:58 -0500)]
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
NEWS
Derick Rethans [Sun, 3 Mar 2013 17:53:23 +0000 (12:53 -0500)]
Merge branch 'PHP-5.3' into PHP-5.4
Derick Rethans [Sun, 3 Mar 2013 17:53:22 +0000 (12:53 -0500)]
- Updated to version 2013.1 (2013a)
Pierre Joye [Sun, 3 Mar 2013 04:30:12 +0000 (05:30 +0100)]
- (s)rgb distance works way better for now, re enable threshold
Xinchen Hui [Sun, 3 Mar 2013 03:25:29 +0000 (11:25 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Xinchen Hui [Sun, 3 Mar 2013 03:25:08 +0000 (11:25 +0800)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Xinchen Hui [Sun, 3 Mar 2013 03:24:45 +0000 (11:24 +0800)]
Fix test (skip on unable to create socket)
Xinchen Hui [Sun, 3 Mar 2013 03:13:52 +0000 (11:13 +0800)]
Fix test after the convert_to_long be improved, see #64290
Xinchen Hui [Sun, 3 Mar 2013 02:59:15 +0000 (10:59 +0800)]
Fixed bug #64290 (behavior change of converting to long)
convert_to_long behavior has been improved
As Cataphrace said in IRC, the test should be fixed.
Xinchen Hui [Sun, 3 Mar 2013 02:51:04 +0000 (10:51 +0800)]
Fixed Bug #64340 (sockets tests failed) Patch by Reeze
Add __APPLE_USE_RFC_3542 for OS X 10.7 because IPv6 options are incompatible with RFC 2292.
Dmitry Stogov [Fri, 1 Mar 2013 15:17:25 +0000 (19:17 +0400)]
Fixed timestamp update on Phar contents modification.
Dmitry Stogov [Fri, 1 Mar 2013 15:17:08 +0000 (19:17 +0400)]
Fixed timestamp update on Phar contents modification.
Pierre Joye [Fri, 1 Mar 2013 07:10:49 +0000 (08:10 +0100)]
- disable threshold for now, will enable it again using CIEDE2000
Stanislav Malyshev [Fri, 1 Mar 2013 05:30:02 +0000 (21:30 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
5.4.24-dev
5.3.23RC1
Stanislav Malyshev [Fri, 1 Mar 2013 05:29:40 +0000 (21:29 -0800)]
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
5.4.24-dev
5.3.23RC1
Conflicts:
configure.in
main/php_version.h
Stanislav Malyshev [Fri, 1 Mar 2013 05:25:36 +0000 (21:25 -0800)]
5.4.24-dev
Stanislav Malyshev [Fri, 1 Mar 2013 05:22:06 +0000 (21:22 -0800)]
5.3.23RC1
Pierre Joye [Thu, 28 Feb 2013 18:34:14 +0000 (19:34 +0100)]
- add todo for threshold
Pierre Joye [Thu, 28 Feb 2013 18:22:06 +0000 (19:22 +0100)]
- clean and enable threshold
Pierre Joye [Thu, 28 Feb 2013 16:24:23 +0000 (17:24 +0100)]
- add image crop support
Pierre Joye [Wed, 27 Feb 2013 20:02:47 +0000 (21:02 +0100)]
- typo
Pierre Joye [Wed, 27 Feb 2013 19:23:31 +0000 (20:23 +0100)]
- fix name for imageflip constants, consistent witht the other