X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=missing.h;h=de4f0831163e92ef20d115991225dfec945c6d68;hp=a9da727fce1439065c735c2bde725c4ac2a34501;hb=7e20868975f5c23ccd74af0d8f7147c506d2b8cf;hpb=c0fd8021cff2c4a134937098ef4fa9779c1924bd diff --git a/missing.h b/missing.h index a9da727..de4f083 100644 --- a/missing.h +++ b/missing.h @@ -6,7 +6,7 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2007, Michael Wallner | + | Copyright (c) 2004-2010, Michael Wallner | +--------------------------------------------------------------------+ */ @@ -17,6 +17,49 @@ #include "php_version.h" +#if defined(PHP_VERSION_ID) && (PHP_VERSION_ID >= 50399) +# define ZEND_LITERAL_KEY_DC , const zend_literal *_zend_literal_key +# define ZEND_LITERAL_KEY_CC , _zend_literal_key +# define ZEND_LITERAL_NIL_CC , NULL +# define HTTP_CHECK_OPEN_BASEDIR(file, act) \ + if ((PG(open_basedir) && *PG(open_basedir))) \ + { \ + const char *tmp = file; \ + \ + if (!strncasecmp(tmp, "file:", lenof("file:"))) { \ + tmp += lenof("file:"); \ + while ((tmp - (const char *)file < 7) && (*tmp == '/' || *tmp == '\\')) ++tmp; \ + } \ + \ + if ( (tmp != file || !strstr(file, "://")) && \ + (!*tmp || php_check_open_basedir(tmp TSRMLS_CC))) { \ + act; \ + } \ + } + +#else +# define ZEND_LITERAL_KEY_DC +# define ZEND_LITERAL_KEY_CC +# define ZEND_LITERAL_NIL_CC +# define HTTP_CHECK_OPEN_BASEDIR(file, act) \ + if ((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) \ + { \ + const char *tmp = file; \ + \ + if (!strncasecmp(tmp, "file:", lenof("file:"))) { \ + tmp += lenof("file:"); \ + while ((tmp - (const char *)file < 7) && (*tmp == '/' || *tmp == '\\')) ++tmp; \ + } \ + \ + if ( (tmp != file || !strstr(file, "://")) && \ + (!*tmp || php_check_open_basedir(tmp TSRMLS_CC) || \ + (PG(safe_mode) && !php_checkuid(tmp, "rb+", CHECKUID_CHECK_MODE_PARAM)))) { \ + act; \ + } \ + } + +#endif + #if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION >= 3) # define HTTP_ZAPI_HASH_TSRMLS_CC TSRMLS_CC # define HTTP_ZAPI_HASH_TSRMLS_DC TSRMLS_DC