pajoye Sat Feb 24 18:59:37 2007 UTC Modified files: /php-src/ext/zip/lib zip_open.c zip_close.c zip_source_file.c Log: - merge from pecl: Force binary mode on windows http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_open.c?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/zip/lib/zip_open.c diff -u php-src/ext/zip/lib/zip_open.c:1.3 php-src/ext/zip/lib/zip_open.c:1.4 --- php-src/ext/zip/lib/zip_open.c:1.3 Mon Jan 1 09:29:34 2007 +++ php-src/ext/zip/lib/zip_open.c Sat Feb 24 18:59:37 2007 @@ -100,7 +100,6 @@ return NULL; } - /* ZIP_CREATE gets ignored if file exists and not ZIP_EXCL, just like open() */ if ((fp=fopen(fn, "rb")) == NULL) { @@ -108,6 +107,10 @@ return NULL; } +#ifdef PHP_WIN32 + _setmode(_fileno(fp), _O_BINARY ); +#endif + clearerr(fp); fseek(fp, 0, SEEK_END); len = ftell(fp); http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_close.c?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/zip/lib/zip_close.c diff -u php-src/ext/zip/lib/zip_close.c:1.5 php-src/ext/zip/lib/zip_close.c:1.6 --- php-src/ext/zip/lib/zip_close.c:1.5 Sat Feb 24 18:50:53 2007 +++ php-src/ext/zip/lib/zip_close.c Sat Feb 24 18:59:37 2007 @@ -56,8 +56,6 @@ static int _zip_changed(struct zip *, int *); static char *_zip_create_temp_output(struct zip *, FILE **); - - int zip_close(struct zip *za) { @@ -550,6 +548,9 @@ free(temp); return NULL; } +#ifdef PHP_WIN32 + _setmode(_fileno(tfp), _O_BINARY ); +#endif *outp = tfp; return temp; http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_source_file.c?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/zip/lib/zip_source_file.c diff -u php-src/ext/zip/lib/zip_source_file.c:1.1 php-src/ext/zip/lib/zip_source_file.c:1.2 --- php-src/ext/zip/lib/zip_source_file.c:1.1 Mon Jul 24 16:58:58 2006 +++ php-src/ext/zip/lib/zip_source_file.c Sat Feb 24 18:59:37 2007 @@ -62,6 +62,10 @@ return NULL; } +#ifdef PHP_WIN32 + _setmode(_fileno(fp), _O_BINARY ); +#endif + if ((zs=zip_source_filep(za, fp, start, len)) == NULL) { fclose(fp); return NULL;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php