felipe          Tue Jan 20 15:43:08 2009 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/zlib   zlib_fopen_wrapper.c 
    /php-src    NEWS 
  Log:
  - MFH: Fixed bug #47152 (gzseek/fseek using SEEK_END produces strange results)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/zlib_fopen_wrapper.c?r1=1.46.2.1.2.6&r2=1.46.2.1.2.7&diff_format=u
Index: php-src/ext/zlib/zlib_fopen_wrapper.c
diff -u php-src/ext/zlib/zlib_fopen_wrapper.c:1.46.2.1.2.6 
php-src/ext/zlib/zlib_fopen_wrapper.c:1.46.2.1.2.7
--- php-src/ext/zlib/zlib_fopen_wrapper.c:1.46.2.1.2.6  Wed Dec 31 11:17:47 2008
+++ php-src/ext/zlib/zlib_fopen_wrapper.c       Tue Jan 20 15:43:05 2009
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: zlib_fopen_wrapper.c,v 1.46.2.1.2.6 2008/12/31 11:17:47 sebastian Exp 
$ */
+/* $Id: zlib_fopen_wrapper.c,v 1.46.2.1.2.7 2009/01/20 15:43:05 felipe Exp $ */
 
 #define _GNU_SOURCE
 
@@ -60,6 +60,10 @@
 
        assert(self != NULL);
 
+       if (whence == SEEK_END) {
+               php_error_docref(NULL TSRMLS_CC, E_WARNING, "SEEK_END is not 
supported");
+               return -1;
+       }
        *newoffs = gzseek(self->gz_file, offset, whence);
 
        return (*newoffs < 0) ? -1 : 0;
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1397&r2=1.2027.2.547.2.1398&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1397 php-src/NEWS:1.2027.2.547.2.1398
--- php-src/NEWS:1.2027.2.547.2.1397    Mon Jan 19 21:57:46 2009
+++ php-src/NEWS        Tue Jan 20 15:43:06 2009
@@ -17,6 +17,8 @@
 - Fixed bug in xml_error_string() which resulted in messages being
   off by one. (Scott)
 
+- Fixed bug #47152 (gzseek/fseek using SEEK_END produces strange results).
+  (Felipe)
 - Fixed bug #47131 (SOAP Extension ignores "user_agent" ini setting). (Ilia)
 - Fixed bug #47104 (Linking shared extensions fails with icc). (Jani)
 - Fixed bug #47109 (Memory leak on $a->{"a"."b"} when $a is not an object).



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

Reply via email to