clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 03:17:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
84,645 Commits 491 Branches 1,363 Tags 846 MiB
610ef5d7ec
Commit Graph

1338 Commits

Author SHA1 Message Date
Dmitry Stogov
88d7ca44f6 Refactored INI subsystem to use zend_string* instead of char* 2014-09-01 20:57:33 +04:00
Derick Rethans
b9f3247267 Merge branch 'PHP-5.6' 2014-09-01 16:40:57 +01:00
Derick Rethans
f89b7ec389 Merge branch 'PHP-5.5' into PHP-5.6 2014-09-01 16:40:54 +01:00
Derick Rethans
21446cd7b6 Merge branch 'PHP-5.4' into PHP-5.5 2014-09-01 16:40:50 +01:00
Derick Rethans
e665a07ab9 - Updated to version 2014.7 (2014g) 2014-09-01 16:40:49 +01:00
Anatol Belski
039f512289 fix signature 2014-08-27 22:01:43 +02:00
Anatol Belski
257ed4061a 's' works with size_t round 2 2014-08-27 20:49:33 +02:00
Anatol Belski
5882446b8b revert an accident 2014-08-27 20:49:32 +02:00
Anatol Belski
3234480827 first show to make 's' work with size_t 2014-08-27 20:49:31 +02:00
Anatol Belski
202e8db1dc fixed several long vs zend_long casts 2014-08-26 11:26:53 +02:00
Anatol Belski
c2cb2cb9f8 regenerated date parsers 2014-08-26 10:40:47 +02:00
Anatol Belski
3b75f96569 fix typo 2014-08-26 10:06:43 +02:00
Anatol Belski
c49cd84da9 make timelib independent from zend_long 2014-08-26 09:27:55 +02:00
Anatol Belski
af59e92b24 master renames phase 7 2014-08-25 21:51:49 +02:00
Anatol Belski
4d997f63d9 master renames phase 3 2014-08-25 20:22:49 +02:00
Anatol Belski
c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Anatol Belski
80a3b9ca40 bring back the logic to parse 64 bit props also in 32 bit build 2014-08-24 11:48:57 +02:00
Anatol Belski
70de6180d5 fixes to %pd format usage 2014-08-24 02:35:34 +02:00
Anatol Belski
d15360c1dd Merge remote-tracking branch 'php/master' 2014-08-21 08:39:46 +02:00
Stanislav Malyshev
6da2a977fc fix test 2014-08-20 14:44:25 -07:00
Stanislav Malyshev
557a6d8c6f Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix test
 2014-08-20 14:44:02 -07:00
Stanislav Malyshev
2dfabd8b51 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix test
 2014-08-20 14:43:22 -07:00
Stanislav Malyshev
6424bf659d fix test 2014-08-20 14:42:48 -07:00
Anatol Belski
d4f463cf08 brought back that vs2012 fix 2014-08-19 09:37:38 +02:00
Anatol Belski
97c5172ac7 Merge remote-tracking branch 'php/master' 
Conflicts:
	ext/date/lib/parse_date.c
 2014-08-19 08:27:43 +02:00
Derick Rethans
919b6447a2 Merge branch 'PHP-5.6' 2014-08-18 20:27:51 +01:00
Derick Rethans
77cc6aabb7 Merge branch 'PHP-5.5' into PHP-5.6 2014-08-18 20:27:44 +01:00
Derick Rethans
36d05d75c8 Fixed bug #67109: First uppercase letter breaks date string parsing. 2014-08-18 18:41:50 +01:00
Derick Rethans
2b9af967fb Fixed bug #66985: Some timezones are no longer valid in PHP 5.5.10. 2014-08-18 18:41:50 +01:00
Anatol Belski
e49e163a9e fixes to date 2014-08-18 18:57:55 +02:00
Anatol Belski
c586133d07 rename zval_get_long and fixes to some string functions 2014-08-18 08:39:39 +02:00
Anatol Belski
41115d3d9d regenerated parser files 2014-08-17 21:05:20 +02:00
Anatol Belski
cb25136f4e fix macros in the 5 basic extensions 2014-08-16 11:37:14 +02:00
Dmitry Stogov
7497c8793d 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
 2014-08-14 23:30:49 +04:00
Xinchen Hui
c749fe2067 cleanup 2014-08-14 12:15:24 +08:00
Dmitry Stogov
a08b7b7701 cleanup 2014-08-13 19:43:34 +04:00
Tjerk Meesters
7fbc99e390 Some changes were lost in the merge commit of #66091 2014-08-13 20:57:10 +08:00
Tjerk Meesters
4b85f1d46a Fixed #66091 2014-08-13 20:24:43 +08:00
Tjerk Meesters
b695341e62 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Updated NEWS for #66091
  Updated NEWS for #66091
  Fixed #66091
 2014-08-13 20:21:30 +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
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
Dmitry Stogov
05eaed4345 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)
 2014-08-12 14:46:38 +04:00
Ferenc Kovacs
b3468662de 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
 2014-08-12 10:44:09 +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
Dmitry Stogov
4c716e8b51 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
 2014-08-11 11:38:41 +04:00
Derick Rethans
3fd379e196 Merge branch 'PHP-5.6' 
Not sure what's going wrong here for UPGRADING.INTERNALS...

Conflicts:
	UPGRADING.INTERNALS
 2014-08-07 10:25:05 +01:00
Derick Rethans
33e9bb79a3 Merge branch 'PHP-5.5' into PHP-5.6 2014-08-07 10:22:14 +01:00