php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 18:23:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
73,411 Commits 549 Branches 1,485 Tags
19915917b94e5b51996411eb45cb33479a9ee2dd
Commit Graph

73411 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Soria Parra 19915917b9 Merge branch 'PHP-5.5' 
* PHP-5.5:
  News for next beta
  Do another Alpha instead of Beta because of ZO+ RFC being voted on
 2013-03-07 12:16:31 +01:00
David Soria Parra e98271f588 News for next beta 2013-03-07 12:14:48 +01:00
David Soria Parra d0ca2430da Do another Alpha instead of Beta because of ZO+ RFC being voted on 2013-03-07 12:14:26 +01:00
David Soria Parra 76c6061aa0 Merge branch 'PHP-5.5' 
* PHP-5.5:
  NEWS for the next beta
  NEWS for PHP 5.5.0 Beta 1
 2013-03-07 00:27:48 +01:00
David Soria Parra 4923bb579a NEWS for the next beta 2013-03-06 23:51:27 +01:00
David Soria Parra b6ae7cba1e NEWS for PHP 5.5.0 Beta 1 2013-03-06 22:39:54 +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
Stanislav Malyshev 9ccf470b5f Merge branch 'PHP-5.5' 
* PHP-5.5:
  fix NEWS
 2013-03-06 00:45:54 -08:00
Stanislav Malyshev 9ed7eab514 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix NEWS
 2013-03-06 00:45:26 -08:00
Stanislav Malyshev 38847482c8 fix NEWS 2013-03-06 00:44:43 -08: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 33a8e387f5 - damned conflicts 2013-03-04 12:11:20 +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
Xinchen Hui d207f23475 Merge branch 'typofix' of https://github.com/carsonmcdonald/php-src 2013-03-04 10:47:30 +08:00
Stanislav Malyshev d93d8acca7 Merge branch 'PHP-5.5' 
* PHP-5.5:
  rename NEWS back
  updated NEWS
 2013-03-03 13:24:31 -08:00
Stanislav Malyshev b65d4d1cfc Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  rename NEWS back
  updated NEWS
 2013-03-03 13:24:00 -08:00
Stanislav Malyshev 2578f7bcc0 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  rename NEWS back
  updated NEWS
 2013-03-03 13:20:57 -08:00
Stanislav Malyshev 656fcb67f1 rename NEWS back 2013-03-03 13:18:58 -08:00
Anatol Belski 3f48adbd64 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
  Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
  Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
 2013-03-03 19:23:26 +01:00
Anatol Belski a5b6a0a25b Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:php-src:
  Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
  Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
  Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
 2013-03-03 19:23:06 +01:00
Anatol Belski d95faef1a1 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 
* 'PHP-5.4' of git.php.net:php-src:
  Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
  Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
 2013-03-03 19:22:35 +01:00
Anatol Belski fe2612d71e Merge branch 'PHP-5.3' of git.php.net:php-src into PHP-5.3 
* 'PHP-5.3' of git.php.net:php-src:
  Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
 2013-03-03 19:21:45 +01:00
Anatol Belski 5e57bebbb7 Merge branch 'PHP-5.5' 
* PHP-5.5:
  updated NEWS
  updated NEWS
  This commit was manufactured by cvs2svn to create tag 'NEWS'.
 2013-03-03 19:17:14 +01:00
Anatol Belski 555d584a40 updated NEWS 2013-03-03 19:16:36 +01:00
Anatol Belski b89c326578 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated NEWS
  This commit was manufactured by cvs2svn to create tag 'NEWS'.
 2013-03-03 19:15:37 +01:00
Anatol Belski 00ecc12c0f updated NEWS 2013-03-03 19:14:50 +01:00
Anatol Belski faf14e9b2e Merge commit 'NEWS' into PHP-5.4 
* commit 'NEWS':
  This commit was manufactured by cvs2svn to create tag 'NEWS'.
 2013-03-03 19:14:17 +01:00
Anatol Belski e1023affc1 updated NEWS 2013-03-03 19:13:38 +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
Derick Rethans ef99886bcb Merge branch 'PHP-5.5' 2013-03-03 13:10:41 -05:00