clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-03 07:46:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,069 Commits 494 Branches 1,367 Tags 810 MiB
ee8dfb8882
Commit Graph

70069 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinchen Hui
ee8dfb8882 Merge branch 'PHP-5.4' 2012-04-13 00:12:40 +08:00
Xinchen Hui
8ceae39d4d Merge branch 'PHP-5.3' into PHP-5.4 2012-04-13 00:11:04 +08:00
Xinchen Hui
8c4294bcb4 Fixed test faild 
the sun_path will not be that much long:
 http://pubs.opengroup.org/onlinepubs/009695399/basedefs/sys/un.h.html
 2012-04-13 00:07:07 +08:00
Johannes Schlüter
3e7d48a0ce Merge branch 'PHP-5.4' 
* PHP-5.4:
  Remove cherry-picked items for 5.3.11
  Fix bug #61537 (json_encode() incorrectly truncates/discards information) and remove a test case that's now mooted by this fix.
 2012-04-12 12:03:20 +02:00
Johannes Schlüter
0a580ac76f Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Remove cherry-picked items for 5.3.11
  Fix bug #61537 (json_encode() incorrectly truncates/discards information) and remove a test case that's now mooted by this fix.

Conflicts:
	ext/json/json.c
	ext/json/php_json.h
 2012-04-12 12:02:38 +02:00
Johannes Schlüter
1461a40301 Remove cherry-picked items for 5.3.11 2012-04-12 11:21:41 +02:00
Stanislav Malyshev
363797e9af Merge branch 'PHP-5.4' 
* PHP-5.4:
  Copy default properties of internal classes for different threads
 2012-04-11 19:24:11 -07:00
Johannes Schlüter
82c05eeda9 Copy default properties of internal classes for different threads 2012-04-11 19:21:41 -07:00
Adam Harvey
8bf79f7b7f Merge branch 'PHP-5.4' 
* PHP-5.4:
  Update test to fix breakage caused by the previous commit.
  Fix bug #61537 (json_encode() incorrectly truncates/discards information) and remove a test case that's now mooted by this fix.

Conflicts:
	NEWS
 2012-04-11 08:33:11 +08:00
Adam Harvey
05c8d4766c Update test to fix breakage caused by the previous commit. 2012-04-11 08:29:39 +08:00
Adam Harvey
cb2a1c71c9 Fix bug #61537 (json_encode() incorrectly truncates/discards information) and 
remove a test case that's now mooted by this fix.
 2012-04-11 08:29:39 +08:00
Adam Harvey
3f3ad30c50 Fix bug #61537 (json_encode() incorrectly truncates/discards information) and 
remove a test case that's now mooted by this fix.
 2012-04-11 08:24:38 +08:00
Gustavo André dos Santos Lopes
b03f62fb5d Merge branch '5.4' 2012-04-10 19:45:47 +01:00
Gustavo André dos Santos Lopes
112a476b68 Merge .gitattributes EOL commit from 5.3. 
This merge commit includes several changes from the 5.3 commit.
This is because of 1) different tests between the two branches
and 2) the svn:eol-style attributes differing between the two
branches.
 2012-04-10 19:45:18 +01:00
Gustavo André dos Santos Lopes
1c8fccdf6d Disabled EOL conversions on certain tests 2012-04-10 19:41:07 +01:00
Anatoliy Belsky
2530ba8c2d Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #61669 ext\standard\tests\file\rename_variation7-win32.phpt fails
 2012-04-10 15:24:19 +02:00
Anatoliy Belsky
9ada49fa1c Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #61669 ext\standard\tests\file\rename_variation7-win32.phpt fails

Conflicts:
	ext/standard/tests/file/rename_variation7-win32.phpt
 2012-04-10 15:23:38 +02:00
Anatoliy Belsky
ed0ddd20c5 Fixed bug #61669 ext\standard\tests\file\rename_variation7-win32.phpt fails 2012-04-10 15:16:48 +02:00
Anatoliy Belsky
5e157bc568 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #61668 ext\standard\tests\file\rename_variation13-win32.phpt fails
 2012-04-10 15:13:12 +02:00
