]>
granicus.if.org Git - php/log
Dmitry Stogov [Thu, 14 Aug 2014 19:53:27 +0000 (23:53 +0400)]
Fixed compilation warnings
Dmitry Stogov [Thu, 14 Aug 2014 19:31:01 +0000 (23:31 +0400)]
Fixed windows build
Dmitry Stogov [Thu, 14 Aug 2014 19:30:49 +0000 (23:30 +0400)]
Merge branch 'master' into phpng
* master: (51 commits)
Update Git rules
Back to -dev (with EOL notice in NEWS)
new NEWS block for the next release
It's 2014 already, fix copyright year where user visible
PHP 5.3.29
Some changes were lost in the merge commit of #66091
Updated NEWS for #66091
Fixed #66091
Updated NEWS for #66091
Updated NEWS for #66091
Fixed #66091
updated NEWS
updated NEWS
updated NEWS
backported the fix for bug #41577
NEWS entry for
e6d93a1 /
d73d44c
restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
Revert "Merge branch 'pull-request/694' into PHP-5.6"
PHP 5.3.29RC1
Fix missing type checks in various functions
...
Conflicts:
ext/date/php_date.c
ext/standard/math.c
Dmitry Stogov [Thu, 14 Aug 2014 18:44:25 +0000 (22:44 +0400)]
Fixed support for references
Dmitry Stogov [Thu, 14 Aug 2014 17:54:57 +0000 (21:54 +0400)]
Fixed support for references
Sara Golemon [Thu, 14 Aug 2014 16:44:14 +0000 (09:44 -0700)]
Merge branch 'pull-request/658'
Johannes Schlüter [Thu, 14 Aug 2014 15:27:12 +0000 (17:27 +0200)]
Merge branch 'PHP-5.6'
Johannes Schlüter [Thu, 14 Aug 2014 15:25:22 +0000 (17:25 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
Johannes Schlüter [Thu, 14 Aug 2014 15:22:25 +0000 (17:22 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
Johannes Schlüter [Thu, 14 Aug 2014 15:13:44 +0000 (17:13 +0200)]
Merge branch 'PHP-5.3' into PHP-5.4
Johannes Schlüter [Thu, 14 Aug 2014 15:08:02 +0000 (17:08 +0200)]
Update Git rules
Johannes Schlüter [Thu, 14 Aug 2014 15:05:20 +0000 (17:05 +0200)]
Back to -dev (with EOL notice in NEWS)
Dmitry Stogov [Thu, 14 Aug 2014 13:00:01 +0000 (17:00 +0400)]
Fixed reference support (references to references are not allowed)
Dmitry Stogov [Thu, 14 Aug 2014 11:07:39 +0000 (15:07 +0400)]
Fixed reference handling
Dmitry Stogov [Thu, 14 Aug 2014 09:44:37 +0000 (13:44 +0400)]
Fixed conversion of empty packed array into hash
Dmitry Stogov [Thu, 14 Aug 2014 08:01:28 +0000 (12:01 +0400)]
Fixed assignment of reference to itself
Dmitry Stogov [Thu, 14 Aug 2014 06:46:17 +0000 (10:46 +0400)]
Restored "???" mark in the place that might be changed later
Xinchen Hui [Thu, 14 Aug 2014 04:26:45 +0000 (12:26 +0800)]
It's okey for use a stack value here (deleted immediately after use)
Xinchen Hui [Thu, 14 Aug 2014 04:15:24 +0000 (12:15 +0800)]
cleanup
Xinchen Hui [Thu, 14 Aug 2014 03:52:46 +0000 (11:52 +0800)]
Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng
Ferenc Kovacs [Thu, 14 Aug 2014 00:18:27 +0000 (02:18 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
new NEWS block for the next release
Ferenc Kovacs [Thu, 14 Aug 2014 00:17:55 +0000 (02:17 +0200)]
new NEWS block for the next release
Dmitry Stogov [Wed, 13 Aug 2014 19:30:07 +0000 (23:30 +0400)]
Avoid reallocation
Johannes Schlüter [Wed, 13 Aug 2014 19:22:50 +0000 (21:22 +0200)]
It's 2014 already, fix copyright year where user visible
Left out all file headers
Dmitry Stogov [Wed, 13 Aug 2014 18:26:07 +0000 (22:26 +0400)]
cleanuo (use zend_string instead of char*)
Dmitry Stogov [Wed, 13 Aug 2014 18:21:51 +0000 (22:21 +0400)]
cleanup
Dmitry Stogov [Wed, 13 Aug 2014 18:18:05 +0000 (22:18 +0400)]
cleanup
Johannes Schlüter [Wed, 13 Aug 2014 16:36:10 +0000 (18:36 +0200)]
PHP 5.3.29
Dmitry Stogov [Wed, 13 Aug 2014 15:43:34 +0000 (19:43 +0400)]
cleanup
Dmitry Stogov [Wed, 13 Aug 2014 13:05:18 +0000 (17:05 +0400)]
cleanup (we don't have to duplicate elements of module_registry)
Dmitry Stogov [Wed, 13 Aug 2014 13:00:13 +0000 (17:00 +0400)]
cleanup (we don't have to duplicate elements of stream_filters_hash)
Tjerk Meesters [Wed, 13 Aug 2014 12:57:10 +0000 (20:57 +0800)]
Some changes were lost in the merge commit of #66091
Dmitry Stogov [Wed, 13 Aug 2014 12:55:21 +0000 (16:55 +0400)]
cleanup
Tjerk Meesters [Wed, 13 Aug 2014 12:16:22 +0000 (20:16 +0800)]
Updated NEWS for #66091
Tjerk Meesters [Wed, 13 Aug 2014 12:12:42 +0000 (20:12 +0800)]
Fixed #66091
Tjerk Meesters [Wed, 13 Aug 2014 12:21:30 +0000 (20:21 +0800)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Updated NEWS for #66091
Updated NEWS for #66091
Fixed #66091
Tjerk Meesters [Wed, 13 Aug 2014 12:20:54 +0000 (20:20 +0800)]
Updated NEWS for #66091
Tjerk Meesters [Wed, 13 Aug 2014 12:20:10 +0000 (20:20 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Updated NEWS for #66091
Fixed #66091
Conflicts:
ext/date/php_date.c
Tjerk Meesters [Wed, 13 Aug 2014 12:16:22 +0000 (20:16 +0800)]
Updated NEWS for #66091
Tjerk Meesters [Wed, 13 Aug 2014 12:15:52 +0000 (20:15 +0800)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed #66091
Conflicts:
ext/date/php_date.c
Tjerk Meesters [Wed, 13 Aug 2014 12:12:42 +0000 (20:12 +0800)]
Fixed #66091
Dmitry Stogov [Wed, 13 Aug 2014 10:51:48 +0000 (14:51 +0400)]
cleanup (use zend_string* instead of char*)
Xinchen Hui [Wed, 13 Aug 2014 08:44:22 +0000 (16:44 +0800)]
clean up - remove checked questions
Dmitry Stogov [Wed, 13 Aug 2014 08:36:10 +0000 (12:36 +0400)]
cleanup
Xinchen Hui [Wed, 13 Aug 2014 07:51:43 +0000 (15:51 +0800)]
clean up - avoid realloc
Ferenc Kovacs [Tue, 12 Aug 2014 12:48:48 +0000 (14:48 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
NEWS entry for
e6d93a1 /
d73d44c
restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
Revert "Merge branch 'pull-request/694' into PHP-5.6"
Ferenc Kovacs [Tue, 12 Aug 2014 12:47:03 +0000 (14:47 +0200)]
Merge branch 'pr-765' into PHP-5.6
* pr-765:
NEWS entry for
e6d93a1 /
d73d44c
restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
Revert "Merge branch 'pull-request/694' into PHP-5.6"
Dmitry Stogov [Tue, 12 Aug 2014 10:46:38 +0000 (14:46 +0400)]
Merge branch 'master' into phpng
* master:
fix the failing date tests introduced with the latest timezonedb update Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it
Fixed bug #67813 (CachingIterator::__construct InvalidArgumentException wrong message)
Anatol Belski [Tue, 12 Aug 2014 09:53:10 +0000 (11:53 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
updated NEWS
updated NEWS
backported the fix for bug #41577
Anatol Belski [Tue, 12 Aug 2014 09:52:50 +0000 (11:52 +0200)]
updated NEWS
Anatol Belski [Tue, 12 Aug 2014 09:52:07 +0000 (11:52 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
updated NEWS
backported the fix for bug #41577
Anatol Belski [Tue, 12 Aug 2014 09:51:42 +0000 (11:51 +0200)]
updated NEWS
Anatol Belski [Tue, 12 Aug 2014 09:50:55 +0000 (11:50 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
updated NEWS
backported the fix for bug #41577
Anatol Belski [Tue, 12 Aug 2014 09:50:26 +0000 (11:50 +0200)]
updated NEWS
Anatol Belski [Tue, 12 Aug 2014 09:49:46 +0000 (11:49 +0200)]
backported the fix for bug #41577
Anatol Belski [Tue, 12 Aug 2014 09:45:05 +0000 (11:45 +0200)]
Merge branch 'pull-request/681'
Ferenc Kovacs [Tue, 12 Aug 2014 08:44:09 +0000 (10:44 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix the failing date tests introduced with the latest timezonedb update Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it
Ferenc Kovacs [Tue, 12 Aug 2014 08:38:35 +0000 (10:38 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix the failing date tests introduced with the latest timezonedb update Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it
Ferenc Kovacs [Tue, 12 Aug 2014 08:37:44 +0000 (10:37 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix the failing date tests introduced with the latest timezonedb update Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it
Ferenc Kovacs [Tue, 12 Aug 2014 08:34:54 +0000 (10:34 +0200)]
fix the failing date tests introduced with the latest timezonedb update
Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it
Dmitry Stogov [Tue, 12 Aug 2014 07:27:30 +0000 (11:27 +0400)]
Fixed ext/odbc
Dmitry Stogov [Tue, 12 Aug 2014 07:00:06 +0000 (11:00 +0400)]
ext/pdo_odbc support for phpng (tested with unixODBC and mysql driver)
Dmitry Stogov [Mon, 11 Aug 2014 22:10:30 +0000 (02:10 +0400)]
ext/odbc support for phpng (incomplete)
Dmitry Stogov [Mon, 11 Aug 2014 19:56:34 +0000 (23:56 +0400)]
Fixed pdo_firebird tests failures
Dmitry Stogov [Mon, 11 Aug 2014 14:38:36 +0000 (18:38 +0400)]
Fixed mode
Dmitry Stogov [Mon, 11 Aug 2014 14:37:26 +0000 (18:37 +0400)]
Implemented ext/com_dotnet support for phpng
Xinchen Hui [Mon, 11 Aug 2014 09:47:47 +0000 (17:47 +0800)]
Merge branch 'PHP-5.6'
Xinchen Hui [Mon, 11 Aug 2014 09:47:36 +0000 (17:47 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Mon, 11 Aug 2014 09:46:56 +0000 (17:46 +0800)]
Fixed bug #67813 (CachingIterator::__construct InvalidArgumentException wrong message)
Xinchen Hui [Mon, 11 Aug 2014 09:44:42 +0000 (17:44 +0800)]
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
Dmitry Stogov [Mon, 11 Aug 2014 07:38:41 +0000 (11:38 +0400)]
Merge branch 'master' into test
* master: (39 commits)
Add __debugInfo() to UPGRADING.
fix TS build
Update NEWS
Update NEWS
Update NEWS
Small tidy ups and raise visibility of GitHub PR process
Bug #41631: Observe socket read timeouts in SSL streams
wrap int8_t and int16_t with #ifdef to avoid possible clashes
- Updated to version 2014.6 (2014f)
Removed Countable::count() change info from UPGRADE.INTERNALS too
NEWS and UPGRADING for intdiv()
Revert "Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option"
Fixed skip case for intdiv 64-bit test
Use callback structure
Add EXPECTF
Fix handling of multi-result sets with PS...used to clean not only the result set but the whole PS.
5.5.17 now
5.4.33-dev now
Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
...
Conflicts:
ext/fileinfo/libmagic/softmagic.c
main/streams/xp_socket.c
Dmitry Stogov [Mon, 11 Aug 2014 06:17:06 +0000 (10:17 +0400)]
Fixed compilation warnings about unused labels
krakjoe [Mon, 11 Aug 2014 05:47:09 +0000 (06:47 +0100)]
fix incorrect cast of comparison function and signature of function
krakjoe [Mon, 11 Aug 2014 05:09:46 +0000 (06:09 +0100)]
update zend_make_printable_zval to take TSRM context
krakjoe [Sun, 10 Aug 2014 08:31:02 +0000 (09:31 +0100)]
fix ZTS build
David Zuelke [Sat, 9 Aug 2014 06:30:50 +0000 (08:30 +0200)]
NEWS entry for
e6d93a1 /
d73d44c
David Zuelke [Sat, 9 Aug 2014 06:26:33 +0000 (08:26 +0200)]
restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
David Zuelke [Sat, 9 Aug 2014 06:14:23 +0000 (08:14 +0200)]
Revert "Merge branch 'pull-request/694' into PHP-5.6"
This reverts commit
d96de86b5b4ca8adf63ac6e07ab57fc2ec9d87f4 , reversing
changes made to
b1e32a4f7a6c2351a2006c2c1b9085336ba513e4 .
Adam Harvey [Fri, 8 Aug 2014 19:02:56 +0000 (12:02 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Add __debugInfo() to UPGRADING.
Adam Harvey [Fri, 8 Aug 2014 19:00:13 +0000 (12:00 -0700)]
Add __debugInfo() to UPGRADING.
RMs: this is an UPGRADING only change, and should be safe for RCs.
Developers: please remember to update UPGRADING, otherwise there's a good
chance your shiny new feature won't be documented! (As has happened here.)
Dmitry Stogov [Fri, 8 Aug 2014 09:47:34 +0000 (13:47 +0400)]
cleanup
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
Dmitry Stogov [Thu, 7 Aug 2014 14:50:03 +0000 (18:50 +0400)]
Fixed GC for inner-loops (ext/standard/tests/array/compact_variation1.phpt).
Fixed bug #63734.
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