php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-24 16:38:25 +02:00
Code Issues Packages Projects Releases Wiki Activity
80,073 Commits 549 Branches 1,485 Tags
a68f63156c23a3aebbc4e7068610dbe85c670bda
Commit Graph

80073 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Johannes Schlüter a68f63156c Merge branch 'PHP-5.5' into PHP-5.6 2014-08-14 17:25:22 +02:00
Johannes Schlüter d1dd71454d Merge branch 'PHP-5.4' into PHP-5.5 2014-08-14 17:22:25 +02:00
Johannes Schlüter aeb633543b Merge branch 'PHP-5.3' into PHP-5.4 2014-08-14 17:13:44 +02:00
Johannes Schlüter 7311087cf0 Update Git rules 2014-08-14 17:08:02 +02:00
Johannes Schlüter 1355ea60cc Back to -dev (with EOL notice in NEWS) 2014-08-14 17:05:20 +02:00
Ferenc Kovacs 7c5af1adf9 new NEWS block for the next release 2014-08-14 02:17:55 +02:00
Johannes Schlüter babeca356b It's 2014 already, fix copyright year where user visible 
Left out all file headers
php-5.3.29 		2014-08-13 21:22:50 +02:00
Johannes Schlüter 1847cf10c1 PHP 5.3.29 2014-08-13 18:36:10 +02:00
Tjerk Meesters 7fbc99e390 Some changes were lost in the merge commit of #66091 2014-08-13 20:57:10 +08:00
Tjerk Meesters e4905b38b7 Updated NEWS for #66091 2014-08-13 20:24:43 +08:00
Tjerk Meesters 4b85f1d46a Fixed #66091 2014-08-13 20:24:43 +08:00
Tjerk Meesters 4950209a74 Updated NEWS for #66091 2014-08-13 20:20:54 +08:00
Tjerk Meesters 4647016abe Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Updated NEWS for #66091
  Fixed #66091

Conflicts:
	ext/date/php_date.c
 2014-08-13 20:20:10 +08:00
Tjerk Meesters b0f7cc8756 Updated NEWS for #66091 2014-08-13 20:16:22 +08:00
Tjerk Meesters c5f619ba6f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed #66091

Conflicts:
	ext/date/php_date.c
 2014-08-13 20:15:52 +08:00
Tjerk Meesters f6896e4395 Fixed #66091 2014-08-13 20:12:42 +08:00
Ferenc Kovacs 844e2e81f5 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"
 2014-08-12 14:47:03 +02:00
Anatol Belski 00fe640b19 updated NEWS 2014-08-12 11:52:50 +02:00
Anatol Belski f50c50a1f8 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
  updated NEWS
  backported the fix for bug #41577
 2014-08-12 11:52:07 +02:00
Anatol Belski de18f42047 updated NEWS 2014-08-12 11:51:42 +02:00
Anatol Belski 934c35f586 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated NEWS
  backported the fix for bug #41577
 2014-08-12 11:50:55 +02:00
Anatol Belski 8c247af1fc updated NEWS 2014-08-12 11:50:26 +02:00
Anatol Belski daa1fb8ba6 backported the fix for bug #41577 2014-08-12 11:49:46 +02:00
Ferenc Kovacs 54e8595f34 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
 2014-08-12 10:38:35 +02:00
Ferenc Kovacs 7aa776c7b4 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
 2014-08-12 10:37:44 +02:00
Ferenc Kovacs 39dd715382 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
 2014-08-12 10:34:54 +02:00
Xinchen Hui 1f496744ed Merge branch 'PHP-5.5' into PHP-5.6 2014-08-11 17:47:36 +08:00
Xinchen Hui b6ddcf9c71 Fixed bug #67813 (CachingIterator::__construct InvalidArgumentException wrong message) 2014-08-11 17:46:56 +08:00
Xinchen Hui d4df6d0200 Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 2014-08-11 17:44:42 +08:00
David Zuelke 37c08f466e NEWS entry for e6d93a1 / d73d44c 2014-08-09 08:30:50 +02:00
David Zuelke e6d93a11ad restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606 2014-08-09 08:26:33 +02:00
David Zuelke d73d44c237 Revert "Merge branch 'pull-request/694' into PHP-5.6" 
This reverts commit d96de86b5b, reversing
changes made to b1e32a4f7a.
 2014-08-09 08:14:23 +02:00
Adam Harvey cd63740db7 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.)
 2014-08-08 12:00:13 -07:00
Anatol Belski 8b8297170e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix TS build
 2014-08-07 19:50:45 +02:00
Anatol Belski 75991561d6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix TS build
 2014-08-07 19:50:25 +02:00
Anatol Belski 84a4041ba4 fix TS build 2014-08-07 19:49:59 +02:00
Daniel Lowrey 6e8de9b418 Update NEWS 2014-08-07 12:40:52 -04:00
Daniel Lowrey dc53eba23b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update NEWS
  Update NEWS
 2014-08-07 12:39:52 -04:00
Daniel Lowrey a04c5536bb Update NEWS 2014-08-07 12:39:42 -04:00
Daniel Lowrey 378ffd3cdf Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update NEWS
 2014-08-07 12:38:04 -04:00
Daniel Lowrey 1ff30fd88c Update NEWS 2014-08-07 12:37:50 -04:00
Daniel Lowrey 98e67add15 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
 2014-08-07 12:07:55 -04:00
Daniel Lowrey 5ac2e5f850 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Bug #41631: Observe socket read timeouts in SSL streams
 2014-08-07 11:51:42 -04:00
Daniel Lowrey 6569db8808 Bug #41631: Observe socket read timeouts in SSL streams 2014-08-07 11:47:42 -04:00
Anatol Belski 2cdc1a2b74 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  wrap int8_t and int16_t with #ifdef to avoid possible clashes
 2014-08-07 15:22:28 +02:00
Anatol Belski 58088c24eb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  wrap int8_t and int16_t with #ifdef to avoid possible clashes
 2014-08-07 15:21:42 +02:00
Anatol Belski 7189039d65 wrap int8_t and int16_t with #ifdef to avoid possible clashes 2014-08-07 15:20:17 +02:00
Derick Rethans 33e9bb79a3 Merge branch 'PHP-5.5' into PHP-5.6 2014-08-07 10:22:14 +01:00
Derick Rethans 0753c22e76 Merge branch 'PHP-5.4' into PHP-5.5 2014-08-07 10:22:10 +01:00
Derick Rethans 7df4087b98 - Updated to version 2014.6 (2014f) 2014-08-07 10:22:09 +01:00