]>
granicus.if.org Git - php/log
Anatol Belski [Wed, 6 Mar 2013 15:49:33 +0000 (16:49 +0100)]
Merge branch 'PHP-5.5'
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:39:01 +0000 (12:39 +0100)]
Merge branch 'PHP-5.5'
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:54 +0000 (00:45 -0800)]
Merge branch 'PHP-5.5'
Stanislav Malyshev [Wed, 6 Mar 2013 08:45:26 +0000 (00:45 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Wed, 6 Mar 2013 08:44:43 +0000 (00:44 -0800)]
fix NEWS
Xinchen Hui [Tue, 5 Mar 2013 09:18:41 +0000 (17:18 +0800)]
Merge branch 'PHP-5.5'
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:57:37 +0000 (16:57 +0800)]
Merge branch 'PHP-5.5'
Xinchen Hui [Tue, 5 Mar 2013 08:56:00 +0000 (16:56 +0800)]
Fix tests temporary
Xinchen Hui [Tue, 5 Mar 2013 06:03:47 +0000 (14:03 +0800)]
Merge branch 'PHP-5.5'
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:36 +0000 (14:14 +0100)]
Merge branch 'PHP-5.5'
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:11:20 +0000 (12:11 +0100)]
- damned conflicts
Pierre Joye [Mon, 4 Mar 2013 11:06:11 +0000 (12:06 +0100)]
Merge branch '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
Pierre Joye [Mon, 4 Mar 2013 11:05:13 +0000 (12:05 +0100)]
Merge branch 'master' of git.php.net:php-src
Pierre Joye [Mon, 4 Mar 2013 11:03:01 +0000 (12:03 +0100)]
Merge branch 'PHP-5.5'
Anatol Belski [Mon, 4 Mar 2013 08:15:34 +0000 (09:15 +0100)]
Merge branch 'PHP-5.5'
Anatol Belski [Mon, 4 Mar 2013 08:15:17 +0000 (09:15 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
Anatol Belski [Mon, 4 Mar 2013 08:14:14 +0000 (09:14 +0100)]
Merge branch 'PHP-5.3' into PHP-5.4
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
Xinchen Hui [Mon, 4 Mar 2013 02:47:30 +0000 (10:47 +0800)]
Merge branch 'typofix' of https://github.com/carsonmcdonald/php-src
Stanislav Malyshev [Sun, 3 Mar 2013 21:24:31 +0000 (13:24 -0800)]
Merge branch 'PHP-5.5'
Stanislav Malyshev [Sun, 3 Mar 2013 21:24:00 +0000 (13:24 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Sun, 3 Mar 2013 21:20:57 +0000 (13:20 -0800)]
Merge branch 'PHP-5.3' into PHP-5.4
Stanislav Malyshev [Sun, 3 Mar 2013 21:18:58 +0000 (13:18 -0800)]
rename NEWS back
Anatol Belski [Sun, 3 Mar 2013 18:23:26 +0000 (19:23 +0100)]
Merge branch 'master' of git.php.net:php-src
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
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
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
Anatol Belski [Sun, 3 Mar 2013 18:17:14 +0000 (19:17 +0100)]
Merge branch 'PHP-5.5'
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
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
Anatol Belski [Sun, 3 Mar 2013 18:13:38 +0000 (19:13 +0100)]
updated NEWS
Anatol Belski [Sun, 3 Mar 2013 18:11:25 +0000 (19:11 +0100)]
Merge branch 'PHP-5.5'
Derick Rethans [Sun, 3 Mar 2013 18:10:41 +0000 (13:10 -0500)]
Merge branch 'PHP-5.5'
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
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
Anatol Belski [Sun, 3 Mar 2013 18:06:22 +0000 (19:06 +0100)]
merged PCRE 8.32
Derick Rethans [Sun, 3 Mar 2013 18:00:42 +0000 (13:00 -0500)]
Merge branch 'PHP-5.5'
Derick Rethans [Sun, 3 Mar 2013 17:58:42 +0000 (12:58 -0500)]
Merge branch 'PHP-5.4' into PHP-5.5
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)
Carson McDonald [Sun, 3 Mar 2013 15:44:46 +0000 (10:44 -0500)]
Fix a couple typos
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:49 +0000 (11:25 +0800)]
Merge branch 'PHP-5.5'
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:14:34 +0000 (11:14 +0800)]
Merge branch 'PHP-5.5'
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 03:00:36 +0000 (11:00 +0800)]
Merge branch 'PHP-5.5'
Xinchen Hui [Sun, 3 Mar 2013 02:59:15 +0000 (10:59 +0800)]
Fixed bug #64290 (behavior change of converting to long)
Xinchen Hui [Sun, 3 Mar 2013 02:53:52 +0000 (10:53 +0800)]
Merge branch 'PHP-5.5'
Xinchen Hui [Sun, 3 Mar 2013 02:51:04 +0000 (10:51 +0800)]
Fixed Bug #64340 (sockets tests failed) Patch by Reeze
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:31:15 +0000 (21:31 -0800)]
Merge branch 'PHP-5.5'
Stanislav Malyshev [Fri, 1 Mar 2013 05:30:02 +0000 (21:30 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Fri, 1 Mar 2013 05:29:40 +0000 (21:29 -0800)]
Merge branch 'PHP-5.3' into PHP-5.4
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:03:09 +0000 (21:03 +0100)]
Merge branch 'PHP-5.5'
Pierre Joye [Wed, 27 Feb 2013 20:02:47 +0000 (21:02 +0100)]
- typo
Pierre Joye [Wed, 27 Feb 2013 19:23:38 +0000 (20:23 +0100)]
Merge branch 'PHP-5.5'
Pierre Joye [Wed, 27 Feb 2013 19:23:31 +0000 (20:23 +0100)]
- fix name for imageflip constants, consistent witht the other
Pierre Joye [Wed, 27 Feb 2013 19:22:45 +0000 (20:22 +0100)]
- add test
Pierre Joye [Wed, 27 Feb 2013 19:08:26 +0000 (20:08 +0100)]
- add constants for imageflip
Pierre Joye [Wed, 27 Feb 2013 15:03:27 +0000 (16:03 +0100)]
Merge branch 'PHP-5.5'
Pierre Joye [Wed, 27 Feb 2013 15:03:17 +0000 (16:03 +0100)]
- add only once
Pierre Joye [Wed, 27 Feb 2013 15:02:54 +0000 (16:02 +0100)]
- add new file for m4 as well
Pierre Joye [Wed, 27 Feb 2013 15:00:11 +0000 (16:00 +0100)]
- fix conflict on merge
Pierre Joye [Wed, 27 Feb 2013 09:39:25 +0000 (10:39 +0100)]
- add image flip API support
Pierre Joye [Wed, 27 Feb 2013 09:39:16 +0000 (10:39 +0100)]
- add image flip API support
Pierre Joye [Wed, 27 Feb 2013 09:39:09 +0000 (10:39 +0100)]
- add image flip API support
Pierre Joye [Wed, 27 Feb 2013 09:38:55 +0000 (10:38 +0100)]
- add image flip API support
Pierre Joye [Wed, 27 Feb 2013 09:38:33 +0000 (10:38 +0100)]
- add image flip API support
Pierre Joye [Wed, 27 Feb 2013 09:37:48 +0000 (10:37 +0100)]
- add image flip API support
Stanislav Malyshev [Wed, 27 Feb 2013 06:26:55 +0000 (22:26 -0800)]
Merge branch 'PHP-5.5'
Stanislav Malyshev [Wed, 27 Feb 2013 06:26:36 +0000 (22:26 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Wed, 27 Feb 2013 06:25:33 +0000 (22:25 -0800)]
5.4.13 branched, now it's 5.4.14
Stanislav Malyshev [Wed, 27 Feb 2013 06:20:56 +0000 (22:20 -0800)]
Merge branch 'PHP-5.5'
Stanislav Malyshev [Wed, 27 Feb 2013 06:20:50 +0000 (22:20 -0800)]
Merge branch 'PHP-5.4' into PHP-5.5
projects / php / log