]>
granicus.if.org Git - php/log
Anatol Belski [Thu, 7 Aug 2014 17:51:04 +0000 (19:51 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix TS build
Anatol Belski [Thu, 7 Aug 2014 17:50:45 +0000 (19:50 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix TS build
Anatol Belski [Thu, 7 Aug 2014 17:50:25 +0000 (19:50 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix TS build
Anatol Belski [Thu, 7 Aug 2014 17:49:59 +0000 (19:49 +0200)]
fix TS build
Daniel Lowrey [Thu, 7 Aug 2014 16:45:50 +0000 (12:45 -0400)]
Merge branch 'PHP-5.6'
Daniel Lowrey [Thu, 7 Aug 2014 16:40:52 +0000 (12:40 -0400)]
Update NEWS
Daniel Lowrey [Thu, 7 Aug 2014 16:39:52 +0000 (12:39 -0400)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Update NEWS
Update NEWS
Daniel Lowrey [Thu, 7 Aug 2014 16:39:42 +0000 (12:39 -0400)]
Update NEWS
Daniel Lowrey [Thu, 7 Aug 2014 16:38:04 +0000 (12:38 -0400)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Update NEWS
Daniel Lowrey [Thu, 7 Aug 2014 16:37:50 +0000 (12:37 -0400)]
Update NEWS
Christopher Jones [Thu, 7 Aug 2014 16:30:19 +0000 (09:30 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Small tidy ups and raise visibility of GitHub PR process
Christopher Jones [Thu, 7 Aug 2014 16:29:47 +0000 (09:29 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Small tidy ups and raise visibility of GitHub PR process
Conflicts:
README.SUBMITTING_PATCH
Christopher Jones [Thu, 7 Aug 2014 16:27:53 +0000 (09:27 -0700)]
Small tidy ups and raise visibility of GitHub PR process
Daniel Lowrey [Thu, 7 Aug 2014 16:17:29 +0000 (12:17 -0400)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Bug #41631: Observe socket read timeouts in SSL streams
Daniel Lowrey [Thu, 7 Aug 2014 16:07:55 +0000 (12:07 -0400)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Bug #41631: Observe socket read timeouts in SSL streams
Conflicts:
ext/openssl/xp_ssl.c
Daniel Lowrey [Thu, 7 Aug 2014 15:51:42 +0000 (11:51 -0400)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Bug #41631: Observe socket read timeouts in SSL streams
Daniel Lowrey [Thu, 7 Aug 2014 15:47:42 +0000 (11:47 -0400)]
Bug #41631: Observe socket read timeouts in SSL streams
Anatol Belski [Thu, 7 Aug 2014 13:23:03 +0000 (15:23 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
wrap int8_t and int16_t with #ifdef to avoid possible clashes
Anatol Belski [Thu, 7 Aug 2014 13:22:28 +0000 (15:22 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
wrap int8_t and int16_t with #ifdef to avoid possible clashes
Anatol Belski [Thu, 7 Aug 2014 13:21:42 +0000 (15:21 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
wrap int8_t and int16_t with #ifdef to avoid possible clashes
Anatol Belski [Thu, 7 Aug 2014 13:20:17 +0000 (15:20 +0200)]
wrap int8_t and int16_t with #ifdef to avoid possible clashes
Derick Rethans [Thu, 7 Aug 2014 09:25:05 +0000 (10:25 +0100)]
Merge branch 'PHP-5.6'
Not sure what's going wrong here for UPGRADING.INTERNALS...
Conflicts:
UPGRADING.INTERNALS
Derick Rethans [Thu, 7 Aug 2014 09:22:14 +0000 (10:22 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
Derick Rethans [Thu, 7 Aug 2014 09:22:10 +0000 (10:22 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
Derick Rethans [Thu, 7 Aug 2014 09:22:09 +0000 (10:22 +0100)]
- Updated to version 2014.6 (2014f)
Bob Weinand [Wed, 6 Aug 2014 19:13:58 +0000 (21:13 +0200)]
Removed Countable::count() change info from UPGRADE.INTERNALS too
Ferenc Kovacs [Wed, 6 Aug 2014 19:11:02 +0000 (21:11 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Revert "Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option"
Didn't actually merged the revert as we wan't to keep this in master, but merged it with -s ours.
Andrea Faulds [Wed, 6 Aug 2014 18:56:32 +0000 (19:56 +0100)]
NEWS and UPGRADING for intdiv()
Ferenc Kovacs [Wed, 6 Aug 2014 18:33:48 +0000 (20:33 +0200)]
Revert "Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option"
This reverts commit
a51bf0cadf7862d10b2cc19cae2c991d24d670b1.
Andrea Faulds [Wed, 6 Aug 2014 15:02:38 +0000 (16:02 +0100)]
Merge branch 'master' of git.php.net:php-src
Andrea Faulds [Wed, 6 Aug 2014 15:02:02 +0000 (16:02 +0100)]
Fixed skip case for intdiv 64-bit test
Andrey Hristov [Wed, 6 Aug 2014 14:04:30 +0000 (17:04 +0300)]
Merge branch 'PHP-5.6'
Conflicts:
NEWS
Andrey Hristov [Wed, 6 Aug 2014 14:03:39 +0000 (17:03 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
NEWS
configure.in
main/php_version.h
Andrey Hristov [Wed, 6 Aug 2014 14:02:17 +0000 (17:02 +0300)]
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Conflicts:
NEWS
configure.in
main/php_version.h
Andrey Hristov [Wed, 6 Aug 2014 13:59:56 +0000 (16:59 +0300)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Conflicts:
NEWS
Andrey Hristov [Wed, 6 Aug 2014 13:58:30 +0000 (16:58 +0300)]
Merge branch 'master' of git.php.net:php-src
Andrey Hristov [Wed, 6 Aug 2014 13:52:44 +0000 (16:52 +0300)]
Merge branch 'PHP-5.6'
Andrey Hristov [Wed, 6 Aug 2014 13:50:27 +0000 (16:50 +0300)]
Use callback structure
Andrey Hristov [Wed, 6 Aug 2014 13:25:12 +0000 (16:25 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
ext/fileinfo/data_file.c
ext/fileinfo/libmagic/softmagic.c
ext/fileinfo/magicdata.patch
Andrea Faulds [Wed, 6 Aug 2014 12:59:23 +0000 (13:59 +0100)]
Merge branch 'intdiv'
* intdiv:
Added -1 safety check, fixed test
php_error_docref
Fixed testcase
Implemented intdiv()
Andrey Hristov [Wed, 6 Aug 2014 12:28:06 +0000 (15:28 +0300)]
Merge branch 'PHP-5.4' into PHP-5.5
Andrey Hristov [Wed, 6 Aug 2014 12:27:56 +0000 (15:27 +0300)]
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
NEWS
configure.in
main/php_version.h
Andrey Hristov [Wed, 6 Aug 2014 12:27:29 +0000 (15:27 +0300)]
Add EXPECTF
Andrey Hristov [Wed, 6 Aug 2014 11:52:55 +0000 (14:52 +0300)]
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Andrey Hristov [Wed, 6 Aug 2014 11:52:12 +0000 (14:52 +0300)]
Fix handling of multi-result sets with PS...used to clean not only
the result set but the whole PS.
Julien Pauli [Wed, 6 Aug 2014 08:20:31 +0000 (10:20 +0200)]
5.5.17 now
Stanislav Malyshev [Wed, 6 Aug 2014 04:30:56 +0000 (21:30 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
5.4.33-dev now
Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
Conflicts:
main/streams/xp_socket.c
Stanislav Malyshev [Wed, 6 Aug 2014 04:29:27 +0000 (21:29 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
5.4.33-dev now
Stanislav Malyshev [Wed, 6 Aug 2014 04:26:11 +0000 (21:26 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
5.4.33-dev now
Conflicts:
configure.in
main/php_version.h
Stanislav Malyshev [Wed, 6 Aug 2014 04:24:55 +0000 (21:24 -0700)]
5.4.33-dev now
Daniel Lowrey [Mon, 4 Aug 2014 16:41:51 +0000 (12:41 -0400)]
Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
Daniel Lowrey [Wed, 6 Aug 2014 02:58:45 +0000 (22:58 -0400)]
Merge branch 'PHP-5.6'
Daniel Lowrey [Mon, 4 Aug 2014 16:41:51 +0000 (12:41 -0400)]
Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
Michael Wallner [Tue, 5 Aug 2014 13:48:50 +0000 (15:48 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
BFN
BFN
Fixed Bug #67724
Michael Wallner [Tue, 5 Aug 2014 13:48:35 +0000 (15:48 +0200)]
BFN
Michael Wallner [Tue, 5 Aug 2014 13:48:12 +0000 (15:48 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
BFN
Fixed Bug #67724
Michael Wallner [Tue, 5 Aug 2014 13:47:52 +0000 (15:47 +0200)]
BFN
Michael Wallner [Tue, 5 Aug 2014 13:46:52 +0000 (15:46 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed Bug #67724
Michael Wallner [Tue, 5 Aug 2014 13:44:43 +0000 (15:44 +0200)]
Fixed Bug #67724
(chained zlib filters silently fail with large amounts of data)
Use the same buffer size zlib uses internally to avoid
Z_DATA_ERROR on massively compressed data
Remi Collet [Mon, 4 Aug 2014 09:09:25 +0000 (11:09 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
typo
typo
typo
Remi Collet [Mon, 4 Aug 2014 09:09:18 +0000 (11:09 +0200)]
typo
Remi Collet [Mon, 4 Aug 2014 09:09:04 +0000 (11:09 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
typo
typo
Remi Collet [Mon, 4 Aug 2014 09:08:54 +0000 (11:08 +0200)]
typo
Remi Collet [Mon, 4 Aug 2014 09:08:41 +0000 (11:08 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
typo
Remi Collet [Mon, 4 Aug 2014 09:08:30 +0000 (11:08 +0200)]
typo
Remi Collet [Mon, 4 Aug 2014 08:51:19 +0000 (10:51 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS
NEWS
NEWS
Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference
Remi Collet [Mon, 4 Aug 2014 08:50:56 +0000 (10:50 +0200)]
NEWS
Remi Collet [Mon, 4 Aug 2014 08:50:33 +0000 (10:50 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
NEWS
NEWS
Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference
Remi Collet [Mon, 4 Aug 2014 08:48:29 +0000 (10:48 +0200)]
NEWS
Remi Collet [Mon, 4 Aug 2014 08:47:54 +0000 (10:47 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
NEWS
Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference
Remi Collet [Mon, 4 Aug 2014 08:46:53 +0000 (10:46 +0200)]
NEWS
Remi Collet [Mon, 4 Aug 2014 08:42:39 +0000 (10:42 +0200)]
Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference
Upstream https://bitbucket.org/libgd/gd-libgd/commits/
463c3bd09bfe8e924e19acad7a2a6af16953a704
Notice: this fix don't manage monochrome/monovisual values
but just fix the security issue CVE-2014-2497
failing when trying to load such an image
Anatol Belski [Mon, 4 Aug 2014 07:59:06 +0000 (09:59 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
backport the fix for bug #67739
Anatol Belski [Mon, 4 Aug 2014 07:58:47 +0000 (09:58 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
backport the fix for bug #67739
Anatol Belski [Mon, 4 Aug 2014 07:57:59 +0000 (09:57 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
backport the fix for bug #67739
Anatol Belski [Mon, 4 Aug 2014 07:57:08 +0000 (09:57 +0200)]
backport the fix for bug #67739
Anatol Belski [Mon, 4 Aug 2014 07:47:11 +0000 (09:47 +0200)]
Merge branch 'pull-request/756'
Stanislav Malyshev [Mon, 4 Aug 2014 07:15:38 +0000 (00:15 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix bug #67705 (extensive backtracking in rule regular expression)
add test
Fix bug #67705 (extensive backtracking in rule regular expression)
Stanislav Malyshev [Mon, 4 Aug 2014 07:12:43 +0000 (00:12 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
add test
Fix bug #67705 (extensive backtracking in rule regular expression)
Conflicts:
ext/fileinfo/data_file.c
ext/fileinfo/libmagic/softmagic.c
ext/fileinfo/magicdata.patch
Stanislav Malyshev [Mon, 4 Aug 2014 07:08:35 +0000 (00:08 -0700)]
Fix bug #67705 (extensive backtracking in rule regular expression)
Stanislav Malyshev [Mon, 4 Aug 2014 07:08:17 +0000 (00:08 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
add test
Stanislav Malyshev [Mon, 4 Aug 2014 07:08:08 +0000 (00:08 -0700)]
add test
Stanislav Malyshev [Mon, 4 Aug 2014 07:05:56 +0000 (00:05 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #67705 (extensive backtracking in rule regular expression)
Stanislav Malyshev [Mon, 4 Aug 2014 07:01:57 +0000 (00:01 -0700)]
Fix bug #67705 (extensive backtracking in rule regular expression)
Christian Wenz [Fri, 1 Aug 2014 20:38:18 +0000 (22:38 +0200)]
Patches #67739
Fixes #67739: Windows 8.1/Server 2012 R2 OS build number reported as 6.2 (instead of 6.3)
Andrea Faulds [Fri, 1 Aug 2014 16:01:17 +0000 (17:01 +0100)]
PHP_INT_MIN and _MAX tests
Andrea Faulds [Fri, 1 Aug 2014 15:29:34 +0000 (16:29 +0100)]
Merge branch 'PHP_INT_MIN'
Andrea Faulds [Fri, 1 Aug 2014 15:28:20 +0000 (16:28 +0100)]
NEWS and UPGRADING
Andrea Faulds [Fri, 1 Aug 2014 13:29:50 +0000 (14:29 +0100)]
Added PHP_INT_MIN
Andrey Hristov [Thu, 31 Jul 2014 18:28:19 +0000 (21:28 +0300)]
Merge branch 'PHP-5.6'
Andrey Hristov [Thu, 31 Jul 2014 18:28:09 +0000 (21:28 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
Andrey Hristov [Thu, 31 Jul 2014 18:27:51 +0000 (21:27 +0300)]
Fix wrong lenght size
Peter Cowburn [Thu, 31 Jul 2014 13:35:13 +0000 (14:35 +0100)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Bug #51096 - Remove unnecessary ? for first/last day of
Peter Cowburn [Thu, 31 Jul 2014 13:34:50 +0000 (14:34 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Bug #51096 - Remove unnecessary ? for first/last day of
Peter Cowburn [Thu, 31 Jul 2014 13:33:55 +0000 (14:33 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Bug #51096 - Remove unnecessary ? for first/last day of
Conflicts:
ext/date/lib/parse_date.c
Peter Cowburn [Thu, 31 Jul 2014 13:30:39 +0000 (14:30 +0100)]
Merge branch 'pull-request/754' into PHP-5.4
Peter Cowburn [Thu, 31 Jul 2014 13:21:38 +0000 (14:21 +0100)]
Bug #51096 - Remove unnecessary ? for first/last day of
Tjerk Meesters [Thu, 31 Jul 2014 04:18:19 +0000 (12:18 +0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Moved streams related functions to xp_ssl.c
Tjerk Meesters [Thu, 31 Jul 2014 04:17:17 +0000 (12:17 +0800)]
Moved streams related functions to xp_ssl.c
Keyur Govande [Wed, 30 Jul 2014 18:50:07 +0000 (18:50 +0000)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Remove duplicate NEWS
Update NEWS
Update NEWS
Update NEWS
projects / php / log