/* $Id$ */
+#define _WINSOCKAPI_
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
#ifdef HAVE_CONFIG_H
#endif
+#if !defined(CURLINFO_RESONSE_CODE) && defined(CURLINFO_HTTP_CODE)
+#define CURLINFO_RESONSE_CODE CURLINFO_HTTP_CODE
+#endif
ZEND_DECLARE_MODULE_GLOBALS(http)
/* {{{ internals */
static int http_sort_q(const void *a, const void *b TSRMLS_DC);
-#define http_etag(e, p, l, m) _http_etag((e), (p), (l), (m) TSRMLS_CC)
-static inline char *_http_etag(char **new_etag, const void *data_ptr, const size_t data_len, const http_send_mode data_mode TSRMLS_DC);
-#define http_is_range_request() _http_is_range_request(TSRMLS_C)
-static inline int _http_is_range_request(TSRMLS_D);
#define http_send_chunk(d, b, e, m) _http_send_chunk((d), (b), (e), (m) TSRMLS_CC)
static STATUS _http_send_chunk(const void *data, const size_t begin, const size_t end, const http_send_mode mode TSRMLS_DC);
static char *pretty_key(char *key, int key_len, int uctitle, int xhyphen);
+static int http_ob_stack_get(php_ob_buffer *, php_ob_buffer **);
+
/* {{{ HAVE_CURL */
#ifdef HTTP_HAVE_CURL
#define http_curl_initbuf(m) _http_curl_initbuf((m) TSRMLS_CC)
}
/* }}} */
-/* {{{ static inline char *http_etag(char **, void *, size_t, http_send_mode) */
-static inline char *_http_etag(char **new_etag, const void *data_ptr,
- const size_t data_len, const http_send_mode data_mode TSRMLS_DC)
-{
- char ssb_buf[127], digest[16];
- PHP_MD5_CTX ctx;
-
- PHP_MD5Init(&ctx);
-
- switch (data_mode)
- {
- case SEND_DATA:
- PHP_MD5Update(&ctx, data_ptr, data_len);
- break;
-
- case SEND_RSRC:
- snprintf(ssb_buf, 127, "%l=%l=%l",
- 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:
- return NULL;
- break;
- }
-
- PHP_MD5Final(digest, &ctx);
- make_digest(*new_etag, digest);
-
- return *new_etag;
-}
-/* }}} */
-
-/* {{{ static inline int http_is_range_request(void) */
-static 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 STATUS http_send_chunk(const void *, size_t, size_t,
http_send_mode) */
static STATUS _http_send_chunk(const void *data, const size_t begin,
break;
case SEND_DATA:
- return len == php_body_write(
- Z_STRVAL_P((zval *) data) + begin, len TSRMLS_CC)
+ return len == php_body_write(((char *)data) + begin, len TSRMLS_CC)
? SUCCESS : FAILURE;
break;
curl_easy_setopt(ch, CURLOPT_AUTOREFERER, 1);
curl_easy_setopt(ch, CURLOPT_WRITEFUNCTION, http_curl_body_callback);
curl_easy_setopt(ch, CURLOPT_HEADERFUNCTION, http_curl_hdrs_callback);
-#ifdef ZTS
+#if defined(ZTS) && (LIBCURL_VERSION_NUM >= 0x070a00)
curl_easy_setopt(ch, CURLOPT_NOSIGNAL, 1);
#endif
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)) {
if (qstr.c) {
curl_easy_setopt(ch, CURLOPT_COOKIE, qstr.c);
+ efree(qstr.c);
}
}
/* {{{ 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, */
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;
#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, */
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
}
/* }}} */
}
/* }}} */
+/* {{{ static STATUS http_ob_stack_get(php_ob_buffer *, php_ob_buffer **) */
+static STATUS http_ob_stack_get(php_ob_buffer *o, php_ob_buffer **s)
+{
+ static int i = 0;
+ php_ob_buffer *b = emalloc(sizeof(php_ob_buffer));
+ b->handler_name = estrdup(o->handler_name);
+ b->buffer = estrndup(o->buffer, o->text_length);
+ b->text_length = o->text_length;
+ b->chunk_size = o->chunk_size;
+ b->erase = o->erase;
+ s[i++] = b;
+ return SUCCESS;
+}
+/* }}} */
+
/* }}} internals */
/* {{{ public API */
}
/* }}} */
+/* {{{ 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)
{
}
/* }}} */
+/* {{{ STATUS http_start_ob_handler(php_output_handler_func_t, char *, uint, zend_bool) */
+PHP_HTTP_API STATUS _http_start_ob_handler(php_output_handler_func_t handler_func,
+ char *handler_name, uint chunk_size, zend_bool erase TSRMLS_DC)
+{
+ php_ob_buffer **stack;
+ int count, i;
+
+ if (count = OG(ob_nesting_level)) {
+ stack = ecalloc(sizeof(php_ob_buffer *), count);
+
+ if (count > 1) {
+ zend_stack_apply_with_argument(&OG(ob_buffers), ZEND_STACK_APPLY_BOTTOMUP,
+ (int (*)(void *elem, void *)) http_ob_stack_get, stack);
+ }
+
+ if (count > 0) {
+ http_ob_stack_get(&OG(active_ob_buffer), stack);
+ }
+
+ while (OG(ob_nesting_level)) {
+ php_end_ob_buffer(0, 0 TSRMLS_CC);
+ }
+ }
+
+ php_ob_set_internal_handler(handler_func, chunk_size, handler_name, erase TSRMLS_CC);
+
+ for (i = 0; i < count; i++) {
+ php_ob_buffer *s = stack[i];
+ if (strcmp(s->handler_name, "default output handler")) {
+ php_start_ob_buffer_named(s->handler_name, s->chunk_size, s->erase TSRMLS_CC);
+ }
+ php_body_write(s->buffer, s->text_length TSRMLS_CC);
+ efree(s->handler_name);
+ efree(s->buffer);
+ efree(s);
+ }
+ if (count) {
+ efree(stack);
+ }
+
+ return SUCCESS;
+}
+/* }}} */
+
/* {{{ int http_modified_match(char *, int) */
PHP_HTTP_API int _http_modified_match(const char *entry, const time_t t TSRMLS_DC)
{
PHP_HTTP_API STATUS _http_send_etag(const char *etag,
const int etag_len TSRMLS_DC)
{
- STATUS ret;
- int header_len;
+ STATUS status;
char *etag_header;
- header_len = sizeof("ETag: \"\"") + etag_len + 1;
- etag_header = ecalloc(header_len, 1);
- sprintf(etag_header, "ETag: \"%s\"", etag);
- ret = http_send_header(etag_header);
- efree(etag_header);
+ if (!etag_len){
+ php_error_docref(NULL TSRMLS_CC,E_ERROR,
+ "Attempt to send empty ETag (previous: %s)\n", HTTP_G(etag));
+ return FAILURE;
+ }
/* remember */
if (HTTP_G(etag)) {
}
HTTP_G(etag) = estrdup(etag);
- return ret;
+ etag_header = ecalloc(sizeof("ETag: \"\"") + etag_len, 1);
+ sprintf(etag_header, "ETag: \"%s\"", etag);
+ if (SUCCESS != (status = http_send_header(etag_header))) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't send '%s' header", etag_header);
+ }
+ efree(etag_header);
+ return status;
+}
+/* }}} */
+
+/* {{{ STATUS http_send_cache_control(char *, size_t) */
+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,
+ "Could not send '%s' header", cc_header);
+ }
+ efree(cc_header);
+ return status;
+}
+/* }}} */
+
+/* {{{ STATUS http_send_content_type(char *, size_t) */
+PHP_HTTP_API STATUS _http_send_content_type(const char *content_type,
+ const size_t ct_len TSRMLS_DC)
+{
+ STATUS status;
+ char *ct_header;
+
+ if (!strchr(content_type, '/')) {
+ 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));
+ }
+ HTTP_G(ctype) = estrndup(content_type, ct_len);
+
+ ct_header = ecalloc(sizeof("Content-Type: ") + ct_len, 1);
+ sprintf(ct_header, "Content-Type: %s", content_type);
+
+ if (SUCCESS != (status = http_send_header(ct_header))) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
+ "Couldn't send '%s' header", ct_header);
+ }
+ efree(ct_header);
+ return status;
+}
+/* }}} */
+
+/* {{{ 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 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);
+ } else {
+ cd_header = ecalloc(sizeof("Content-Disposition: attachment; filename=\"\"") + f_len, 1);
+ sprintf(cd_header, "Content-Disposition: attachment; filename=\"%s\"", filename);
+ }
+
+ if (SUCCESS != (status = http_send_header(cd_header))) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't send '%s' header", cd_header);
+ }
+ efree(cd_header);
+ return status;
+}
+/* }}} */
+
+/* {{{ 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,
+ 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();
+ } else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not send 304 Not Modified");
+ return FAILURE;
+ }
+ }
+ return http_send_last_modified(send_modified);
+}
+/* }}} */
+
+/* {{{ STATUS http_cache_etag(char *, size_t, char *, size_t) */
+PHP_HTTP_API STATUS _http_cache_etag(const char *etag, const size_t etag_len,
+ const char *cache_control, const size_t cc_len TSRMLS_DC)
+{
+ 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)) {
+ if (SUCCESS == http_send_status(304)) {
+ zend_bailout();
+ } else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not send 304 Not Modified");
+ return FAILURE;
+ }
+ }
+ }
+
+ /* if no etag is given and we didn't already start ob_etaghandler -- start it */
+ if (!HTTP_G(etag_started)) {
+ if (SUCCESS == http_start_ob_handler(_http_ob_etaghandler, "ob_etaghandler", 4096, 1)) {
+ HTTP_G(etag_started) = 1;
+ return SUCCESS;
+ } else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not start ob_etaghandler");
+ return FAILURE;
+ }
+ }
+ return SUCCESS;
}
/* }}} */
PHP_HTTP_API STATUS _http_send(const void *data_ptr, const size_t data_size,
const http_send_mode data_mode TSRMLS_DC)
{
- char *new_etag = NULL;
int is_range_request = http_is_range_request();
if (!data_ptr) {
/* etag handling */
if (HTTP_G(etag_started)) {
- new_etag = (char *) emalloc(33);
-
- /* never ever use the output to compute the ETag if http_send() is used */
+ char *etag;
+ /* interrupt */
HTTP_G(etag_started) = 0;
+ /* never ever use the output to compute the ETag if http_send() is used */
php_end_ob_buffer(0, 0 TSRMLS_CC);
- if (NULL == http_etag(&new_etag, data_ptr, data_size, data_mode)) {
- efree(new_etag);
+ if (!(etag = http_etag(data_ptr, data_size, data_mode))) {
return FAILURE;
}
/* send 304 Not Modified if etag matches */
- if ((!is_range_request) && http_etag_match("HTTP_IF_NONE_MATCH", new_etag)) {
- efree(new_etag);
+ if ((!is_range_request) && http_etag_match("HTTP_IF_NONE_MATCH", etag)) {
+ efree(etag);
return http_send_status(304);
}
- http_send_etag(new_etag, 32);
- efree(new_etag);
+ http_send_etag(etag, 32);
+ efree(etag);
}
/* send 304 Not Modified if last-modified matches*/
return FAILURE;
}
- return http_send(zdata, Z_STRLEN_P(zdata), SEND_DATA);
+ return http_send(Z_STRVAL_P(zdata), Z_STRLEN_P(zdata), SEND_DATA);
}
/* }}} */
}
/* }}} */
-/* {{{ 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') &&
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);
}
/* }}} */
PHP_HTTP_API STATUS _http_get(const char *URL, HashTable *options,
HashTable *info, char **data, size_t *data_len TSRMLS_DC)
{
+ STATUS rs;
CURL *ch = curl_easy_init();
if (!ch) {
return FAILURE;
}
+ rs = http_get_ex(ch, URL, options, info, data, data_len);
+ curl_easy_cleanup(ch);
+ return rs;
+}
+/* }}} */
+
+/* {{{ STATUS http_get_ex(CURL *, char *, HashTable *, HashTable *, char **, size_t *) */
+PHP_HTTP_API STATUS _http_get_ex(CURL *ch, const char *URL, HashTable *options,
+ HashTable *info, char **data, size_t *data_len TSRMLS_DC)
+{
http_curl_initbuf(CURLBUF_EVRY);
http_curl_setopts(ch, URL, options);
+ curl_easy_setopt(ch, CURLOPT_NOBODY, 0);
+ curl_easy_setopt(ch, CURLOPT_POST, 0);
if (CURLE_OK != curl_easy_perform(ch)) {
- curl_easy_cleanup(ch);
http_curl_freebuf(CURLBUF_EVRY);
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
return FAILURE;
if (info) {
http_curl_getinfo(ch, info);
}
- curl_easy_cleanup(ch);
-
http_curl_movebuf(CURLBUF_EVRY, data, data_len);
-
return SUCCESS;
}
-/* }}} */
/* {{{ STATUS http_head(char *, HashTable *, HashTable *, char **data, size_t *) */
PHP_HTTP_API STATUS _http_head(const char *URL, HashTable *options,
HashTable *info, char **data, size_t *data_len TSRMLS_DC)
{
+ STATUS rs;
CURL *ch = curl_easy_init();
if (!ch) {
return FAILURE;
}
+ rs = http_head_ex(ch, URL, options, info, data, data_len);
+ curl_easy_cleanup(ch);
+ return rs;
+}
+/* }}} */
+
+/* {{{ STATUS http_head_ex(CURL *, char *, HashTable *, HashTable *, char **data, size_t *) */
+PHP_HTTP_API STATUS _http_head_ex(CURL *ch, const char *URL, HashTable *options,
+ HashTable *info, char **data, size_t *data_len TSRMLS_DC)
+{
http_curl_initbuf(CURLBUF_HDRS);
http_curl_setopts(ch, URL, options);
curl_easy_setopt(ch, CURLOPT_NOBODY, 1);
+ curl_easy_setopt(ch, CURLOPT_POST, 0);
if (CURLE_OK != curl_easy_perform(ch)) {
- curl_easy_cleanup(ch);
http_curl_freebuf(CURLBUF_HDRS);
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
return FAILURE;
if (info) {
http_curl_getinfo(ch, info);
}
- curl_easy_cleanup(ch);
-
http_curl_movebuf(CURLBUF_HDRS, data, data_len);
-
return SUCCESS;
}
-/* }}} */
/* {{{ STATUS http_post_data(char *, char *, size_t, HashTable *, HashTable *, char **, size_t *) */
PHP_HTTP_API STATUS _http_post_data(const char *URL, char *postdata,
size_t postdata_len, HashTable *options, HashTable *info, char **data,
size_t *data_len TSRMLS_DC)
{
+ STATUS rs;
CURL *ch = curl_easy_init();
if (!ch) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize curl");
return FAILURE;
}
+ rs = http_post_data_ex(ch, URL, postdata, postdata_len, options, info, data, data_len);
+ curl_easy_cleanup(ch);
+ return rs;
+}
+/* }}} */
+/* {{{ STATUS http_post_data_ex(CURL *, char *, char *, size_t, HashTable *, HashTable *, char **, size_t *) */
+PHP_HTTP_API STATUS _http_post_data_ex(CURL *ch, const char *URL, char *postdata,
+ size_t postdata_len, HashTable *options, HashTable *info, char **data,
+ size_t *data_len TSRMLS_DC)
+{
http_curl_initbuf(CURLBUF_EVRY);
http_curl_setopts(ch, URL, options);
curl_easy_setopt(ch, CURLOPT_POST, 1);
curl_easy_setopt(ch, CURLOPT_POSTFIELDSIZE, postdata_len);
if (CURLE_OK != curl_easy_perform(ch)) {
- curl_easy_cleanup(ch);
http_curl_freebuf(CURLBUF_EVRY);
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request");
return FAILURE;
if (info) {
http_curl_getinfo(ch, info);
}
- curl_easy_cleanup(ch);
-
http_curl_movebuf(CURLBUF_EVRY, data, data_len);
-
return SUCCESS;
}
/* }}} */
projects / m6w6 / ext-http / blobdiff