Browse Source

- Couple of compile fixes.

migration/RELEASE_1_0_0
Andi Gutmans 21 years ago
parent
commit
c28cff57d1
  1. 7
      ext/curl/interface.c
  2. 7
      ext/gd/php_gd.h

7
ext/curl/interface.c

@ -157,8 +157,8 @@ static void _php_curl_close(zend_rsrc_list_entry *rsrc TSRMLS_DC);
#define CAAZ(s, v) add_assoc_zval_ex(return_value, s, sizeof(s), (zval *) v);
#define PHP_CURL_CHECK_OPEN_BASEDIR(str, len) \
if (((PG(open_basedir) && *PG(open_basedir))) && \
strncasecmp(str, "file:", sizeof("file:") - 1) == 0) \
if ((PG(open_basedir) && *PG(open_basedir)) && \
strncasecmp(str, "file:", sizeof("file:") - 1) == 0) \
{ \
php_url *tmp_url; \
\
@ -167,8 +167,7 @@ static void _php_curl_close(zend_rsrc_list_entry *rsrc TSRMLS_DC);
RETURN_FALSE; \
} \
\
if (tmp_url->query || tmp_url->fragment || php_check_open_basedir(tmp_url->path TSRMLS_CC)) \
) { \
if (tmp_url->query || tmp_url->fragment || php_check_open_basedir(tmp_url->path TSRMLS_CC)) { \
php_url_free(tmp_url); \
RETURN_FALSE; \
} \

7
ext/gd/php_gd.h

@ -32,10 +32,9 @@
/* open_basedir and safe_mode checks */
#define PHP_GD_CHECK_OPEN_BASEDIR(filename, errormsg) \
if (!filename || php_check_open_basedir(filename TSRMLS_CC)) \
) { \
php_error_docref(NULL TSRMLS_CC, E_WARNING, errormsg); \
RETURN_FALSE; \
if (!filename || php_check_open_basedir(filename TSRMLS_CC)) { \
php_error_docref(NULL TSRMLS_CC, E_WARNING, errormsg); \
RETURN_FALSE; \
}
#define PHP_GDIMG_TYPE_GIF 1

Loading…
Cancel
Save