clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-25 03:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
69,330 Commits 493 Branches 1,366 Tags 848 MiB
e222837f6e
Commit Graph

1161 Commits

Author SHA1 Message Date
Xinchen Hui
69a4301f6c Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:45:07 +08:00
Xinchen Hui
1b9e0de2cc Remove executable permission on inc 2012-10-10 10:44:34 +08:00
Xinchen Hui
e081c55fb5 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:31:31 +08:00
Xinchen Hui
610c7fbe7b Remove executable permission on phpt 2012-10-10 10:27:49 +08:00
Xinchen Hui
e4a8fa6a15 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-09 13:29:51 +08:00
Xinchen Hui
6284ef112e Fixed bug #63236 (Executable permission on various source files) 2012-10-09 13:28:31 +08:00
Xinchen Hui
139ac42bec Fixed bug #63184 test (ext/spl/tests/RecursiveDirectoryIterator_getSubPathname_basic.phpt failed) 2012-10-01 22:42:22 +08:00
Xinchen Hui
175a9de47f Fix test 2012-10-01 00:15:47 +08:00
Xinchen Hui
36c10242cd Remove meaningless md5 string && Attempt to fix #63184 2012-09-29 14:38:29 +08:00
Anatoliy Belsky
6a50a8640c fix unix/win dir separators 2012-09-27 19:52:34 +02:00
Lars Strojny
ee172ce3cc Merging PR #116 2012-09-18 23:15:03 +02:00
Xinchen Hui
f3108b5f81 Remove extra blank in notice message, should act as same as vm 2012-09-01 14:37:45 +08:00
Xinchen Hui
863e7e0acb Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	ext/spl/spl_array.c
 2012-09-01 14:27:09 +08:00
Xinchen Hui
67d7d03f00 Fixed bug #62987 (Assigning to ArrayObject[null][something] overrides all undefined variables) 
The get_zval_ptr_ptr of spl_array handler should act as same as the vm's
 2012-09-01 14:21:34 +08:00
Xinchen Hui
13bcf685cb Fixed bug #62904 (Crash when cloning an object which inherits SplFixedArray) 2012-08-23 23:27:16 +08:00
Xinchen Hui
42f91d6ac6 Fixed bug #62904 (Crash when cloning an object which inherits SplFixedArray) 2012-08-23 23:21:25 +08:00
Xinchen Hui
8722173ad5 Implemented FR #62840 (Add sort flag to ArrayObject::ksort) 2012-08-21 13:32:15 +08:00
Felipe Pena
2497bb97e7 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - Value stored to var is never used
 2012-08-19 12:55:43 -03:00
Felipe Pena
6cd0e446dd - Value stored to var is never used 2012-08-19 12:55:38 -03:00
Xinchen Hui
212cfb95d1 more test script for #62328 2012-08-13 11:03:35 +08:00
Xinchen Hui
777b6679a4 missed the test script 2012-07-21 23:30:32 +08:00
Xinchen Hui
cc30524c89 Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance gives Segmentation fault) 2012-07-21 23:26:18 +08:00
Xinchen Hui
0c996613c0 Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance gives Segmentation fault) 2012-07-21 22:45:16 +08:00
Stanislav Malyshev
a5d45bae85 Fixed bug #61527 (Recursive/ArrayIterator gives misleading notice when array empty or moved to the end) 2012-07-14 22:34:28 -07:00
donnut
53ba768ed8 removed unneccesary arrat and ini settings 2012-07-14 19:22:03 -07:00
donnut
4539d799bb addition SplFileObject tests 2012-07-14 19:21:50 -07:00
donnut
2cb7a678a1 new tests from PHP TestFest June 2012 2012-07-14 19:21:34 -07:00
Anatoliy Belsky
86428169d3 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  reverted changes for #62477
 2012-07-12 10:57:26 +02:00
