cvs: php4 /ext/standard file.c

stas Tue Dec 12 09:42:53 2000 EDT Modified files: /php4/ext/standard file.c Log: Open files in binary mode - should fix readfile() on Windows Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.126 php4/ext/standard/file.c:1.127 --- php4/ext/standard/file.c:1.126 Thu Dec 7 04:09:37 2000 +++ php4/ext/standard/file.c Tue Dec 12 09:42:53 2000 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.126 2000/12/07 12:09:37 sas Exp $ */ +/* $Id: file.c,v 1.127 2000/12/12 17:42:53 stas Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -271,7 +271,7 @@ } convert_to_string_ex(filename); - fp = php_fopen_wrapper((*filename)->value.str.val,"r", use_include_path|ENFORCE_SAFE_MODE, &issock, &socketd, NULL); + fp = php_fopen_wrapper((*filename)->value.str.val,"rb", use_include_path|ENFORCE_SAFE_MODE, &issock, &socketd, NULL); if (!fp && !socketd) { if (issock != BAD_URL) { char *tmp = estrndup(Z_STRVAL_PP(filename), Z_STRLEN_PP(filename)); @@ -406,7 +406,7 @@ } convert_to_string_ex(filename); - fp = php_fopen_wrapper((*filename)->value.str.val,"r", use_include_path|ENFORCE_SAFE_MODE, &issock, &socketd, NULL); + fp = php_fopen_wrapper((*filename)->value.str.val,"rb", use_include_path|ENFORCE_SAFE_MODE, &issock, &socketd, NULL); if (!fp && !socketd) { if (issock != BAD_URL) { char *tmp = estrndup(Z_STRVAL_PP(filename), Z_STRLEN_PP(filename)); @@ -1405,7 +1405,7 @@ * We need a better way of returning error messages from * php_fopen_wrapper(). */ - fp = php_fopen_wrapper((*arg1)->value.str.val,"r", use_include_path|ENFORCE_SAFE_MODE, &issock, &socketd, NULL); + fp = php_fopen_wrapper((*arg1)->value.str.val,"rb", use_include_path|ENFORCE_SAFE_MODE, &issock, &socketd, NULL); if (!fp && !socketd){ if (issock != BAD_URL) { char *tmp = estrndup(Z_STRVAL_PP(arg1), Z_STRLEN_PP(arg1));