CVS update: php31/ext/zlib

Date: Sunday August 16, 1998 @ 5:09 Author: sr Update of /repository/php31/ext/zlib In directory asf:/tmp/cvs-serv20640/ext/zlib Modified Files: zlib.c Log Message: Change the name of fopen_basedir here too Index: php31/ext/zlib/zlib.c diff -c php31/ext/zlib/zlib.c:2.1 php31/ext/zlib/zlib.c:2.2 *** php31/ext/zlib/zlib.c:2.1 Sat Aug 15 16:45:46 1998 --- php31/ext/zlib/zlib.c Sun Aug 16 05:09:51 1998 *************** *** 22,28 **** | Stefan Röhrich <sr@linux.de> | +----------------------------------------------------------------------+ */ ! /* $Id: zlib.c,v 2.1 1998/08/15 20:45:46 sr Exp $ */ #ifdef THREAD_SAFE #include "tls.h" --- 22,28 ---- | Stefan Röhrich <sr@linux.de> | +----------------------------------------------------------------------+ */ ! /* $Id: zlib.c,v 2.2 1998/08/16 09:09:51 sr Exp $ */ #ifdef THREAD_SAFE #include "tls.h" *************** *** 204,210 **** php3_error(E_WARNING,"SAFE MODE Restriction in effect. Invalid owner of file to be read."); return NULL; } ! if (_php3_check_fopen_basedir(path)) return NULL; return gzopen(path, mode); } } --- 204,210 ---- php3_error(E_WARNING,"SAFE MODE Restriction in effect. Invalid owner of file to be read."); return NULL; } ! if (_php3_check_open_basedir(path)) return NULL; return gzopen(path, mode); } } *************** *** 230,236 **** php3_error(E_WARNING,"SAFE MODE Restriction in effect. Invalid owner."); return(NULL); } ! if (_php3_check_fopen_basedir(filename)) return NULL; zp = gzopen(filename, mode); if (zp && opened_path) { *opened_path = expand_filepath(filename); --- 230,236 ---- php3_error(E_WARNING,"SAFE MODE Restriction in effect. Invalid owner."); return(NULL); } ! if (_php3_check_open_basedir(filename)) return NULL; zp = gzopen(filename, mode); if (zp && opened_path) { *opened_path = expand_filepath(filename); *************** *** 250,263 **** php3_error(E_WARNING,"SAFE MODE Restriction in effect. Invalid owner."); return(NULL); } ! if (_php3_check_fopen_basedir(trypath)) return NULL; zp = gzopen(trypath, mode); if (zp && opened_path) { *opened_path = expand_filepath(trypath); } return zp; } else { ! if (_php3_check_fopen_basedir(filename)) return NULL; return gzopen(filename, mode); } } --- 250,263 ---- php3_error(E_WARNING,"SAFE MODE Restriction in effect. Invalid owner."); return(NULL); } ! if (_php3_check_open_basedir(trypath)) return NULL; zp = gzopen(trypath, mode); if (zp && opened_path) { *opened_path = expand_filepath(trypath); } return zp; } else { ! if (_php3_check_open_basedir(filename)) return NULL; return gzopen(filename, mode); } } *************** *** 267,273 **** php3_error(E_WARNING,"SAFE MODE Restriction in effect. Invalid owner."); return(NULL); } ! if (_php3_check_fopen_basedir(filename)) return NULL; zp = gzopen(filename, mode); if (zp && opened_path) { *opened_path = strdup(filename); --- 267,273 ---- php3_error(E_WARNING,"SAFE MODE Restriction in effect. Invalid owner."); return(NULL); } ! if (_php3_check_open_basedir(filename)) return NULL; zp = gzopen(filename, mode); if (zp && opened_path) { *opened_path = strdup(filename); *************** *** 298,304 **** } } if ((zp = gzopen(trypath, mode)) != NULL) { ! if (_php3_check_fopen_basedir(trypath)) { gzclose(zp); efree(pathbuf); return NULL; --- 298,304 ---- } } if ((zp = gzopen(trypath, mode)) != NULL) { ! if (_php3_check_open_basedir(trypath)) { gzclose(zp); efree(pathbuf); return NULL; -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net