X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=http_api.c;h=b16da00430999c182e177d656de9da84a0de02f9;hb=refs%2Ftags%2FRELEASE_0_5_0;hp=160c123a691f232c73ae145f61822cc1c1ac43c7;hpb=0119515f91847a945a149a1bd335f41dc759bfeb;p=m6w6%2Fext-http diff --git a/http_api.c b/http_api.c index 160c123..b16da00 100644 --- a/http_api.c +++ b/http_api.c @@ -34,6 +34,7 @@ #include "ext/standard/php_string.h" #include "ext/standard/php_smart_str.h" #include "ext/standard/php_lcg.h" +#include "ext/standard/php_filestat.h" #include "SAPI.h" @@ -562,7 +563,7 @@ static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *opti /* {{{ static inline char *http_curl_getinfoname(CURLINFO) */ static inline char *_http_curl_getinfoname(CURLINFO i TSRMLS_DC) { -#define CASE(I) case CURLINFO_ ##I : return pretty_key(estrdup( #I ), strlen(#I), 0, 0) +#define CASE(I) case CURLINFO_ ##I : { static char I[] = #I; return pretty_key(I, sizeof(#I)-1, 0, 0); } switch (i) { /* CURLINFO_EFFECTIVE_URL = CURLINFO_STRING +1, */ @@ -1061,7 +1062,7 @@ PHP_HTTP_API inline time_t _http_lmod(const void *data_ptr, const http_send_mode default: { zval mtime; - php_stat(Z_STRVAL_P((zval *) data_ptr), Z_STRLEN_P((zval *) data_ptr), FS_MTIME, &mtime TSRMLS_CC); + php_stat(Z_STRVAL_P((zval *) data_ptr), Z_STRLEN_P((zval *) data_ptr), 6, &mtime TSRMLS_CC); return Z_LVAL(mtime); } } @@ -1937,7 +1938,7 @@ PHP_HTTP_API STATUS _http_chunked_decode(const char *encoded, /* }}} */ /* {{{ proto STATUS http_split_response_ex(char *, size_t, zval *, zval *) */ -PHP_HTTP_API STATUS _http_split_response_ex( char *response, +PHP_HTTP_API STATUS _http_split_response_ex( char *response, size_t response_len, zval *zheaders, zval *zbody TSRMLS_DC) { char *body = NULL;