wez             Sat Nov 29 15:48:50 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src/ext/standard       basic_functions.c 
  Log:
  Fix:
  #26467 flock does not force wouldblock argument to be passed by reference
  Thanks to Manuel Lemos
  
  
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.543.2.26 
php-src/ext/standard/basic_functions.c:1.543.2.27
--- php-src/ext/standard/basic_functions.c:1.543.2.26   Sun Nov  9 23:12:50 2003
+++ php-src/ext/standard/basic_functions.c      Sat Nov 29 15:48:49 2003
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: basic_functions.c,v 1.543.2.26 2003/11/10 04:12:50 iliaa Exp $ */
+/* $Id: basic_functions.c,v 1.543.2.27 2003/11/29 20:48:49 wez Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -655,7 +655,7 @@
        PHP_FE(stream_filter_prepend,                                                  
                                 NULL)
        PHP_FE(stream_filter_append,                                                   
                                 NULL)
        PHP_FE(fgetcsv,                                                                
                                                 NULL)
-       PHP_FE(flock,                                                                  
                                                 NULL)
+       PHP_FE(flock,                                                                  
                  third_arg_force_ref)
        PHP_FE(get_meta_tags,                                                          
                                         NULL)
        PHP_FE(stream_set_write_buffer,                                                
                                 NULL)
        PHP_FALIAS(set_file_buffer, stream_set_write_buffer,                           
         NULL)

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

Reply via email to