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
71,102 Commits 494 Branches 1,367 Tags 807 MiB
99e48d3a57
Commit Graph

212 Commits

Author SHA1 Message Date
Xinchen Hui
be4053cea0 Fixed bug #62433 (Inconsistent behavior of RecursiveDirectoryIterator to dot files). 2012-07-02 11:33:38 +08: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
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
672fe54a00 Revert "Fixed reference counting" 
This reverts commit 14af1fe692.
 2012-03-22 15:51:58 +04:00
Dmitry Stogov
14af1fe692 Fixed reference counting 2012-03-22 15:03:16 +04:00
Joshua Thijssen
91f2d3809e Issue-60742: Added FilesystemIterator::OTHER_MODE_MASK 2012-03-19 21:48:55 +01:00
Gustavo André dos Santos Lopes
d870a41118 - Fixed bug #61418 (Segmentation fault when DirectoryIterator's or 
FilesystemIterator's iterators are requested more than once without
  having had its dtor callback called in between).
 2012-03-18 15:07:20 +00:00
Gustavo André dos Santos Lopes
714f1ff4b3 - Fixed bug #61418 (Segmentation fault when DirectoryIterator's or 
FilesystemIterator's iterators are requested more than once without
  having had its dtor callback called in between).
 2012-03-18 15:07:20 +00:00
Felipe Pena
af2fc625df - Fixed memory leak when calling SplFileInfo's constructor twice 2012-03-11 15:42:57 +00:00
Felipe Pena
80cb6e56f6 - Fixed memory leak when calling SplFileInfo's constructor twice 2012-03-11 15:42:57 +00:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
c1e510aea8 - Fixed bug #60261 (phar dos null pointer) 2011-11-11 21:39:11 +00:00
Felipe Pena
72a133f155 - Fixed bug #60261 (phar dos null pointer) 2011-11-11 21:39:11 +00:00
Peter Cowburn
9b86852d6e add 3rd parameter to arg info for splfileobject fgetcsv/setcsvcontrol (bug #60201) 2011-11-02 13:24:46 +00:00
Gustavo André dos Santos Lopes
32f7337bd4 - Reverted changes that required constructor overrides to invoke the parent 
constructor in several SPL classes and applied 5.3 fixes instead.
  Related bugs: #54384, #55175 and #55300
 2011-10-29 23:17:18 +00:00
Hannes Magnusson
3dabada846 Use the default stream context for FilesystemIterator, GlobIterator and (Recursive)DirectoryIterator 2011-09-30 14:12:26 +00:00
Pierre Joye
7a3d89a9aa - nuke unused var 2011-09-09 07:57:29 +00:00
Pierre Joye
2d9f758435 - improve r316420, function must return a value 2011-09-09 07:56:42 +00:00
Pierre Joye
de12ac023c - improve r316420 (SplFileObject cannot and should not accept directories) 2011-09-08 23:12:32 +00:00
Etienne Kneuss
1e04e19a37 MFH: adapt check for __construct bypass 2011-09-08 23:10:40 +00:00
Pierre Joye
38c698c062 - improve r316420 (SplFileObject cannot and should not accept directories) 2011-09-08 23:07:48 +00:00
Etienne Kneuss
5cc7663098 SplFileObject does not accept directories. It did not check for that and blindly opened the directory, which works on linux but fails on windows. Now SplFileObject uses a stat() call to make sure it isn't a directory, if it is, it fails with an exception. Tests have been changed accordingly. 2011-09-08 15:52:59 +00:00
Etienne Kneuss
cf2db20123 Fix CID 547, make static analyzer happy 2011-08-12 21:57:54 +00:00
Pierre Joye
5107df2d04 - use cwd_expand now 2011-07-26 07:30:41 +00:00
Felipe Pena
23e438594d - Make usage of new PHP_FE_END macro 2011-07-25 11:42:53 +00:00
Felipe Pena
4b30846b50 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Pierre Joye
9805e1674a - remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ 2011-07-22 11:25:30 +00:00
Felipe Pena
32b5f8a1a3 - Added new parameter parsing option (p - for valid path (string without null byte in the middle)) 
# The tests will be fixed in the next commits
 2011-06-06 21:28:16 +00:00
Gustavo André dos Santos Lopes
cd2cdd256a - Make SplFileInfo::_bad_state_ex final. 2011-04-05 08:38:09 +00:00
Gustavo André dos Santos Lopes
2975308e1a - Fixed bug #54384 (Dual iterators, GlobIterator, SplFileObject and 
SplTempFileObject crash when user-space classes don't call the paren
  constructor).
 2011-04-04 02:50:27 +00:00
