mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-01 13:54:10 +08:00
Code Issues Packages Projects Releases Wiki Activity
83,990 Commits 500 Branches 1,381 Tags 824 MiB
70de6180d5
Commit Graph

83990 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
70de6180d5 fixes to %pd format usage 2014-08-24 02:35:34 +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
Anatol Belski
f7c8213741 fix zpp 2014-08-21 15:25:39 +02:00
Anatol Belski
8b2f1ac177 fix zpp 2014-08-21 15:23:05 +02:00
Anatol Belski
8e94fbfc6a Merge remote-tracking branch 'php/master' 2014-08-21 14:38:43 +02:00
Dmitry Stogov
455bcc4182 Fixed test. It's not a problem to perform/continue replacing if the source "$search" string was modified by callback, because the source string is duplicate in this case. 2014-08-21 16:21:13 +04:00
Dmitry Stogov
b0a54673f4 Fixed wrong test. Value of the static property must not be changed to string. 2014-08-21 16:15:01 +04:00
Anatol Belski
7ef536e4c9 Merge remote-tracking branch 'php/master' 
Conflicts:
	Zend/zend_exceptions.c
 2014-08-21 13:54:15 +02:00
Anatol Belski
79b2852da4 fixed the test 
the cause for this to fail now was that _php_iconv_strpos had int for
the offset, but the int from userland is 64 bit, that was an overflow
cusing wrong behaviour
 2014-08-21 13:49:09 +02:00
Dmitry Stogov
16b4d90fa9 Separate values before conversion 2014-08-21 14:30:52 +04:00
Anatol Belski
307dac3cfd Merge branch 'master' of github.com:weltling/php-src 2014-08-21 12:18:31 +02:00
Anatol Belski
6bea54b7b9 fixed mem leak 2014-08-21 12:18:08 +02:00
Anatol Belski
98bb620bfe fixed memory leak 2014-08-21 12:13:52 +02:00
Julien Pauli
dbbf1c2a3c updated NEWS to fit last release 2014-08-21 11:34:38 +02:00
krakjoe
cbc7b8e67c remove bogus locale use from test 2014-08-21 10:03:48 +01:00