php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 10:16:41 +02:00
Code Issues Packages Projects Releases Wiki Activity
73,413 Commits 549 Branches 1,485 Tags
3adb1aa89e4e4b73449fb898378bb3b159e77492
Commit Graph

31263 Commits

Author SHA1 Message Date
David Soria Parra 3adb1aa89e Merge branch 'PHP-5.5' 
* PHP-5.5:
  Typo fix: recieved to received
 2013-03-07 23:05:14 +01:00
Carson McDonald 0c11cab919 Typo fix: recieved to received 2013-03-07 23:05:05 +01:00
Anatol Belski 7fb0142fee Merge branch 'PHP-5.5' 
* PHP-5.5:
  simplified the previous fix for #64359
 2013-03-06 16:49:33 +01:00
Anatol Belski 8589dfb6cc simplified the previous fix for #64359 2013-03-06 16:48:51 +01:00
Anatol Belski cb80655024 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed bug #64359 strftime crash with VS2012
 2013-03-06 12:39:01 +01:00
Anatol Belski 371000a877 Fixed bug #64359 strftime crash with VS2012 2013-03-06 12:37:57 +01:00
Xinchen Hui 0fbe0a1495 Merge branch 'PHP-5.5' 2013-03-05 17:18:41 +08:00
Xinchen Hui 082741814a skip if no IPv6 support 2013-03-05 17:18:13 +08:00
Xinchen Hui 09e9c294b8 Merge branch 'PHP-5.5' 2013-03-05 16:57:37 +08:00
Xinchen Hui e5d0dc24d2 Fix tests temporary 
seems IPV6_PKTINFO are not avaiable in some OS
 2013-03-05 16:56:00 +08:00
Xinchen Hui ac2376fbf1 Merge branch 'PHP-5.5' 2013-03-05 14:03:47 +08:00
Xinchen Hui 1978dae309 Skip test on Apple 2013-03-05 14:02:28 +08:00
Xinchen Hui 3f67d5ae43 Revert "Fixed Bug #64340 (sockets tests failed) Patch by Reeze" 
build break, will only leave the test script fix first

This reverts commit f2246f352f.
 2013-03-05 13:58:20 +08:00
Pierre Joye 177a25fef2 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - fix path
 2013-03-04 14:14:36 +01:00
Pierre Joye 0404c38615 - fix path 2013-03-04 14:14:09 +01:00
Pierre Joye e9a2642c89 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-03-04 14:06:09 +01:00
Pierre Joye a29ae8c8f7 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - add noisy php logo for autocrop with threshold test
 2013-03-04 12:06:11 +01:00
Pierre Joye 5001f40e82 - add noisy php logo for autocrop with threshold test 2013-03-04 12:05:59 +01:00
Pierre Joye 5357d55634 Merge branch 'master' of git.php.net:php-src 2013-03-04 12:05:13 +01:00
Pierre Joye 3e0e64f208 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - add test for imagecropauto
  - (s)rgb distance works way better for now, re enable threshold
  - disable threshold for now, will enable it again using CIEDE2000
  - add todo for threshold
  - clean and enable threshold
  - add image crop support

Conflicts:
	UPGRADING
 2013-03-04 12:03:01 +01:00
Anatol Belski defb654efd Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fixed PCRE locale crash in Windows/TS
 2013-03-04 09:15:34 +01:00
Anatol Belski 2635408a0d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed PCRE locale crash in Windows/TS
 2013-03-04 09:15:17 +01:00
Anatol Belski 4e46a87392 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed PCRE locale crash in Windows/TS
 2013-03-04 09:14:14 +01:00
Stephen A. Zarkos b6fdb60ecf Fixed PCRE locale crash in Windows/TS 2013-03-04 09:09:45 +01:00
Pierre Joye 2024ff3b61 - add test for imagecropauto 2013-03-04 07:26:07 +01:00
Anatol Belski 8dd1e0bf6c Merge branch 'PHP-5.5' 
* PHP-5.5:
  merged PCRE 8.32
 2013-03-03 19:11:25 +01:00
Anatol Belski 1cda84a986 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  merged PCRE 8.32
 2013-03-03 19:10:12 +01:00
Anatol Belski ca4a3e6138 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  merged PCRE 8.32
 2013-03-03 19:07:49 +01:00
Anatol Belski 357ab3cbad merged PCRE 8.32 
- defined HAVE_CONFIG_H to simplify the future merges
- PCRE NEWS http://pcre.org/news.txt
 2013-03-03 19:06:22 +01:00
Derick Rethans b267ad3902 Merge branch 'PHP-5.5' 
Conflicts:
	NEWS
 2013-03-03 13:00:42 -05:00
Derick Rethans c596850af6 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	NEWS
 2013-03-03 12:58:42 -05:00
Derick Rethans a3f020a4be Merge branch 'PHP-5.3' into PHP-5.4 2013-03-03 12:53:23 -05:00
Derick Rethans c134f2a1a5 - Updated to version 2013.1 (2013a) 2013-03-03 12:53:22 -05:00
Pierre Joye 0a55c4b1dd - (s)rgb distance works way better for now, re enable threshold 2013-03-03 05:30:12 +01:00
Xinchen Hui b572f07b6f Merge branch 'PHP-5.5' 2013-03-03 11:25:49 +08:00
Xinchen Hui 46e612ada4 Merge branch 'PHP-5.4' into PHP-5.5 2013-03-03 11:25:29 +08:00
Xinchen Hui fe5ce5cb91 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 2013-03-03 11:25:08 +08:00
Xinchen Hui 9bda6a25a5 Fix test (skip on unable to create socket) 2013-03-03 11:24:45 +08:00
Xinchen Hui a3c0942cb0 Merge branch 'PHP-5.5' 2013-03-03 11:14:34 +08:00
Xinchen Hui 2413fa6fbb Fix test after the convert_to_long be improved, see #64290 2013-03-03 11:13:52 +08:00
Xinchen Hui 0cdd4e83bd Merge branch 'PHP-5.5' 2013-03-03 11:00:36 +08:00
Xinchen Hui 505c6ca486 Fixed bug #64290 (behavior change of converting to long) 
convert_to_long behavior has been improved
As Cataphrace said in IRC, the test should be fixed.
 2013-03-03 10:59:15 +08:00
Xinchen Hui b5e8597e5a Merge branch 'PHP-5.5' 2013-03-03 10:53:52 +08:00
Xinchen Hui f2246f352f Fixed Bug #64340 (sockets tests failed) Patch by Reeze 
Add __APPLE_USE_RFC_3542 for OS X 10.7 because IPv6 options are incompatible with RFC 2292.
 2013-03-03 10:51:04 +08:00
Pierre Joye 7698bc5735 - disable threshold for now, will enable it again using CIEDE2000 2013-03-01 08:10:49 +01:00
Pierre Joye 22aeb976e0 - add todo for threshold 2013-02-28 19:34:14 +01:00
Pierre Joye 0c32a18d4c - clean and enable threshold 2013-02-28 19:22:06 +01:00
Pierre Joye a991360344 - add image crop support 2013-02-28 17:24:23 +01:00
Pierre Joye 02a15898b2 Merge branch 'PHP-5.5' 
* PHP-5.5:
  - typo
 2013-02-27 21:03:09 +01:00
Pierre Joye 82765a0780 - typo 2013-02-27 21:02:47 +01:00