Anatoliy Belsky
ad7eeba3c1 reverted changes for #62477 2012-07-12 10:54:14 +02:00
Anatoliy Belsky
40f8010a13 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #62477 LimitIterator int overflow
 2012-07-11 22:29:45 +02:00
Anatoliy Belsky
b383ddf1e5 Fixed bug #62477 LimitIterator int overflow 2012-07-11 22:25:31 +02:00
Anatoliy Belsky
2032470e41 fixed #62433 test for win 2012-07-09 12:42:10 +02:00
Xinchen Hui
be4053cea0 Fixed bug #62433 (Inconsistent behavior of RecursiveDirectoryIterator to dot files). 2012-07-02 11:33:38 +08:00
Marc Easen
896ac689c9 Fixed the common misspelling of the word occurred (occured -> occurred) 2012-06-30 16:54:03 -07:00
Johannes Schlüter
b025b9d0cf Fix #62432 ReflectionMethod random corrupt memory on high concurrent 
This fixes the same issue in multiple extensions. This isn't needed
in later branches as 5.4 introduced object_properties_init()
 2012-06-27 23:26:33 +02:00
Nikita Popov
fed1f2d124 Fixed bug RecursiveArrayIterator does not implement Countable 
ArrayIterator implemented Countable only after it was already inherited by
RecursiveArrayIterator. Thus the interface was missing in RAI.
 2012-06-19 18:32:44 +02:00
Nikita Popov
cce4764f13 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug RecursiveArrayIterator does not implement Countable

Conflicts:
	ext/spl/spl_array.c
 2012-06-19 18:08:22 +02:00
Nikita Popov
4cba4c6193 Fixed bug RecursiveArrayIterator does not implement Countable 
ArrayIterator implemented Countable only after it was already inherited by
RecursiveArrayIterator. Thus the interface was missing in RAI.
 2012-06-19 18:04:14 +02:00
Xinchen Hui
a10da87c6a Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #62073 (Different ways of iterating over an SplMaxHeap result in different keys)
 2012-05-24 23:34:14 +08:00
Xinchen Hui
bde86a6639 Fixed bug #62073 
(Different ways of iterating over an SplMaxHeap result in in different keys)
 2012-05-24 23:31:05 +08:00
Reeze Xia
9205c4fd62 Fixed bug #62073 (Different ways of iterating over an SplMaxHeap result in different keys) 2012-05-23 20:42:06 +08:00
Anatoliy Belsky
adfb4c62b7 Fix bug 61671 ext\spl\tests\fileobject_003.phpt fails 
The solution was already introduced in 5.4 by Etienne Kneuss and
Pierre but wasn't merged back into 5.3 . SplFileObject should
not be used with directories. So just putting together all the
necessary pieces from 5.4
 2012-04-19 11:33:12 +02:00
Anatoliy Belsky
b2f2e1d6cc Fix bug #61659 Test ext\spl\tests\bug60082.phpt fails 2012-04-10 14:03:19 +02:00
Gustavo André dos Santos Lopes
593578c8c1 Merge branch '5.3' into 5.4 2012-03-28 13:06:05 +01:00
Gustavo André dos Santos Lopes
f07dd29fdc Fixed problem introduced in a763929 (fixing bug #61347). 
The test added in 8c44c85 should now pass.
 2012-03-28 13:04:41 +01:00
Shein Alexey
1b179545c2 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Added failing test for ArrayObject::offsetExists().
 2012-03-27 19:00:28 +05:00
Shein Alexey
ddac4688e8 Added failing test for ArrayObject::offsetExists(). 2012-03-27 18:59:04 +05:00
Gustavo André dos Santos Lopes
e018e2ae86 Merge branch '5.3' into 5.4 2012-03-23 22:14:36 +00:00
Gustavo André dos Santos Lopes
372801d94c Fixed tests that var_dump/print_r DOM objects. 2012-03-23 22:08:33 +00:00
Gustavo André dos Santos Lopes
0cf70b1a42 Merge branch '5.3' into 5.4 2012-03-23 11:32:20 +00:00