X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_api.c;h=42b382807491cb545b505feabb8a81f0e4897bf5;hp=00dad2e60ff0a37b4cd99b113f59b4f1f876cda6;hb=fe4db6a5020782e03d32348cbe64d93756524441;hpb=5be9a548c1e57fdc0960740ca6580d0023845ed4 diff --git a/http_api.c b/http_api.c index 00dad2e..42b3828 100644 --- a/http_api.c +++ b/http_api.c @@ -58,6 +58,9 @@ #endif +#if !defined(CURLINFO_RESONSE_CODE) && defined(CURLINFO_HTTP_CODE) +#define CURLINFO_RESONSE_CODE CURLINFO_HTTP_CODE +#endif ZEND_DECLARE_MODULE_GLOBALS(http) @@ -178,88 +181,6 @@ static inline char *_http_curl_getinfoname(CURLINFO i TSRMLS_DC); #endif /* }}} HAVE_CURL */ -/* {{{ inline char *http_etag(void *, size_t, http_send_mode) */ -inline char *_http_etag(const void *data_ptr, const size_t data_len, - const http_send_mode data_mode TSRMLS_DC) -{ - char ssb_buf[128] = {0}; - unsigned char digest[16]; - PHP_MD5_CTX ctx; - char *new_etag = ecalloc(33, 1); - - PHP_MD5Init(&ctx); - - switch (data_mode) - { - case SEND_DATA: - PHP_MD5Update(&ctx, data_ptr, data_len); - break; - - case SEND_RSRC: - if (!HTTP_G(ssb).sb.st_ino) { - if (php_stream_stat((php_stream *) data_ptr, &HTTP_G(ssb))) { - return NULL; - } - } - snprintf(ssb_buf, 127, "%ld=%ld=%ld", - HTTP_G(ssb).sb.st_mtime, - HTTP_G(ssb).sb.st_ino, - HTTP_G(ssb).sb.st_size - ); - PHP_MD5Update(&ctx, ssb_buf, strlen(ssb_buf)); - break; - - default: - efree(new_etag); - return NULL; - break; - } - - PHP_MD5Final(digest, &ctx); - make_digest(new_etag, digest); - - return new_etag; -} -/* }}} */ - -/* {{{ inline http_lmod(void *, http_send_mode) */ -inline time_t _http_lmod(const void *data_ptr, const http_send_mode data_mode TSRMLS_DC) -{ - switch (data_mode) - { - case SEND_DATA: - { - return time(NULL); - } - - case SEND_RSRC: - { - if (!HTTP_G(ssb).sb.st_mtime) { - if (php_stream_stat((php_stream *) data_ptr, &HTTP_G(ssb))) { - return 0; - } - } - return HTTP_G(ssb).sb.st_mtime; - } - - default: - { - zval mtime; - php_stat(Z_STRVAL_P((zval *) data_ptr), Z_STRLEN_P((zval *) data_ptr), FS_MTIME, &mtime TSRMLS_CC); - return Z_LVAL(mtime); - } - } -} -/* }}} */ - -/* {{{inline int http_is_range_request(void) */ -inline int _http_is_range_request(TSRMLS_D) -{ - return zend_hash_exists(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER]), - "HTTP_RANGE", strlen("HTTP_RANGE") + 1); -} -/* }}} */ - /* {{{ static int http_sort_q(const void *, const void *) */ static int http_sort_q(const void *a, const void *b TSRMLS_DC) { @@ -544,19 +465,23 @@ static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *opti if (zoption = http_curl_getopt1(options, "proxyauth", IS_STRING)) { curl_easy_setopt(ch, CURLOPT_PROXYUSERPWD, Z_STRVAL_P(zoption)); } +#if LIBCURL_VERSION_NUM > 0x070a06 /* auth method */ if (zoption = http_curl_getopt1(options, "proxyauthtype", IS_LONG)) { curl_easy_setopt(ch, CURLOPT_PROXYAUTH, Z_LVAL_P(zoption)); } +#endif } /* auth */ if (zoption = http_curl_getopt1(options, "httpauth", IS_STRING)) { curl_easy_setopt(ch, CURLOPT_USERPWD, Z_STRVAL_P(zoption)); } +#if LIBCURL_VERSION_NUM > 0x070a05 if (zoption = http_curl_getopt1(options, "httpauthtype", IS_LONG)) { curl_easy_setopt(ch, CURLOPT_HTTPAUTH, Z_LVAL_P(zoption)); } +#endif /* compress, enabled by default (empty string enables deflate and gzip) */ if (zoption = http_curl_getopt2(options, "compress", IS_LONG, IS_BOOL)) { @@ -644,13 +569,17 @@ 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, */ CASE(EFFECTIVE_URL); /* CURLINFO_RESPONSE_CODE = CURLINFO_LONG +2, */ +#if LIBCURL_VERSION_NUM > 0x070a06 CASE(RESPONSE_CODE); +#else + CASE(HTTP_CODE); +#endif /* CURLINFO_TOTAL_TIME = CURLINFO_DOUBLE +3, */ CASE(TOTAL_TIME); /* CURLINFO_NAMELOOKUP_TIME = CURLINFO_DOUBLE +4, */ @@ -687,14 +616,16 @@ static inline char *_http_curl_getinfoname(CURLINFO i TSRMLS_DC) CASE(REDIRECT_TIME); /* CURLINFO_REDIRECT_COUNT = CURLINFO_LONG +20, */ CASE(REDIRECT_COUNT); - /* CURLINFO_PRIVATE = CURLINFO_STRING +21, */ + /* CURLINFO_PRIVATE = CURLINFO_STRING +21, * (mike) / CASE(PRIVATE); /* CURLINFO_HTTP_CONNECTCODE = CURLINFO_LONG +22, */ CASE(HTTP_CONNECTCODE); +#if LIBCURL_VERSION_NUM > 0x070a07 /* CURLINFO_HTTPAUTH_AVAIL = CURLINFO_LONG +23, */ CASE(HTTPAUTH_AVAIL); /* CURLINFO_PROXYAUTH_AVAIL = CURLINFO_LONG +24, */ CASE(PROXYAUTH_AVAIL); +#endif } #undef CASE return NULL; @@ -748,8 +679,12 @@ static inline void _http_curl_getinfo(CURL *ch, HashTable *info TSRMLS_DC) #define INFO(I) http_curl_getinfo_ex(ch, CURLINFO_ ##I , &array) /* CURLINFO_EFFECTIVE_URL = CURLINFO_STRING +1, */ INFO(EFFECTIVE_URL); +#if LIBCURL_VERSION_NUM > 0x070a06 /* CURLINFO_RESPONSE_CODE = CURLINFO_LONG +2, */ INFO(RESPONSE_CODE); +#else + INFO(HTTP_CODE); +#endif /* CURLINFO_TOTAL_TIME = CURLINFO_DOUBLE +3, */ INFO(TOTAL_TIME); /* CURLINFO_NAMELOOKUP_TIME = CURLINFO_DOUBLE +4, */ @@ -790,10 +725,12 @@ static inline void _http_curl_getinfo(CURL *ch, HashTable *info TSRMLS_DC) INFO(PRIVATE); /* CURLINFO_HTTP_CONNECTCODE = CURLINFO_LONG +22, */ INFO(HTTP_CONNECTCODE); +#if LIBCURL_VERSION_NUM > 0x070a07 /* CURLINFO_HTTPAUTH_AVAIL = CURLINFO_LONG +23, */ INFO(HTTPAUTH_AVAIL); /* CURLINFO_PROXYAUTH_AVAIL = CURLINFO_LONG +24, */ INFO(PROXYAUTH_AVAIL); +#endif #undef INFO } /* }}} */ @@ -1076,6 +1013,91 @@ PHP_HTTP_API time_t _http_parse_date(const char *date) } /* }}} */ +/* {{{ inline char *http_etag(void *, size_t, http_send_mode) */ +PHP_HTTP_API inline char *_http_etag(const void *data_ptr, const size_t data_len, + const http_send_mode data_mode TSRMLS_DC) +{ + char ssb_buf[128] = {0}; + unsigned char digest[16]; + PHP_MD5_CTX ctx; + char *new_etag = ecalloc(33, 1); + + PHP_MD5Init(&ctx); + + switch (data_mode) + { + case SEND_DATA: + PHP_MD5Update(&ctx, data_ptr, data_len); + break; + + case SEND_RSRC: + if (!HTTP_G(ssb).sb.st_ino) { + if (php_stream_stat((php_stream *) data_ptr, &HTTP_G(ssb))) { + return NULL; + } + } + snprintf(ssb_buf, 127, "%ld=%ld=%ld", + HTTP_G(ssb).sb.st_mtime, + HTTP_G(ssb).sb.st_ino, + HTTP_G(ssb).sb.st_size + ); + PHP_MD5Update(&ctx, ssb_buf, strlen(ssb_buf)); + break; + + default: + efree(new_etag); + return NULL; + break; + } + + PHP_MD5Final(digest, &ctx); + make_digest(new_etag, digest); + + return new_etag; +} +/* }}} */ + +/* {{{ inline http_lmod(void *, http_send_mode) */ +PHP_HTTP_API inline time_t _http_lmod(const void *data_ptr, const http_send_mode data_mode TSRMLS_DC) +{ + switch (data_mode) + { + case SEND_DATA: + { + return time(NULL); + } + + case SEND_RSRC: + { + if (!HTTP_G(ssb).sb.st_mtime) { + if (php_stream_stat((php_stream *) data_ptr, &HTTP_G(ssb))) { + return 0; + } + } + return HTTP_G(ssb).sb.st_mtime; + } + + default: + { + if (!HTTP_G(ssb).sb.st_mtime) { + if(php_stream_stat_path(Z_STRVAL_P((zval *) data_ptr), &HTTP_G(ssb))) { + return 0; + } + } + return HTTP_G(ssb).sb.st_mtime; + } + } +} +/* }}} */ + +/* {{{inline int http_is_range_request(void) */ +PHP_HTTP_API inline int _http_is_range_request(TSRMLS_D) +{ + return zend_hash_exists(Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_SERVER]), + "HTTP_RANGE", strlen("HTTP_RANGE") + 1); +} +/* }}} */ + /* {{{ inline STATUS http_send_status(int) */ PHP_HTTP_API inline STATUS _http_send_status(const int status TSRMLS_DC) { @@ -1279,15 +1301,15 @@ PHP_HTTP_API STATUS _http_send_etag(const char *etag, /* }}} */ /* {{{ STATUS http_send_cache_control(char *, size_t) */ -PHP_HTTP_API STATUS _http_send_cache_control(const char *cache_control, +PHP_HTTP_API STATUS _http_send_cache_control(const char *cache_control, const size_t cc_len TSRMLS_DC) { STATUS status; char *cc_header = ecalloc(sizeof("Cache-Control: ") + cc_len, 1); - + sprintf(cc_header, "Cache-Control: %s", cache_control); if (SUCCESS != (status = http_send_header(cc_header))) { - php_error_docref(NULL TSRMLS_CC, E_NOTICE, + php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not send '%s' header", cc_header); } efree(cc_header); @@ -1301,14 +1323,14 @@ PHP_HTTP_API STATUS _http_send_content_type(const char *content_type, { STATUS status; char *ct_header; - + if (!strchr(content_type, '/')) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Content-Type '%s' doesn't seem to consist of a primary and a secondary part", content_type); return FAILURE; } - + /* remember for multiple ranges */ if (HTTP_G(ctype)) { efree(HTTP_G(ctype)); @@ -1319,7 +1341,7 @@ PHP_HTTP_API STATUS _http_send_content_type(const char *content_type, sprintf(ct_header, "Content-Type: %s", content_type); if (SUCCESS != (status = http_send_header(ct_header))) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't send '%s' header", ct_header); } efree(ct_header); @@ -1329,11 +1351,11 @@ PHP_HTTP_API STATUS _http_send_content_type(const char *content_type, /* {{{ STATUS http_send_content_disposition(char *, size_t, zend_bool) */ PHP_HTTP_API STATUS _http_send_content_disposition(const char *filename, - const size_t f_len, const zend_bool send_inline TSRMLS_DC) + const size_t f_len, const int send_inline TSRMLS_DC) { STATUS status; char *cd_header; - + if (send_inline) { cd_header = ecalloc(sizeof("Content-Disposition: inline; filename=\"\"") + f_len, 1); sprintf(cd_header, "Content-Disposition: inline; filename=\"%s\"", filename); @@ -1351,13 +1373,13 @@ PHP_HTTP_API STATUS _http_send_content_disposition(const char *filename, /* }}} */ /* {{{ STATUS http_cache_last_modified(time_t, time_t, char *, size_t) */ -PHP_HTTP_API STATUS _http_cache_last_modified(const time_t last_modified, +PHP_HTTP_API STATUS _http_cache_last_modified(const time_t last_modified, const time_t send_modified, const char *cache_control, const size_t cc_len TSRMLS_DC) { if (cc_len) { http_send_cache_control(cache_control, cc_len); } - + if (http_modified_match("HTTP_IF_MODIFIED_SINCE", last_modified)) { if (SUCCESS == http_send_status(304)) { zend_bailout(); @@ -1377,7 +1399,7 @@ PHP_HTTP_API STATUS _http_cache_etag(const char *etag, const size_t etag_len, if (cc_len) { http_send_cache_control(cache_control, cc_len); } - + if (etag_len) { http_send_etag(etag, etag_len); if (http_etag_match("HTTP_IF_NONE_MATCH", etag)) { @@ -1936,15 +1958,14 @@ PHP_HTTP_API STATUS _http_chunked_decode(const char *encoded, } /* }}} */ -/* {{{ proto STATUS http_split_response(zval *, zval *, zval *) */ -PHP_HTTP_API STATUS _http_split_response(const zval *zresponse, zval *zheaders, - zval *zbody TSRMLS_DC) +/* {{{ proto STATUS http_split_response_ex(char *, size_t, zval *, zval *) */ +PHP_HTTP_API STATUS _http_split_response_ex( char *response, + size_t response_len, zval *zheaders, zval *zbody TSRMLS_DC) { - char *header, *response, *body = NULL; - long response_len = Z_STRLEN_P(zresponse); - header = response = Z_STRVAL_P(zresponse); + char *body = NULL; + char *header = response; - while ((response - Z_STRVAL_P(zresponse) + 3) < response_len) { + while ((response - header + 4) < response_len) { if ( (*response++ == '\r') && (*response++ == '\n') && (*response++ == '\r') && @@ -1960,7 +1981,7 @@ PHP_HTTP_API STATUS _http_split_response(const zval *zresponse, zval *zheaders, Z_TYPE_P(zbody) = IS_NULL; } - return http_parse_headers(header, body - Z_STRVAL_P(zresponse), zheaders); + return http_parse_headers(header, body ? body - header : response_len, zheaders); } /* }}} */