summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Beulshausen <dbeu@php.net>2001-04-03 21:39:18 +0000
committerDaniel Beulshausen <dbeu@php.net>2001-04-03 21:39:18 +0000
commita29dc27c1c1b1c016bb21b44b78529244d007eef (patch)
treecf7718350df658fa4c711fd5c8068f619096517f
parent5c30ce1436d1954a5aa6ace46d6510520a42c84a (diff)
downloadphp-git-a29dc27c1c1b1c016bb21b44b78529244d007eef.tar.gz
resolve realpath if in v-dir mode
-rw-r--r--ext/exif/exif.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index 187a40727b..f855e146c7 100644
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -1060,7 +1060,7 @@ PHP_FUNCTION(read_exif_data) {
pval **p_name;
int ac = ZEND_NUM_ARGS(), ret;
ImageInfoType ImageInfo;
- char tmp[64];
+ char tmp[64], *file;
/*ImageInfo.Thumbnail = NULL;
ImageInfo.ThumbnailSize = 0;
@@ -1070,7 +1070,14 @@ PHP_FUNCTION(read_exif_data) {
WRONG_PARAM_COUNT;
convert_to_string_ex(p_name);
- ret = php_read_jpeg_exif(&ImageInfo, (*p_name)->value.str.val,1);
+
+#ifdef VIRTUAL_DIR
+ virtual_filepath(Z_STRVAL_PP(p_name), &file);
+ ret = php_read_jpeg_exif(&ImageInfo, file,1);
+#else
+ ret = php_read_jpeg_exif(&ImageInfo, Z_STRVAL_PP(p_name),1);
+#endif
+
if (array_init(return_value) == FAILURE) {
RETURN_FALSE;
}