clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
84,003 Commits 491 Branches 1,363 Tags 838 MiB
c3e3c98ec6
Commit Graph

84003 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Lior Kaplan
0cf2dbdf58 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>
 2014-08-25 00:31:10 +03:00
Lior Kaplan
6e87b01e95 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>
 2014-08-25 00:30:40 +03:00
Lior Kaplan
c8b3bce407 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk>
 2014-08-25 00:30:01 +03:00
Lior Kaplan
bda1cc6946 Bug #67730: Add tests by Ryan Mauger <ryan@rmauger.co.uk> 2014-08-25 00:29:05 +03: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
b2d123f985 fix a phrase 2014-08-24 02:57:19 +02:00
Anatol Belski
9ac656cc20 Merge branch 'master' of git.php.net:php-src 
# By Ferenc Kovacs
# Via Ferenc Kovacs
* 'master' of git.php.net:php-src:
  this test depends on the simplexml ext, not just on xml
 2014-08-24 02:55:01 +02:00
Anatol Belski
3c17ce9e0f note on %pd format 2014-08-24 02:36:17 +02:00
Anatol Belski
70de6180d5 fixes to %pd format usage 2014-08-24 02:35:34 +02:00
Ferenc Kovacs
50b20e75ff Merge branch 'PHP-5.6' 
* PHP-5.6:
  this test depends on the simplexml ext, not just on xml

Conflicts:
	ext/simplexml/tests/bug62328.phpt
 2014-08-24 00:18:51 +02:00
Ferenc Kovacs
86966a092b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  this test depends on the simplexml ext, not just on xml
 2014-08-24 00:09:31 +02:00
Ferenc Kovacs
a90d05a430 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  this test depends on the simplexml ext, not just on xml
 2014-08-24 00:09:00 +02:00
Ferenc Kovacs
cb41a7bad1 this test depends on the simplexml ext, not just on xml 2014-08-24 00:08:09 +02:00
Tjerk Meesters
86674b5837 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed #67694: Regression in session_regenerate_id()

Conflicts:
	ext/session/session.c
 2014-08-23 09:21:36 +08:00
Tjerk Meesters
ce9bdae33f Fixed #67694: Regression in session_regenerate_id() 2014-08-23 09:18:02 +08:00
Tjerk Meesters
d1d0f55e22 Use %d instead of object id 2014-08-23 08:09:08 +08:00
Tjerk Meesters
32e8d0f03e Fixed test case based on var_dump() changes made in c1965f58d4 2014-08-23 08:06:47 +08:00
krakjoe
3f4811c76e fix wrong type causing build error 2014-08-22 18:30:13 +01:00
Anatol Belski
4ff697b6b1 adedd note on portable numeric macros 2014-08-22 13:48:20 +02:00
Anatol Belski
4c56e68b7f note on LFS macros 2014-08-22 13:40:45 +02:00
Anatol Belski
fa6fe06a86 updated UPGRADING so far 2014-08-22 13:35:07 +02:00
Anatol Belski
24cf50d2df note on hash table and sprintf 2014-08-22 13:22:49 +02:00
Anatol Belski
c893552a9a note on zpp specs 2014-08-22 10:31:48 +02:00
Anatol Belski
612e459041 updated UPGRADING.INTERNALS with new data types 2014-08-22 10:24:51 +02:00
Anatol Belski
79f888a602 Merge remote-tracking branch 'weltling/master' 
* weltling/master: (725 commits)
  fix zpp
  fixed array_pad()
  fix zpp
  fix zpp
  fix zpp
  fix zpp and a bit more
  fix zpp
  fix zpp
  fix zpp
  fix zpp
  fix zpp
  fix zpp
  fix zpp
  fix zpp
  fix zpp
  fix zpp
  fix zpp
  fix zpp
  fix zpp
  fixed the test
  ...
 2014-08-22 08:58:03 +02:00
Xinchen Hui
da35db3ec5 Fixed complier error 2014-08-22 10:20:44 +08:00
Michael Wallner
7fca659a7b Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix bug #67865
  updated NEWS to fit last release
  NEWS
  Fix bug #67878 program_prefix not honoured in man pages
  NEWS
  Fix bug #67878 program_prefix not honoured in man pages
 2014-08-21 22:46:03 +02:00
Michael Wallner
3b82c4e520 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix bug #67865
  updated NEWS to fit last release
  NEWS
  Fix bug #67878 program_prefix not honoured in man pages
 2014-08-21 22:45:33 +02:00
Michael Wallner
c4fb183b9f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix bug #67865
 2014-08-21 22:43:25 +02:00
Michael Wallner
54fbbded37 fix bug #67865 2014-08-21 22:41:36 +02:00
Anatol Belski
411b920a6f fix zpp 2014-08-21 22:20:42 +02:00
Anatol Belski
9d760498c1 fixed array_pad() 2014-08-21 22:13:22 +02:00
Anatol Belski
96a570cb03 fix zpp 2014-08-21 20:32:39 +02:00
Anatol Belski
4a85ec874a fix zpp 2014-08-21 20:31:32 +02:00
Anatol Belski
fdfe8ac36e fix zpp 2014-08-21 20:25:31 +02:00
Anatol Belski
7815d23e9e fix zpp and a bit more 2014-08-21 20:22:18 +02:00
Anatol Belski
3cb5c6e692 fix zpp 2014-08-21 20:13:55 +02:00
Anatol Belski
7de2259818 fix zpp 2014-08-21 17:59:28 +02:00
Anatol Belski
21a45d9aca Merge remote-tracking branch 'php/master' 2014-08-21 15:55:56 +02:00
Anatol Belski
c1b65ac66b fix zpp 2014-08-21 15:54:47 +02:00
Anatol Belski
5eef3a9eed fix zpp 2014-08-21 15:51:09 +02:00
Anatol Belski
ff853d2fe0 fix zpp 2014-08-21 15:47:52 +02:00
Anatol Belski
b315af1d9f fix zpp 2014-08-21 15:44:23 +02:00
Anatol Belski
113e3c1eeb fix zpp 2014-08-21 15:42:48 +02:00
Anatol Belski
0e546cecd6 fix zpp 2014-08-21 15:40:24 +02:00
Anatol Belski
fb8c41101d fix zpp 2014-08-21 15:39:29 +02:00
Anatol Belski
5d62cf2f7d fix zpp 2014-08-21 15:36:33 +02:00
Anatol Belski
daa0f094cf fix zpp 2014-08-21 15:32:17 +02:00
Dmitry Stogov
b9a5db2b55 Fixed incorrect string length 2014-08-21 17:30:34 +04:00