diff options
| author | Andi Gutmans <andi@php.net> | 1999-11-30 20:18:11 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 1999-11-30 20:18:11 +0000 |
| commit | 2337d110f91ddf02dede5b91ce22fd69bc3df8fb (patch) | |
| tree | 622dabbd3eb1192382e253af403362050197b230 /ext/gd/gd.c | |
| parent | 5463dd5b387298a84736e590e5d213f5bafe9435 (diff) | |
| download | php-git-2337d110f91ddf02dede5b91ce22fd69bc3df8fb.tar.gz | |
- Added opened_path to php_fopen_wrapper() and the URL fopen wrapper (it's not
always properly set, it's a TODO for all of us). This enables us to implement
true 'use' support.
@- Added support for the 'use' keyword - behaves like 'require', but will not
@ use the same file more than once (Andi & Zeev, Zend library)
Diffstat (limited to 'ext/gd/gd.c')
| -rw-r--r-- | ext/gd/gd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/gd/gd.c b/ext/gd/gd.c index b1f40ccddd..632489f3ca 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -312,7 +312,7 @@ PHP_FUNCTION(imageloadfont) { #if WIN32|WINNT fp = fopen(file->value.str.val, "rb"); #else - fp = php3_fopen_wrapper(file->value.str.val, "r", IGNORE_PATH|IGNORE_URL_WIN, &issock, &socketd); + fp = php3_fopen_wrapper(file->value.str.val, "r", IGNORE_PATH|IGNORE_URL_WIN, &issock, &socketd, NULL); #endif if (fp == NULL) { php_error(E_WARNING, "ImageFontLoad: unable to open file"); @@ -416,7 +416,7 @@ void php3_imagecreatefrompng (INTERNAL_FUNCTION_PARAMETERS) { #if WIN32|WINNT fp = fopen(file->value.str.val, "rb"); #else - fp = php3_fopen_wrapper(file->value.str.val, "r", IGNORE_PATH|IGNORE_URL_WIN, &issock, &socketd); + fp = php3_fopen_wrapper(file->value.str.val, "r", IGNORE_PATH|IGNORE_URL_WIN, &issock, &socketd, NULL); #endif if (!fp) { php3_strip_url_passwd(fn); @@ -526,7 +526,7 @@ PHP_FUNCTION(imagecreatefromgif ) #if WIN32|WINNT fp = fopen(file->value.str.val, "rb"); #else - fp = php3_fopen_wrapper(file->value.str.val, "r", IGNORE_PATH|IGNORE_URL_WIN, &issock, &socketd); + fp = php3_fopen_wrapper(file->value.str.val, "r", IGNORE_PATH|IGNORE_URL_WIN, &issock, &socketd, NULL); #endif if (!fp) { php3_strip_url_passwd(fn); |