clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 15:26:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,001 Commits 494 Branches 1,367 Tags 807 MiB
e9a2642c89
Commit Graph

31099 Commits

Author SHA1 Message Date
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
5001f40e82 - add noisy php logo for autocrop with threshold test 2013-03-04 12:05:59 +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
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
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
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
2413fa6fbb Fix test after the convert_to_long be improved, see #64290 2013-03-03 11:13:52 +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
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
82765a0780 - typo 2013-02-27 21:02:47 +01:00
Pierre Joye
74983a45cc - fix name for imageflip constants, consistent witht the other 2013-02-27 20:23:31 +01:00
Pierre Joye
03d0bf633d - add test 2013-02-27 20:22:45 +01:00
Pierre Joye
34adce6c47 - add constants for imageflip 2013-02-27 20:08:26 +01:00
Pierre Joye
efffdb4d7f - add only once 2013-02-27 16:03:17 +01:00
Pierre Joye
98e43de7c5 - add new file for m4 as well 2013-02-27 16:02:54 +01:00
Pierre Joye
fa940a60de - add image flip API support 2013-02-27 10:39:25 +01:00
Pierre Joye
e6414140e6 - add image flip API support 2013-02-27 10:39:16 +01:00
Pierre Joye
af5bf879aa - add image flip API support 2013-02-27 10:39:09 +01:00
Pierre Joye
6a3623e199 - add image flip API support 2013-02-27 10:38:33 +01:00
Pierre Joye
246de922e6 - add image flip API support 2013-02-27 10:37:48 +01:00
Stanislav Malyshev
207d0ee08a Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Bug #52861: unset fails with ArrayObject and deep arrays
 2013-02-26 22:13:01 -08:00
Stanislav Malyshev
7c08232509 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Bug #52861: unset fails with ArrayObject and deep arrays
 2013-02-26 22:12:36 -08:00
Mike Willbanks
61099f8585 Bug #52861: unset fails with ArrayObject and deep arrays 
When checking to make into a reference write, readwrite are checked but not unset
 2013-02-26 22:11:52 -08:00
Xinchen Hui
e75804c34e Merge branch 'PHP-5.4' into PHP-5.5 2013-02-24 12:59:10 +08:00
Xinchen Hui
d24ac6953e Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	ext/spl/spl_fixedarray.c
 2013-02-24 12:58:39 +08:00
Xinchen Hui
1b58bd39a6 Fixed bug #64264 (SPLFixedArray toArray problem) 2013-02-24 12:55:53 +08:00
Gustavo Lopes
59ec22b370 sendrecvmsg_shutdown function moved to mshutdown 
The function php_socket_sendrecvmsg_shutdown() should have been called in
MSHUTDOWN, not RSHUTDOWN.

Bug only on TSRM builds.

Should fix bug #64287.
 2013-02-24 03:50:38 +01:00
Gustavo Lopes
189fbfd53b Fix ext/sockets build with phpize 
Fixes bug #64285
 2013-02-24 00:49:25 +01:00
Gustavo Lopes
97f22702c4 Fix ext/intl build with phpize 
Fixes bug #64284.
 2013-02-24 00:49:01 +01:00
Andrey Hristov
64a2a8a753 relax the check 2013-02-22 13:50:04 +01:00
Andrey Hristov
1643d4ed56 Add some parameter checks 2013-02-22 13:17:46 +01:00
Johannes Schlüter
b479c2bffb Merge branch 'PHP-5.4' into PHP-5.5 2013-02-21 16:50:59 +01:00
Johannes Schlüter
064c62e4cf Fix #60840 (undefined symbol: mysqlnd_debug_std_no_trace_funcs) 2013-02-21 16:49:28 +01:00
Johannes Schlüter
7b719235b3 Merge branch 'PHP-5.4' into PHP-5.5 2013-02-21 15:10:47 +01:00
Johannes Schlüter
1e9bc56775 Merge branch 'PHP-5.3' into PHP-5.4 2013-02-21 15:10:15 +01:00
Johannes Schlüter
fcd4b5335a Fix TSRM (after afc1debb) 2013-02-21 15:08:58 +01:00