Anatoliy Belsky
a9eace9f6e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #61668 ext\standard\tests\file\rename_variation13-win32.phpt fails

Conflicts:
	ext/standard/tests/file/rename_variation13-win32.phpt
 2012-04-10 15:12:42 +02:00
Anatoliy Belsky
b0cb29db87 Fixed bug #61668 ext\standard\tests\file\rename_variation13-win32.phpt fails 2012-04-10 15:09:21 +02:00
Anatoliy Belsky
5bef1a1175 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #61667 ext\standard\tests\file\glob_variation-win32.phpt fails
 2012-04-10 15:04:24 +02:00
Anatoliy Belsky
98001a849b Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61667 ext\standard\tests\file\glob_variation-win32.phpt fails

Conflicts:
	ext/standard/tests/file/glob_variation-win32.phpt
 2012-04-10 15:03:41 +02:00
Anatoliy Belsky
b9cbb9e744 Fix bug #61667 ext\standard\tests\file\glob_variation-win32.phpt fails 2012-04-10 15:00:03 +02:00
Anatoliy Belsky
6c1fcef45c Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #61666 ext\standard\tests\file\file_put_contents_variation8-win32.phpt fails
 2012-04-10 14:56:01 +02:00
Anatoliy Belsky
06b2d66ce2 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #61666 ext\standard\tests\file\file_put_contents_variation8-win32.phpt fails

Conflicts:
	ext/standard/tests/file/file_put_contents_variation8-win32.phpt
 2012-04-10 14:55:38 +02:00
Anatoliy Belsky
fde96342e8 Fixed bug #61666 ext\standard\tests\file\file_put_contents_variation8-win32.phpt fails 2012-04-10 14:13:15 +02:00
Anatoliy Belsky
e1ac874b73 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #61659 Test ext\spl\tests\bug60082.phpt fails
  Fixed bug #61638 Test ext\sockets\tests\unixloop.phpt fails
  Fixed bug #61637 ext\sockets\tests\socket_sentto_recvfrom_unix.phpt
  Fixed bug #61635 ext\sockets\tests\socket_select-wrongparams-1.phpt
  Fixed bug #61638 Test ext\sockets\tests\unixloop.phpt fails
  Fixed bug #61637 ext\sockets\tests\socket_sentto_recvfrom_unix.phpt
  Fixed bug #61635 ext\sockets\tests\socket_select-wrongparams-1.phpt
 2012-04-10 14:05:45 +02:00
Anatoliy Belsky
13211f201a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #61659 Test ext\spl\tests\bug60082.phpt fails
  Fixed bug #61638 Test ext\sockets\tests\unixloop.phpt fails
  Fixed bug #61637 ext\sockets\tests\socket_sentto_recvfrom_unix.phpt
  Fixed bug #61635 ext\sockets\tests\socket_select-wrongparams-1.phpt

Conflicts:
	ext/spl/tests/bug60082.phpt
 2012-04-10 14:05:07 +02:00
