php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-05 07:02:33 +02:00
Code Issues Packages Projects Releases Wiki Activity
73,178 Commits 547 Branches 1,481 Tags
9ef01ce698658db74a89326fcaa2fe1406230713
Commit Graph

31130 Commits

Author SHA1 Message Date
Dmitry Stogov
9ef01ce698 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2013-03-16 00:46:34 +04:00
Dmitry Stogov
34d3202eda Merge Zend Optimizer+ 
git-subtree-dir: ext/opcache
git-subtree-mainline: b1dbfb7357
git-subtree-split: 8d35170c5f
 2013-03-16 00:41:46 +04:00
Anatol Belski
f8b91d9acf Fixed bug #62852 Unserialize Invalid Date crash 
Error handling is the same as in bug #53437, E_ERROR if we
expect an invalid object.
 2013-03-15 21:22:35 +01:00
Anatol Belski
0ee71557ff Fixed bug #53437 Crash with unserialized DatePeriod instance 2013-03-15 16:59:54 +01:00
Anatol Belski
96388c78c9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix zts check
 2013-03-14 14:39:47 +01:00
Anatol Belski
5df8cf1975 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fix zts check
 2013-03-14 14:39:09 +01:00
Anatol Belski
e43c5a8395 fix zts check 2013-03-14 14:38:20 +01:00
Andrey Hristov
c09652c289 fix the fix 2013-03-13 15:56:44 +01:00
Andrey Hristov
7503a4b4a4 Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	NEWS
 2013-03-13 15:29:40 +01:00
Andrey Hristov
0777a18703 Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	NEWS
 2013-03-13 14:24:23 +01:00
Andrey Hristov
f1e2edff8b fix for bug #63530 mysqlnd_stmt::bind_one_parameter uses wrong alloc for stmt->param_bind 2013-03-13 13:37:51 +01:00
Nikita Popov
28634bf603 Forgot to remove some now unused variables 2013-03-12 17:39:20 +01:00
Nikita Popov
fcc6611de9 Add support for non-scalar Iterator keys in foreach 
RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
 2013-03-12 17:27:31 +01:00
Anatol Belski
a328cc452e Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fixed headers order
 2013-03-12 08:34:16 +01:00
Anatol Belski
bdaafe3c7b fixed headers order 2013-03-12 08:33:36 +01:00
Derick Rethans
e5c64c0bda Merge branch 'PHP-5.4' into PHP-5.5 2013-03-11 21:36:41 +00:00
Derick Rethans
98bb5f4798 Merge branch 'PHP-5.3' into PHP-5.4 2013-03-11 21:36:37 +00:00
Derick Rethans
50ad2af503 - Updated to version 2013.2 (2013b) 2013-03-11 21:36:36 +00:00
Anatol Belski
278c4097c6 fixed the test 2013-03-11 16:14:39 +01:00
Anatol Belski
8aaa09636a Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT']) 2013-03-11 16:04:37 +01:00
Nikita Popov
a59b211b2d Fix get_property_ptr_ptr declaration in simplexml 
A new parameter was added to the API and simplexml wasn't adjusted,
thus causing crashes.
 2013-03-09 20:15:00 +01:00
Xinchen Hui
1be745ce1b Merge branch 'PHP-5.4' into PHP-5.5 
Conflicts:
	ext/standard/var_unserializer.c
 2013-03-09 23:10:48 +08:00
Xinchen Hui
f52b2e6a65 Fixed bug #64354 (Unserialize array of objects whose class can't be autoloaded fail) 
about the __sleep one, since php_serialize_* are all void function,
so,,only check exception at the very begining
 2013-03-09 23:00:58 +08:00
Carson McDonald
0c11cab919 Typo fix: recieved to received 2013-03-07 23:05:05 +01:00
Anatol Belski
8589dfb6cc simplified the previous fix for #64359 2013-03-06 16:48:51 +01:00
Anatol Belski
371000a877 Fixed bug #64359 strftime crash with VS2012 2013-03-06 12:37:57 +01:00
Xinchen Hui
082741814a skip if no IPv6 support 2013-03-05 17:18:13 +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
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
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
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