[PHP-CVS-DAILY] cvs: php-src / ChangeLog

2005-06-12 Thread changelog
changelog   Mon Jun 13 01:32:01 2005 EDT

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/diff.php/php-src/ChangeLog?r1=1.2012r2=1.2013ty=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.2012 php-src/ChangeLog:1.2013
--- php-src/ChangeLog:1.2012Sun Jun 12 01:40:01 2005
+++ php-src/ChangeLog   Mon Jun 13 01:32:00 2005
@@ -1,3 +1,20 @@
+2005-06-12  Ilia Alshanetsky  [EMAIL PROTECTED]
+
+* ext/standard/user_filters.c:
+  Removed unused var.
+
+2005-06-12  Hartmut Holzgraefe  [EMAIL PROTECTED]
+
+* ext/standard/dir.c:
+  Support for GLOB_ERR so that glob() reports permission problems (Bug
+  #28355)
+
+* ext/standard/dir.c:
+  thinko fix (E_COMMIT_AFTER_MIDNIGHT)
+
+* ext/standard/dir.c:
+  Removed bogus fix for bug #28355 (it was dead code anyway)
+
 2005-06-11  Jani Taskinen  [EMAIL PROTECTED]
 
 * (PHP_4_4)
@@ -4206,7 +4223,7 @@
 
 * (PHP_4_3)
   ext/standard/url_scanner_ex.re:
-  Missing $Id: ChangeLog,v 1.2012 2005/06/12 05:40:01 changelog Exp $ tag
+  Missing $Id: ChangeLog,v 1.2013 2005/06/13 05:32:00 changelog Exp $ tag
 
 * (PHP_5_0)
   ext/standard/url_scanner_ex.c:
@@ -7607,7 +7624,7 @@
   ext/session/mod_mm.h
   ext/session/mod_user.h
   ext/session/php_session.h:
-  - Missing $Id: ChangeLog,v 1.2012 2005/06/12 05:40:01 changelog Exp $ 
tags
+  - Missing $Id: ChangeLog,v 1.2013 2005/06/13 05:32:00 changelog Exp $ 
tags
 
 * (PHP_4_3)
   ext/session/session.c:
@@ -8088,7 +8105,7 @@
 
 * (PHP_4_3)
   Zend/zend_ini_scanner.l:
-  Missing $Id: ChangeLog,v 1.2012 2005/06/12 05:40:01 changelog Exp $ tag 
+ ws fix
+  Missing $Id: ChangeLog,v 1.2013 2005/06/13 05:32:00 changelog Exp $ tag 
+ ws fix
 
 * ZendEngine2/zend_ini_scanner.l
   ZendEngine2/zend_ini_scanner.l:
@@ -9562,7 +9579,7 @@
   ext/standard/url_scanner_ex.c
   ext/standard/url_scanner_ex.h
   ext/standard/url_scanner_ex.re:
-  Missing $Id: ChangeLog,v 1.2012 2005/06/12 05:40:01 changelog Exp $ tag
+  Missing $Id: ChangeLog,v 1.2013 2005/06/13 05:32:00 changelog Exp $ tag
 
 * ext/standard/credits_ext.h
   ext/standard/credits_sapi.h:


[PHP-CVS] cvs: php-src /ext/standard dir.c

2005-06-12 Thread Hartmut Holzgraefe
hholzgraSun Jun 12 03:53:25 2005 EDT

  Modified files:  
/php-src/ext/standard   dir.c 
  Log:
  Support for GLOB_ERR so that glob() reports permission problems (Bug #28355)
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/dir.c?r1=1.145r2=1.146ty=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.145 php-src/ext/standard/dir.c:1.146
--- php-src/ext/standard/dir.c:1.145Sat Jun 11 21:13:24 2005
+++ php-src/ext/standard/dir.c  Sun Jun 12 03:53:24 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: dir.c,v 1.145 2005/06/12 01:13:24 hholzgra Exp $ */
+/* $Id: dir.c,v 1.146 2005/06/12 07:53:24 hholzgra Exp $ */
 
 /* {{{ includes/startup/misc */
 
@@ -155,6 +155,9 @@
 #ifdef GLOB_NOESCAPE
REGISTER_LONG_CONSTANT(GLOB_NOESCAPE, GLOB_NOESCAPE, CONST_CS | 
CONST_PERSISTENT);
 #endif
+#ifdef GLOB_ERR
+   REGISTER_LONG_CONSTANT(GLOB_ERR, GLOB_ERR, CONST_CS | 
CONST_PERSISTENT);
+#endif
 
 #ifndef GLOB_ONLYDIR
 #define GLOB_ONLYDIR (130)
@@ -395,10 +398,14 @@
if (0 != (ret = glob(pattern, flags  GLOB_FLAGMASK, NULL, globbuf))) {
 #ifdef GLOB_NOMATCH
if (GLOB_NOMATCH == ret) {
-   /* Linux handles no matches as an error condition, but 
FreeBSD
-* doesn't. This ensure that if no match is found, an 
empty array
-* is always returned so it can be used without 
worrying in e.g.
-* foreach() */
+   /* Some glob implementation simply return no data if no 
matches
+  were found, others return the GLOB_NOMATCH error 
code.
+  We don't want to treat GLOB_NOMATCH as an error 
condition
+  so that PHP glob() behaves the same on both types of 
+  implementations and so that 'foreach (glob() as ...'
+  can be used for simple glob() calls without further 
error
+  checking.
+   */
array_init(return_value);
return;
}
@@ -424,7 +431,7 @@
 
array_init(return_value);
for (n = 0; n  globbuf.gl_pathc; n++) {
-   /* we need to this everytime since GLOB_ONLYDIR does not 
guarantee that
+   /* we need to do this everytime since GLOB_ONLYDIR does not 
guarantee that
 * all directories will be filtered. GNU libc documentation 
states the
 * following: 
 * If the information about the type of the file is easily 
available 

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



[PHP-CVS] cvs: php-src /ext/standard user_filters.c

2005-06-12 Thread Ilia Alshanetsky
iliaa   Sun Jun 12 13:07:21 2005 EDT

  Modified files:  
/php-src/ext/standard   user_filters.c 
  Log:
  Removed unused var.
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/user_filters.c?r1=1.29r2=1.30ty=u
Index: php-src/ext/standard/user_filters.c
diff -u php-src/ext/standard/user_filters.c:1.29 
php-src/ext/standard/user_filters.c:1.30
--- php-src/ext/standard/user_filters.c:1.29Thu Jun  9 04:19:30 2005
+++ php-src/ext/standard/user_filters.c Sun Jun 12 13:07:20 2005
@@ -18,7 +18,7 @@
+--+
 */
 
-/* $Id: user_filters.c,v 1.29 2005/06/09 08:19:30 dmitry Exp $ */
+/* $Id: user_filters.c,v 1.30 2005/06/12 17:07:20 iliaa Exp $ */
 
 #include php.h
 #include php_globals.h
@@ -116,7 +116,6 @@
zval *obj = (zval*)thisfilter-abstract;
zval func_name;
zval *retval = NULL;
-   zval **tmp; 
 
if (obj == NULL) {
/* If there's no object associated then there's nothing to 
dispose of */

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