Anatoliy Belsky
b2f2e1d6cc Fix bug #61659 Test ext\spl\tests\bug60082.phpt fails 2012-04-10 14:03:19 +02:00
Anatoliy Belsky
024cd2a124 Fixed bug #61638 Test ext\sockets\tests\unixloop.phpt fails 2012-04-10 14:00:51 +02:00
Anatoliy Belsky
bbab846ada Fixed bug #61637 ext\sockets\tests\socket_sentto_recvfrom_unix.phpt 2012-04-10 14:00:50 +02:00
Anatoliy Belsky
70f2f30e67 Fixed bug #61635 ext\sockets\tests\socket_select-wrongparams-1.phpt 2012-04-10 14:00:50 +02:00
Anatoliy Belsky
4d106f40a4 Fixed bug #61638 Test ext\sockets\tests\unixloop.phpt fails 2012-04-10 14:00:15 +02:00
Anatoliy Belsky
e9e4689145 Fixed bug #61637 ext\sockets\tests\socket_sentto_recvfrom_unix.phpt 2012-04-10 14:00:14 +02:00
Anatoliy Belsky
882a3cf8a7 Fixed bug #61635 ext\sockets\tests\socket_select-wrongparams-1.phpt 2012-04-10 14:00:13 +02:00
Anatoliy Belsky
b3be5d920a Fixed bug #61638 Test ext\sockets\tests\unixloop.phpt fails 2012-04-10 13:58:15 +02:00
Anatoliy Belsky
15e26c6d4a Fixed bug #61637 ext\sockets\tests\socket_sentto_recvfrom_unix.phpt 2012-04-10 13:54:22 +02:00
Anatoliy Belsky
af8646c188 Fixed bug #61635 ext\sockets\tests\socket_select-wrongparams-1.phpt 2012-04-10 13:40:20 +02:00
Anatoliy Belsky
b2bc9c4141 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #61634 Test ext\sockets\tests\socket_listen-wrongparams.phpt fails
  Fixed bug #61633 Test ext\sockets\tests\socket_create_pair-wrongparams.phpt fails
  Fixed bug #61632 Test ext\sockets\tests\socket_create_listen.phpt fails
  Fixed bug #61633 Test ext\sockets\tests\socket_create_pair-wrongparams.phpt fails
  Fixed bug #61632 Test ext\sockets\tests\socket_create_listen.phpt fails
  Fixed bug 61621 Test fail in ext/standard/tests/dir
 2012-04-10 13:11:14 +02:00
Anatoliy Belsky
006b04da4a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #61634 Test ext\sockets\tests\socket_listen-wrongparams.phpt fails
  Fixed bug #61633 Test ext\sockets\tests\socket_create_pair-wrongparams.phpt fails
  Fixed bug #61632 Test ext\sockets\tests\socket_create_listen.phpt fails
  Fixed bug 61621 Test fail in ext/standard/tests/dir
 2012-04-10 13:09:48 +02:00
Anatoliy Belsky
c4676ee99f Fixed bug #61634 Test ext\sockets\tests\socket_listen-wrongparams.phpt fails 2012-04-10 13:08:57 +02:00
Anatoliy Belsky
5b0e7203e6 Fixed bug #61633 Test ext\sockets\tests\socket_create_pair-wrongparams.phpt fails 2012-04-10 13:06:15 +02:00
Anatoliy Belsky
83b48280c7 Fixed bug #61632 Test ext\sockets\tests\socket_create_listen.phpt fails 2012-04-10 13:06:14 +02:00
Anatoliy Belsky
497a343a5e Fixed bug #61633 Test ext\sockets\tests\socket_create_pair-wrongparams.phpt fails 2012-04-10 13:05:38 +02:00
Anatoliy Belsky
63ed8eb0a5 Fixed bug #61632 Test ext\sockets\tests\socket_create_listen.phpt fails 2012-04-10 13:05:37 +02:00
Anatoliy Belsky
5594fcf423 Fixed bug #61633 Test ext\sockets\tests\socket_create_pair-wrongparams.phpt fails 2012-04-10 13:02:53 +02:00
Anatoliy Belsky
37cb29ae90 Fixed bug #61632 Test ext\sockets\tests\socket_create_listen.phpt fails 2012-04-10 12:57:10 +02:00
Anatoliy Belsky
d80e2e069c Fixed bug 61621 Test fail in ext/standard/tests/dir 2012-04-10 12:47:01 +02:00
Anatoliy Belsky
e33d209076 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #61611 ext\date\tests\date_default_timezone_get-2.phpt fails
  Fixed bug #61631 mbstring mail related tests fail
  Fixed bug #61610 Test ext\date\tests\date_default_timezone_get-1.diff fails
  Fix bug #61609 Test ext\date\tests\bug52062.phpt fails As expressed in the comments http://de.php.net/manual/en/datetime.gettimestamp.php this is the generic 32 bit timestamp issue
  Fixed bug #61631 mbstring mail related tests fail
  Fixed bug #61610 Test ext\date\tests\date_default_timezone_get-1.diff fails
  Fix bug #61609 Test ext\date\tests\bug52062.phpt fails As expressed in the comments http://de.php.net/manual/en/datetime.gettimestamp.php this is the generic 32 bit timestamp issue
  MFH: fixed a mistake on reverting my previous patch.
 2012-04-10 12:38:19 +02:00