#endif
+#if !defined(CURLINFO_RESONSE_CODE) && defined(CURLINFO_HTTP_CODE)
+#define CURLINFO_RESONSE_CODE CURLINFO_HTTP_CODE
+#endif
ZEND_DECLARE_MODULE_GLOBALS(http)
/* {{{ 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);
+#ifdef CURLINFO_RESONSE_CODE
/* CURLINFO_RESPONSE_CODE = CURLINFO_LONG +2, */
CASE(RESPONSE_CODE);
+#endif
/* CURLINFO_TOTAL_TIME = CURLINFO_DOUBLE +3, */
CASE(TOTAL_TIME);
/* CURLINFO_NAMELOOKUP_TIME = CURLINFO_DOUBLE +4, */
CASE(PRIVATE);
/* CURLINFO_HTTP_CONNECTCODE = CURLINFO_LONG +22, */
CASE(HTTP_CONNECTCODE);
+#ifdef CURLINFO_HTTPAUTH_AVAIL
/* CURLINFO_HTTPAUTH_AVAIL = CURLINFO_LONG +23, */
CASE(HTTPAUTH_AVAIL);
+#endif
+#ifdef CURLINFO_PROXYAUTH_AVAIL
/* CURLINFO_PROXYAUTH_AVAIL = CURLINFO_LONG +24, */
- CASE(PROXYAUTH_AVAIL);
+ 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);
+#ifdef CURLINFO_RESONSE_CODE
/* CURLINFO_RESPONSE_CODE = CURLINFO_LONG +2, */
INFO(RESPONSE_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);
+#ifdef CURLINFO_HTTPAUTH_AVAIL
/* CURLINFO_HTTPAUTH_AVAIL = CURLINFO_LONG +23, */
INFO(HTTPAUTH_AVAIL);
+#endif
+#ifdef CURLINFO_PROXYAUTH_AVAIL
/* CURLINFO_PROXYAUTH_AVAIL = CURLINFO_LONG +24, */
INFO(PROXYAUTH_AVAIL);
+#endif
#undef INFO
}
/* }}} */
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;
}
}
}
/* {{{ 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;
}
/* }}} */
-/* {{{ 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);
}
/* }}} */