summaryrefslogtreecommitdiff
path: root/ext/spl
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch 'PHP-5.4'Stanislav Malyshev2012-07-1432-0/+651
|\ \ \ | |/ / | | | | | | | | | | | | | | | * PHP-5.4: removed unneccesary arrat and ini settings addition SplFileObject tests new tests from PHP TestFest June 2012
| * | removed unneccesary arrat and ini settingsdonnut2012-07-1411-31/+0
| | |
| * | addition SplFileObject testsdonnut2012-07-1416-0/+323
| | |
| * | new tests from PHP TestFest June 2012donnut2012-07-1416-0/+359
| | |
* | | Merge branch 'PHP-5.4'Anatoliy Belsky2012-07-124-45/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: reverted news about #62477 reverted changes for #62477 Conflicts: NEWS
| * | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-07-124-45/+2
| |\ \ | | |/ | | | | | | | | | * PHP-5.3: reverted changes for #62477
| | * reverted changes for #62477Anatoliy Belsky2012-07-124-45/+2
| | |
* | | Merge branch 'PHP-5.4'Anatoliy Belsky2012-07-114-2/+45
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Fixed bug #62477 LimitIterator int overflow
| * | Merge branch 'PHP-5.3' into PHP-5.4Anatoliy Belsky2012-07-114-2/+45
| |\ \ | | |/ | | | | | | | | | * PHP-5.3: Fixed bug #62477 LimitIterator int overflow
| | * Fixed bug #62477 LimitIterator int overflowAnatoliy Belsky2012-07-114-2/+45
| | |
| | * Fix #62432 ReflectionMethod random corrupt memory on high concurrentJohannes Schlüter2012-06-277-7/+7
| | | | | | | | | | | | | | | This fixes the same issue in multiple extensions. This isn't needed in later branches as 5.4 introduced object_properties_init()
| | * Fixed bug RecursiveArrayIterator does not implement CountableNikita Popov2012-06-192-3/+12
| | | | | | | | | | | | | | | ArrayIterator implemented Countable only after it was already inherited by RecursiveArrayIterator. Thus the interface was missing in RAI.
* | | Merge branch 'PHP-5.4'Anatoliy Belsky2012-07-091-4/+4
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: fixed #62433 test for win
| * | fixed #62433 test for winAnatoliy Belsky2012-07-091-4/+4
| | |
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-07-022-1/+20
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Fixed bug #62433 (Inconsistent behavior of RecursiveDirectoryIterator to dot files).
| * | Fixed bug #62433 (Inconsistent behavior of RecursiveDirectoryIterator to dot ↵Xinchen Hui2012-07-022-1/+20
| | | | | | | | | | | | files).
* | | Merge branch 'PHP-5.4'Stanislav Malyshev2012-06-301-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Fixed the common misspelling of the word occurred (occured -> occurred)
| * | Fixed the common misspelling of the word occurred (occured -> occurred)Marc Easen2012-06-301-1/+1
| | |
* | | Merge branch 'PHP-5.4'Nikita Popov2012-06-192-3/+12
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Fixed bug RecursiveArrayIterator does not implement Countable
| * | Merge branch 'PHP-5.3' into PHP-5.4Nikita Popov2012-06-192-3/+12
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.3: Fixed bug RecursiveArrayIterator does not implement Countable Conflicts: ext/spl/spl_array.c
| | * | Fixed bug RecursiveArrayIterator does not implement CountableNikita Popov2012-06-192-3/+12
| | | | | | | | | | | | | | | | | | | | ArrayIterator implemented Countable only after it was already inherited by RecursiveArrayIterator. Thus the interface was missing in RAI.
* | | | Merge remote-tracking branch 'origin/PHP-5.4'Xinchen Hui2012-05-245-213/+235
|\ \ \ \ | |/ / / | | | | | | | | | | | | * origin/PHP-5.4: Fixed bug #62073 (Different ways of iterating over an SplMaxHeap result in different keys)
| * | | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-05-245-213/+235
| |\ \ \ | | | |/ | | |/| | | | | | | | | * PHP-5.3: Fixed bug #62073 (Different ways of iterating over an SplMaxHeap result in different keys)
| | * | Fixed bug #62073Xinchen Hui2012-05-245-213/+235
| | |\ \ | | | |/ | | |/| | | | | (Different ways of iterating over an SplMaxHeap result in in different keys)
| | | * Fixed bug #62073 (Different ways of iterating over an SplMaxHeap result in ↵Reeze Xia2012-05-235-213/+237
| | |/ | | | | | | | | | different keys)
| | * Fix bug 61671 ext\spl\tests\fileobject_003.phpt failsAnatoliy Belsky2012-04-194-35/+43
| | | | | | | | | | | | | | | | | | | | | 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
| | * Fix bug #61659 Test ext\spl\tests\bug60082.phpt failsAnatoliy Belsky2012-04-101-0/+2
| | |
* | | Merge branch '5.4'Gustavo André dos Santos Lopes2012-03-281-1/+1
|\ \ \ | |/ /
| * | Merge branch '5.3' into 5.4Gustavo André dos Santos Lopes2012-03-281-1/+1
| |\ \ | | |/
| | * Fixed problem introduced in a763929 (fixing bug #61347).Gustavo André dos Santos Lopes2012-03-281-1/+1
| | | | | | | | | | | | The test added in 8c44c85 should now pass.
* | | Merge branch 'PHP-5.4'Shein Alexey2012-03-271-0/+10
|\ \ \ | |/ / | | | | | | | | | * PHP-5.4: Added failing test for ArrayObject::offsetExists().
| * | Merge branch 'PHP-5.3' into PHP-5.4Shein Alexey2012-03-271-0/+10
| |\ \ | | |/ | | | | | | | | | * PHP-5.3: Added failing test for ArrayObject::offsetExists().
| | * Added failing test for ArrayObject::offsetExists().Shein Alexey2012-03-271-0/+10
| | |
* | | Merge branch '5.4'Gustavo André dos Santos Lopes2012-03-231-18/+6
|\ \ \ | |/ /
| * | Merge branch '5.3' into 5.4Gustavo André dos Santos Lopes2012-03-231-18/+6
| |\ \ | | |/
| | * Fixed tests that var_dump/print_r DOM objects.Gustavo André dos Santos Lopes2012-03-231-18/+6
| | |
* | | Merge branch '5.4'Gustavo André dos Santos Lopes2012-03-232-20/+63
|\ \ \ | |/ /
| * | Merge branch '5.3' into 5.4Gustavo André dos Santos Lopes2012-03-232-20/+63
| |\ \ | | |/
| | * Fixed bug #61482, caused by the fix to bug #61418.Gustavo André dos Santos Lopes2012-03-231-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
| | * Revert "Revert "- Fixed bug #61418 (Segmentation fault when ↵Gustavo André dos Santos Lopes2012-03-232-15/+55
| | | | | | | | | | | | | | | | | | DirectoryIterator's or" - causes bug #61482" This reverts commit a89c4a34ee55686ab1430a5060e1460335fc5203.
* | | Merge branch 'PHP-5.4'Stanislav Malyshev2012-03-222-55/+15
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-5.4: Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or" - causes bug #61482 update for git
| * | Merge branch 'PHP-5.3' into PHP-5.4Stanislav Malyshev2012-03-222-55/+15
| |\ \ | | |/ | | | | | | | | | | | | | | | * 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
| | * Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or" ↵Stanislav Malyshev2012-03-222-55/+15
| | | | | | | | | | | | | | | | | | - causes bug #61482 This reverts commit 714f1ff4b37c5101b3c61ea108a3d415f41e50df.
| | * Revert "Fixed reference counting"Dmitry Stogov2012-03-221-2/+2
| | | | | | | | | | | | This reverts commit 14af1fe6923c65a91cd77eab5a8d4326f854391d.
| | * Fixed reference countingDmitry Stogov2012-03-221-2/+2
| | |
| | * - Fixed bug #61418 (Segmentation fault when DirectoryIterator's orGustavo André dos Santos Lopes2012-03-182-15/+55
| | | | | | | | | | | | | | | | | | FilesystemIterator's iterators are requested more than once without having had its dtor callback called in between).
| | * - Fixed memory leak when calling SplFileInfo's constructor twiceFelipe Pena2012-03-112-1/+19
| | |
| | * Fix testXinchen Hui2012-03-111-0/+2
| | |
| | * Fixed bug #61347 (inconsist isset behavior of Arrayobject)Xinchen Hui2012-03-112-39/+76
| | |
| | * - Fixed bug #61326 (ArrayObject comparison).Gustavo André dos Santos Lopes2012-03-102-0/+43
| | |
View Lorry Controller Status