[PHP-CVS] cvs: php-src /main/streams streams.c

[Marcus Boerger]

helly           Tue Nov  6 10:54:30 2007 UTC

  Modified files:              
    /php-src/main/streams       streams.c 
  Log:
  - MFB ws
  
http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.153&r2=1.154&diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.153 
php-src/main/streams/streams.c:1.154
--- php-src/main/streams/streams.c:1.153        Wed Jul 11 14:32:54 2007
+++ php-src/main/streams/streams.c      Tue Nov  6 10:54:29 2007
@@ -19,7 +19,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: streams.c,v 1.153 2007/07/11 14:32:54 dmitry Exp $ */
+/* $Id: streams.c,v 1.154 2007/11/06 10:54:29 helly Exp $ */
 
 #define _GNU_SOURCE
 #include "php.h"
@@ -1450,12 +1450,13 @@
                                break;
                        case SEEK_SET:
                                if (offset > stream->position &&
-                                       offset < stream->position + 
stream->writepos - stream->readpos) {
+                                               offset < stream->position + 
stream->writepos - stream->readpos) {
                                        stream->readpos += offset - 
stream->position;
                                        stream->position = offset;
                                        stream->eof = 0;
                                        return 0;
                                }
+                               break;
                }
        }
 
@@ -2078,7 +2079,7 @@
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Use of \"zlib:\" 
wrapper is deprecated; please use \"compress.zlib://\" instead");
        }
 
-       if (protocol)   {
+       if (protocol) {
                char *tmp = estrndup(protocol, n);
                if (FAILURE == zend_hash_find(wrapper_hash, (char*)tmp, n + 1, 
(void**)&wrapperpp)) {
                        php_strtolower(tmp, n);

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