Gustavo André dos Santos Lopes
f7b7b6aa9e - Improved upon r309729. 
- Extented strategy to remaining the classes on spl_directory.c, even those that don't crash.
- UPGRADING.
- Better bug54384.phpt, with all the classes covered.
 2011-03-27 22:44:34 +00:00
Gustavo André dos Santos Lopes
c2fe893985 - Fixed bug #54384: Several SPL classes crash when parent constructor is 
not called.
#Merge to 5.3 pending (slight BC break on AppendIterator, as it's no
#longer possible to defer the call to the parent constructor until
#after the constructor is performed).
#Bugs fixed in an atypical way for SPL. The parent constructor call
#check is performed at construction time by using a wrapper constructor
#instead of a check on the beginning of each instance method.
#Perhaps this should be uniformized in trunk; this method was mainly
#applied only to the ones crashing, except a few iterators (at least
#AppendIterator and RecursiveIteratorIterator).
 2011-03-27 04:21:06 +00:00
Felipe Pena
39e0aa4dc6 - Fixed bug #54292 (Wrong parameter causes crash in SplFileObject::__construct()) 2011-03-23 22:46:04 +00:00
Felipe Pena
0ab7f1cebf - Fixed bug #54292 (Wrong parameter causes crash in SplFileObject::__construct()) 2011-03-23 22:46:04 +00:00
Gustavo André dos Santos Lopes
f06e3ba5c1 - Fixed bug #54291 (Crash iterating DirectoryIterator for dir name starting 
with \0).
 2011-03-19 23:15:04 +00:00
Gustavo André dos Santos Lopes
8deb11c0c3 - Fixed bug #54291 (Crash iterating DirectoryIterator for dir name starting 
with \0).
 2011-03-19 23:15:04 +00:00
Felipe Pena
67fa13a3ca - Fixed bug #49608 (Using CachingIterator on DirectoryIterator instance segfaults) 2011-03-08 19:56:29 +00:00
Felipe Pena
c7e7de3485 - Fixed bug #49608 (Using CachingIterator on DirectoryIterator instance segfaults) 2011-03-08 19:56:29 +00:00
Felipe Pena
54a7e5d7c3 - Fixed memory leak in DirectoryIterator::getExtension() and SplFileInfo::getExtension() 2011-02-20 16:33:53 +00:00
Felipe Pena
a47eb9a4d6 - Fixed memory leak in DirectoryIterator::getExtension() and SplFileInfo::getExtension() 2011-02-20 16:33:53 +00:00
Peter Cowburn
14c6cc5b7f MFH - Added SplFileInfo::getExtension() (FR #48767) 2011-02-11 22:07:22 +00:00
Adam Harvey
6bc25ca285 Fix bug #53914 (SPL assumes HAVE_GLOB is defined). Original patch by Chris 
Jones; test updates by myself.
 2011-02-04 10:49:49 +00:00
Adam Harvey
a7d4b80ca2 Fix bug #53914 (SPL assumes HAVE_GLOB is defined). Original patch by Chris 
Jones; test updates by myself.
 2011-02-04 10:49:49 +00:00
Felipe Pena
927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Peter Cowburn
064a254483 Implemented FR #48767 (SplFileInfo::getExtension()) 2010-12-23 22:32:52 +00:00