#endif
+#if !defined(CURLINFO_RESONSE_CODE) && defined(CURLINFO_HTTP_CODE)
+#define CURLINFO_RESONSE_CODE CURLINFO_HTTP_CODE
+#endif
ZEND_DECLARE_MODULE_GLOBALS(http)
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);
+ /* FIXXXME: mem-leak */
}
}
/* {{{ 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
}
/* }}} */
PHP_HTTP_API char *_http_date(time_t t TSRMLS_DC)
{
struct tm *gmtime, tmbuf;
- char *date = ecalloc(31, 1);
+ char *date = ecalloc(1, 31);
gmtime = php_gmtime_r(&t, &tmbuf);
snprintf(date, 30,
char ssb_buf[128] = {0};
unsigned char digest[16];
PHP_MD5_CTX ctx;
- char *new_etag = ecalloc(33, 1);
+ char *new_etag = ecalloc(1, 33);
PHP_MD5Init(&ctx);
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);
+ 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;
}
}
}
int count, i;
if (count = OG(ob_nesting_level)) {
- stack = ecalloc(sizeof(php_ob_buffer *), count);
+ stack = ecalloc(count, sizeof(php_ob_buffer *));
if (count > 1) {
zend_stack_apply_with_argument(&OG(ob_buffers), ZEND_STACK_APPLY_BOTTOMUP,
}
HTTP_G(etag) = estrdup(etag);
- etag_header = ecalloc(sizeof("ETag: \"\"") + etag_len, 1);
+ etag_header = ecalloc(1, sizeof("ETag: \"\"") + etag_len);
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);
const size_t cc_len TSRMLS_DC)
{
STATUS status;
- char *cc_header = ecalloc(sizeof("Cache-Control: ") + cc_len, 1);
+ char *cc_header = ecalloc(1, sizeof("Cache-Control: ") + cc_len);
sprintf(cc_header, "Cache-Control: %s", cache_control);
if (SUCCESS != (status = http_send_header(cc_header))) {
}
HTTP_G(ctype) = estrndup(content_type, ct_len);
- ct_header = ecalloc(sizeof("Content-Type: ") + ct_len, 1);
+ ct_header = ecalloc(1, sizeof("Content-Type: ") + ct_len);
sprintf(ct_header, "Content-Type: %s", content_type);
if (SUCCESS != (status = http_send_header(ct_header))) {
char *cd_header;
if (send_inline) {
- cd_header = ecalloc(sizeof("Content-Disposition: inline; filename=\"\"") + f_len, 1);
+ cd_header = ecalloc(1, sizeof("Content-Disposition: inline; filename=\"\"") + f_len);
sprintf(cd_header, "Content-Disposition: inline; filename=\"%s\"", filename);
} else {
- cd_header = ecalloc(sizeof("Content-Disposition: attachment; filename=\"\"") + f_len, 1);
+ cd_header = ecalloc(1, sizeof("Content-Disposition: attachment; filename=\"\"") + f_len);
sprintf(cd_header, "Content-Disposition: attachment; filename=\"%s\"", filename);
}
PHP_HTTP_API char *_http_absolute_uri(const char *url,
const char *proto TSRMLS_DC)
{
- char URI[HTTP_URI_MAXLEN + 1], *PTR, *proto_ptr, *host, *path;
+ char *proto_ptr, *host, *path, *PTR, *URI = ecalloc(1, HTTP_URI_MAXLEN + 1);
zval *zhost;
if (!url || !strlen(url)) {
/* Mess around with already absolute URIs */
else if (proto_ptr = strstr(url, "://")) {
if (!proto || !strncmp(url, proto, strlen(proto))) {
- return estrdup(url);
+ strncpy(URI, url, HTTP_URI_MAXLEN);
+ return URI;
} else {
snprintf(URI, HTTP_URI_MAXLEN, "%s%s", proto, proto_ptr + 3);
- return estrdup(URI);
+ return URI;
}
}
}
/* strip everything after a new line */
- PTR = URI;
- while (*PTR != 0) {
- if (*PTR == '\n' || *PTR == '\r') {
- *PTR = 0;
- break;
- }
- PTR++;
+ if ((PTR = strchr(URI, '\r')) || (PTR = strchr(URI, '\n'))) {
+ PTR = 0;
}
-
- return estrdup(URI);
+
+ return URI;
}
/* }}} */
char *d_ptr;
*decoded_len = 0;
- *decoded = (char *) ecalloc(encoded_len, 1);
+ *decoded = ecalloc(1, encoded_len);
d_ptr = *decoded;
e_ptr = 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;
}
/* }}} */
-/* {{{ STATUS http_post_array(char *, HashTable *, HashTable *, HashTable *, char **, size_t *) */
-PHP_HTTP_API STATUS _http_post_array(const char *URL, HashTable *postarray,
+/* {{{ STATUS http_post_array_ex(CURL *, char *, HashTable *, HashTable *, HashTable *, char **, size_t *) */
+PHP_HTTP_API STATUS _http_post_array_ex(CURL *ch, const char *URL, HashTable *postarray,
HashTable *options, HashTable *info, char **data, size_t *data_len TSRMLS_DC)
{
smart_str qstr = {0};
STATUS status;
+ HTTP_URL_ARGSEP_OVERRIDE;
if (php_url_encode_hash_ex(postarray, &qstr, NULL,0,NULL,0,NULL,0,NULL TSRMLS_CC) != SUCCESS) {
if (qstr.c) {
efree(qstr.c);
}
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not encode post data");
+ HTTP_URL_ARGSEP_RESTORE;
return FAILURE;
}
smart_str_0(&qstr);
+ HTTP_URL_ARGSEP_RESTORE;
- status = http_post_data(URL, qstr.c, qstr.len, options, info, data, data_len);
+ if (ch) {
+ status = http_post_data_ex(ch, URL, qstr.c, qstr.len, options, info, data, data_len);
+ } else {
+ status = http_post_data(URL, qstr.c, qstr.len, options, info, data, data_len);
+ }
+
if (qstr.c) {
efree(qstr.c);
}
}
/* }}} */
+/* {{{ STATUS http_post_curldata_ex(CURL *, char *, curl_httppost *, HashTable *, HashTable *, char **, size_t *) */
+PHP_HTTP_API STATUS _http_post_curldata_ex(CURL *ch, const char *URL,
+ struct curl_httppost *curldata, 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_HTTPPOST, curldata);
+
+ if (CURLE_OK != curl_easy_perform(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);
+ }
+ http_curl_movebuf(CURLBUF_EVRY, data, data_len);
+ return SUCCESS;}
+/* }}} */
+
#endif
/* }}} HAVE_CURL */
projects / m6w6 / ext-http / blobdiff