#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) {
}
}
-/* {{{ proto object http_parse_params(string param)
+/* {{{ 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;
}
params = ecalloc(1, sizeof(zval));
array_init(params);
- if (SUCCESS != http_parse_params(param, Z_ARRVAL_P(params))) {
+ if (SUCCESS != http_parse_params(param, flags, Z_ARRVAL_P(params))) {
zval_dtor(params);
FREE_ZVAL(params);
RETURN_FALSE;
}
/* }}} */
+#ifdef HAVE_CURL_GETFORMDATA
static char *file_get_contents(char *file, size_t *len TSRMLS_DC)
{
php_stream *s = NULL;
break;
}
}
+#endif /* HAVE_CURL_GETFORMDATA */
#endif /* HTTP_HAVE_CURL */
/* }}} HAVE_CURL */