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
71,252 Commits 493 Branches 1,366 Tags 848 MiB
a15459b291
Commit Graph

1216 Commits

Author SHA1 Message Date
Xinchen Hui
a580405f38 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance gives Segmentation fault)
 2012-07-21 22:46:14 +08:00
Xinchen Hui
0c996613c0 Fixed bug #62616 (ArrayIterator::count() from IteratorIterator instance gives Segmentation fault) 2012-07-21 22:45:16 +08:00
Xinchen Hui
8238c6a4c8 test script for bug #61697 2012-07-18 19:19:31 +08:00
Stanislav Malyshev
e84c5be631 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #61527 (Recursive/ArrayIterator gives misleading notice when array empty or moved to the end)
 2012-07-14 22:35:47 -07: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
Stanislav Malyshev
455f3de802 Merge branch 'PHP-5.4' 
* PHP-5.4:
  removed unneccesary arrat and ini settings
  addition SplFileObject tests
  new tests from PHP TestFest June 2012
 2012-07-14 19:25:16 -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
ed1f5b4dae Merge branch 'PHP-5.4' 
* PHP-5.4:
  reverted news about #62477
  reverted changes for #62477

Conflicts:
	NEWS
 2012-07-12 11:02:33 +02: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
b530d6d790 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #62477 LimitIterator int overflow
 2012-07-11 22:30:40 +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
f76bb14814 Merge branch 'PHP-5.4' 
* PHP-5.4:
  fixed #62433 test for win
 2012-07-09 12:45:56 +02:00
Anatoliy Belsky
2032470e41 fixed #62433 test for win 2012-07-09 12:42:10 +02:00
Xinchen Hui
8d81a03e43 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug #62433 (Inconsistent behavior of RecursiveDirectoryIterator to dot files).
 2012-07-02 11:34:33 +08:00
Xinchen Hui
be4053cea0 Fixed bug #62433 (Inconsistent behavior of RecursiveDirectoryIterator to dot files). 2012-07-02 11:33:38 +08:00
Stanislav Malyshev
a3322f8927 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed the common misspelling of the word occurred (occured -> occurred)
 2012-06-30 17:00:25 -07: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
12b252e1dd Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fixed bug RecursiveArrayIterator does not implement Countable
 2012-06-19 18:13:14 +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
7c297ca31e Merge remote-tracking branch 'origin/PHP-5.4' 
* origin/PHP-5.4:
  Fixed bug #62073 (Different ways of iterating over an SplMaxHeap result in different keys)
 2012-05-24 23:38:53 +08: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
e6b23547c1 Merge branch '5.4' 2012-03-28 13:06:36 +01: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
dda95b794c Merge branch 'PHP-5.4' 
* PHP-5.4:
  Added failing test for ArrayObject::offsetExists().
 2012-03-27 19:02:01 +05: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
30642380de Merge branch '5.4' 2012-03-23 22:14:56 +00: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
8609338a03 Merge branch '5.4' 2012-03-23 11:32:43 +00:00
Gustavo André dos Santos Lopes
0cf70b1a42 Merge branch '5.3' into 5.4 2012-03-23 11:32:20 +00:00
Gustavo André dos Santos Lopes
3960def881 Fixed bug #61482, caused by the fix to bug #61418. 
Turns out I'd forgotten to also update the destructor for the iterator
returned by DirectoryIterator.
The iterator for DirectoryIterator maintains the same ->current pointer
throughout its existence (the DirectoryIterator itself) and returns it
(the same object) everytime a value is requested from the iterator.
Moving forward the iterator only changes the object. Previous code
added two references to the object in get_iterator on the account of
1) the iterator memory living in its DirectoryIterator object and
2) the object being stored in iterator->current. This seems to be
unnecessary. Iterators are not responsible for incrementing the refcount
of the values they yield, that's up to the caller (the engine). What
matters for the iterator is that the object exists as long as the
iterator exists and this can be guaranteed by incremented the refcount
only once. Consequently, I only add one reference in get_iterator
(and reclaim it in the iterator destructor).
 2012-03-23 11:19:19 +00:00
Gustavo André dos Santos Lopes
85725337d5 Revert "Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or" - causes bug #61482" 
This reverts commit a89c4a34ee.
 2012-03-23 09:40:27 +00:00
Stanislav Malyshev
2e19cccad7 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or" - causes bug #61482
  update for git
 2012-03-22 22:31:10 -07:00
Stanislav Malyshev
bcc15b5633 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or" - causes bug #61482
  Add initialization tests for SQLT_INT binds
  Fix NEWS
 2012-03-22 22:30:51 -07:00
Stanislav Malyshev
a89c4a34ee Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or" - causes bug #61482 
This reverts commit 714f1ff4b3.
 2012-03-22 22:29:50 -07:00
Dmitry Stogov
dd33437eee Revert "Fixed reference counting" 
This reverts commit 752fec88ef.
 2012-03-22 15:52:32 +04:00
Dmitry Stogov
672fe54a00 Revert "Fixed reference counting" 
This reverts commit 14af1fe692.
 2012-03-22 15:51:58 +04:00