bjori                                    Fri, 30 Sep 2011 14:17:23 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=317501

Log:
Fixed bug #55807 (Wrong value for splFileObject::SKIP_EMPTY)

Bug: https://bugs.php.net/55807 (Assigned) Wrong value for 
splFileObject::SKIP_EMPTY
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/NEWS
    U   php/php-src/branches/PHP_5_3/ext/spl/spl_directory.h
    U   php/php-src/branches/PHP_5_4/NEWS
    U   php/php-src/branches/PHP_5_4/ext/spl/spl_directory.h
    U   php/php-src/trunk/ext/spl/spl_directory.h

Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS   2011-09-30 14:15:49 UTC (rev 317500)
+++ php/php-src/branches/PHP_5_3/NEWS   2011-09-30 14:17:23 UTC (rev 317501)
@@ -87,6 +87,10 @@
   . Fixed bug #55674 (fgetcsv & str_getcsv skip empty fields in some 
tab-separated
     records). (Laruence)

+- SPL:
+  . Fixed bug #55807 (Wrong value for splFileObject::SKIP_EMPTY).
+    (jgotti at modedemploi dot fr, Hannes)
+
 23 Aug 2011, PHP 5.3.8

 - Core:

Modified: php/php-src/branches/PHP_5_3/ext/spl/spl_directory.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/spl/spl_directory.h        2011-09-30 
14:15:49 UTC (rev 317500)
+++ php/php-src/branches/PHP_5_3/ext/spl/spl_directory.h        2011-09-30 
14:17:23 UTC (rev 317501)
@@ -117,7 +117,7 @@

 #define SPL_FILE_OBJECT_DROP_NEW_LINE      0x00000001 /* drop new lines */
 #define SPL_FILE_OBJECT_READ_AHEAD         0x00000002 /* read on rewind/next */
-#define SPL_FILE_OBJECT_SKIP_EMPTY         0x00000006 /* skip empty lines */
+#define SPL_FILE_OBJECT_SKIP_EMPTY         0x00000004 /* skip empty lines */
 #define SPL_FILE_OBJECT_READ_CSV           0x00000008 /* read via fgetcsv */
 #define SPL_FILE_OBJECT_MASK               0x0000000F /* read via fgetcsv */


Modified: php/php-src/branches/PHP_5_4/NEWS
===================================================================
--- php/php-src/branches/PHP_5_4/NEWS   2011-09-30 14:15:49 UTC (rev 317500)
+++ php/php-src/branches/PHP_5_4/NEWS   2011-09-30 14:17:23 UTC (rev 317501)
@@ -20,6 +20,8 @@
 - SPL:
   . FilesystemIterator, GlobIterator and (Recursive)DirectoryIterator now use
     the default stream context. (Hannes)
+  . Fixed bug #55807 (Wrong value for splFileObject::SKIP_EMPTY).
+    (jgotti at modedemploi dot fr, Hannes)

 - CLI SAPI:
   . Fixed bug #55726 (Changing the working directory makes router script

Modified: php/php-src/branches/PHP_5_4/ext/spl/spl_directory.h
===================================================================
--- php/php-src/branches/PHP_5_4/ext/spl/spl_directory.h        2011-09-30 
14:15:49 UTC (rev 317500)
+++ php/php-src/branches/PHP_5_4/ext/spl/spl_directory.h        2011-09-30 
14:17:23 UTC (rev 317501)
@@ -117,7 +117,7 @@

 #define SPL_FILE_OBJECT_DROP_NEW_LINE      0x00000001 /* drop new lines */
 #define SPL_FILE_OBJECT_READ_AHEAD         0x00000002 /* read on rewind/next */
-#define SPL_FILE_OBJECT_SKIP_EMPTY         0x00000006 /* skip empty lines */
+#define SPL_FILE_OBJECT_SKIP_EMPTY         0x00000004 /* skip empty lines */
 #define SPL_FILE_OBJECT_READ_CSV           0x00000008 /* read via fgetcsv */
 #define SPL_FILE_OBJECT_MASK               0x0000000F /* read via fgetcsv */


Modified: php/php-src/trunk/ext/spl/spl_directory.h
===================================================================
--- php/php-src/trunk/ext/spl/spl_directory.h   2011-09-30 14:15:49 UTC (rev 
317500)
+++ php/php-src/trunk/ext/spl/spl_directory.h   2011-09-30 14:17:23 UTC (rev 
317501)
@@ -117,7 +117,7 @@

 #define SPL_FILE_OBJECT_DROP_NEW_LINE      0x00000001 /* drop new lines */
 #define SPL_FILE_OBJECT_READ_AHEAD         0x00000002 /* read on rewind/next */
-#define SPL_FILE_OBJECT_SKIP_EMPTY         0x00000006 /* skip empty lines */
+#define SPL_FILE_OBJECT_SKIP_EMPTY         0x00000004 /* skip empty lines */
 #define SPL_FILE_OBJECT_READ_CSV           0x00000008 /* read via fgetcsv */
 #define SPL_FILE_OBJECT_MASK               0x0000000F /* read via fgetcsv */


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to