#include "ext/standard/php_string.h"
#include "zend_operators.h"
-#ifdef HAVE_PHP_SESSION
+#ifdef HTTP_HAVE_SESSION
# include "ext/session/php_session.h"
#endif
}
if (t == -1) {
- t = (long) HTTP_GET_REQUEST_TIME();
+ t = HTTP_G->request.time;
}
RETURN_STRING(http_date(t), 0);
}
if (t == -1) {
- t = (long) HTTP_GET_REQUEST_TIME();
+ t = HTTP_G->request.time;
}
RETURN_SUCCESS(http_send_last_modified(t));
// current time if not supplied (senseless though)
if (t == -1) {
- t = (long) HTTP_GET_REQUEST_TIME();
+ t = HTTP_G->request.time;
}
if (for_range) {
* Returns FALSE on failure, or *exits* with "304 Not Modified" if the entity is cached.
*
* A log entry will be written to the cache log if the INI entry
- * http.cache_log is set and the cache attempt was successful.
+ * http.log.cache is set and the cache attempt was successful.
*/
PHP_FUNCTION(http_cache_last_modified)
{
HTTP_CHECK_HEADERS_SENT(RETURN_FALSE);
- t = (long) HTTP_GET_REQUEST_TIME();
+ t = HTTP_G->request.time;
/* 0 or omitted */
if (!last_modified) {
/* {{{ proto bool http_cache_etag([string etag])
*
* Attempts to cache the sent entity by its ETag, either supplied or generated
- * by the hash algorithm specified by the INI setting "http.etag_mode".
+ * by the hash algorithm specified by the INI setting "http.etag.mode".
*
* If the clients "If-None-Match" header matches the supplied/calculated
* ETag, the body is considered cached on the clients side and
* Returns FALSE on failure, or *exits* with "304 Not Modified" if the entity is cached.
*
* A log entry is written to the cache log if the INI entry
- * "http.cache_log" is set and the cache attempt was successful.
+ * "http.log.cache" is set and the cache attempt was successful.
*/
PHP_FUNCTION(http_cache_etag)
{
/* {{{ proto string ob_etaghandler(string data, int mode)
*
* For use with ob_start(). Output buffer handler generating an ETag with
- * the hash algorithm specified with the INI setting "http.etag_mode".
+ * the hash algorithm specified with the INI setting "http.etag.mode".
*/
PHP_FUNCTION(ob_etaghandler)
{
* Returns FALSE on failure, or *exits* on success.
*
* A log entry will be written to the redirect log, if the INI entry
- * "http.redirect_log" is set and the redirect attempt was successful.
+ * "http.log.redirect" is set and the redirect attempt was successful.
*/
PHP_FUNCTION(http_redirect)
{
RETURN_FALSE;
}
-#ifdef HAVE_PHP_SESSION
+#ifdef HTTP_HAVE_SESSION
/* append session info */
if (session) {
if (!params) {
FREE_ZVAL(params);
}
- switch (status)
- {
+ switch (status) {
case 300:
RETVAL_SUCCESS(http_send_status_header(status, LOC));
efree(LOC);
return;
- break;
case HTTP_REDIRECT_PERM:
case HTTP_REDIRECT_FOUND:
case HTTP_REDIRECT_POST:
case HTTP_REDIRECT_PROXY:
case HTTP_REDIRECT_TEMP:
- break;
+ break;
case 306:
default:
} else {
status = HTTP_REDIRECT_FOUND;
}
- break;
+ break;
}
RETURN_SUCCESS(http_exit_ex(status, LOC, RED, 1));
FOREACH_VAL(pos, allowed_extras_array, entry) {
ZVAL_ADDREF(*entry);
convert_to_string_ex(entry);
- allowed_extras[i] = estrndup(Z_STRVAL_PP(entry), Z_STRLEN_PP(entry));
+ allowed_extras[i++] = estrndup(Z_STRVAL_PP(entry), Z_STRLEN_PP(entry));
zval_ptr_dtor(entry);
}
}
efree(allowed_extras);
}
}
+/* }}} */
-/* {{{ proto object http_parse_params(string param)
+/* {{{ proto string http_build_cookie(array cookie)
+ *
+ * Build a cookie string from an array/object like returned by http_parse_cookie().
+ */
+PHP_FUNCTION(http_build_cookie)
+{
+ char *str = NULL;
+ size_t len = 0;
+ zval *strct;
+ http_cookie_list list;
+
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &strct)) {
+ RETURN_FALSE;
+ }
+
+ http_cookie_list_fromstruct(&list, strct);
+ http_cookie_list_tostring(&list, &str, &len);
+ http_cookie_list_dtor(&list);
+
+ RETURN_STRINGL(str, len, 0);
+}
+/* }}} */
+
+/* {{{ proto object http_parse_params(string param[, int flags = HTTP_PARAMS_DEFAULT])
*
* Parse parameter list.
*/
{
char *param;
int param_len;
+ zval *params;
+ long flags = HTTP_PARAMS_DEFAULT;
- if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", ¶m, ¶m_len)) {
+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", ¶m, ¶m_len, &flags)) {
RETURN_FALSE;
}
- object_init(return_value);
- if (SUCCESS != http_parse_params(param, HASH_OF(return_value))) {
- zval_dtor(return_value);
+ params = ecalloc(1, sizeof(zval));
+ array_init(params);
+ if (SUCCESS != http_parse_params(param, flags, Z_ARRVAL_P(params))) {
+ zval_dtor(params);
+ FREE_ZVAL(params);
RETURN_FALSE;
}
+ object_init(return_value);
+ add_property_zval(return_value, "params", params);
}
/* }}} */
* - cookies: array, list of cookies as associative array
* like array("cookie" => "value")
* - encodecookies: bool, whether to urlencode the cookies (default: true)
- * - resetcookies: bool, wheter to reset the cookies
* - cookiestore: string, path to a file where cookies are/will be stored
- * - cookiesession: bool, accept (true) or reset (false) sessioncookies
+ * - cookiesession: bool, don't load session cookies from cookiestore if TRUE
* - resume: int, byte offset to start the download from;
* if the server supports ranges
* - range: array, array of arrays, each containing two integers,
}
/* }}} */
-static char *file_get_contents(char *file, size_t *len TSRMLS_DC)
-{
- php_stream *s = NULL;
- char *buf = NULL;
-
- if ((s = php_stream_open_wrapper_ex(file, "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL, HTTP_DEFAULT_STREAM_CONTEXT))) {
- *len = php_stream_copy_to_mem(s, &buf, (size_t) -1, 0);
- php_stream_close(s);
- } else {
- *len = 0;
- }
- return buf;
-}
-struct FormData {
- struct FormData *next;
- int type;
- char *line;
- size_t length;
-};
-CURLcode Curl_getFormData(struct FormData **, struct curl_httppost *post, curl_off_t *size);
-
/* {{{ proto string http_request_body_encode(array fields, array files)
*
* Generate x-www-form-urlencoded resp. form-data encoded request body.
zval *fields = NULL, *files = NULL;
HashTable *fields_ht, *files_ht;
http_request_body body;
- phpstr rbuf;
- struct FormData *data, *ptr;
- curl_off_t size;
- char *fdata = NULL;
- size_t fsize = 0;
- CURLcode rc;
- int fgc_error = 0;
+ char *buf;
+ size_t len;
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a!a!", &fields, &files)) {
RETURN_FALSE;
fields_ht = (fields && Z_TYPE_P(fields) == IS_ARRAY) ? Z_ARRVAL_P(fields) : NULL;
files_ht = (files && Z_TYPE_P(files) == IS_ARRAY) ? Z_ARRVAL_P(files) : NULL;
- if (!http_request_body_fill(&body, fields_ht, files_ht)) {
- RETURN_FALSE;
- }
-
- switch (body.type)
- {
- case HTTP_REQUEST_BODY_CURLPOST:
- if (CURLE_OK != (rc = Curl_getFormData(&data, body.data, &size))) {
- http_error_ex(HE_WARNING, HTTP_E_RUNTIME, "Could not encode request body: %s", curl_easy_strerror(rc));
- RETVAL_FALSE;
- } else {
- phpstr_init_ex(&rbuf, (size_t) size, PHPSTR_INIT_PREALLOC);
- for (ptr = data; ptr; ptr = ptr->next) {
- if (!fgc_error) {
- if (ptr->type) {
- if ((fdata = file_get_contents(ptr->line, &fsize TSRMLS_CC))) {
- phpstr_append(&rbuf, fdata, fsize);
- efree(fdata);
- } else {
- fgc_error = 1;
- }
- } else {
- phpstr_append(&rbuf, ptr->line, ptr->length);
- }
- }
- curl_free(ptr->line);
- }
- curl_free(data);
- if (fgc_error) {
- phpstr_dtor(&rbuf);
- RETVAL_FALSE;
- } else {
- RETVAL_PHPSTR_VAL(&rbuf);
- }
- }
- http_request_body_dtor(&body);
- break;
-
- case HTTP_REQUEST_BODY_CSTRING:
- RETVAL_STRINGL(body.data, body.size, 0);
- break;
-
- default:
- http_request_body_dtor(&body);
- RETVAL_FALSE;
- break;
+ if (http_request_body_fill(&body, fields_ht, files_ht) && (SUCCESS == http_request_body_encode(&body, &buf, &len))) {
+ RETVAL_STRINGL(buf, len, 0);
+ } else {
+ http_error(HE_WARNING, HTTP_E_RUNTIME, "Could not encode request body");
+ RETVAL_FALSE;
}
+ http_request_body_dtor(&body);
}
#endif /* HTTP_HAVE_CURL */
/* }}} HAVE_CURL */
RETURN_FALSE;
}
- switch (Z_TYPE_P(method))
- {
+ switch (Z_TYPE_P(method)) {
case IS_OBJECT:
convert_to_string(method);
case IS_STRING:
*/
PHP_FUNCTION(http_request_method_exists)
{
- IF_RETVAL_USED {
+ if (return_value_used) {
zval *method;
if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &method)) {
RETURN_FALSE;
}
- switch (Z_TYPE_P(method))
- {
+ switch (Z_TYPE_P(method)) {
case IS_OBJECT:
convert_to_string(method);
case IS_STRING:
*/
PHP_FUNCTION(http_request_method_name)
{
- IF_RETVAL_USED {
+ if (return_value_used) {
long method;
if ((SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &method)) || (method < 0)) {
projects / m6w6 / ext-http / blobdiff