X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_functions.c;h=bf1e19393557e10c0105bec88a384c755ab7b2f7;hp=e894b19ebe4ec892a94e3fb7fab5f0c1533c5b5b;hb=84a00407857506ab8cfb9335cbe5f495a68e0880;hpb=dbc4ec02cd319000b5c8589910047cfe6d5738be

diff --git a/http_functions.c b/http_functions.c
index e894b19..bf1e193 100644
--- a/http_functions.c
+++ b/http_functions.c
@@ -21,7 +21,7 @@
 #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
 
@@ -55,7 +55,7 @@ PHP_FUNCTION(http_date)
 	}
 
 	if (t == -1) {
-		t = (long) HTTP_GET_REQUEST_TIME();
+		t = HTTP_G->request.time;
 	}
 
 	RETURN_STRING(http_date(t), 0);
@@ -430,7 +430,7 @@ PHP_FUNCTION(http_send_last_modified)
 	}
 
 	if (t == -1) {
-		t = (long) HTTP_GET_REQUEST_TIME();
+		t = HTTP_G->request.time;
 	}
 
 	RETURN_SUCCESS(http_send_last_modified(t));
@@ -510,7 +510,7 @@ PHP_FUNCTION(http_match_modified)
 
 	// current time if not supplied (senseless though)
 	if (t == -1) {
-		t = (long) HTTP_GET_REQUEST_TIME();
+		t = HTTP_G->request.time;
 	}
 
 	if (for_range) {
@@ -565,7 +565,7 @@ PHP_FUNCTION(http_match_etag)
  * 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)
 {
@@ -578,7 +578,7 @@ 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) {
@@ -605,7 +605,7 @@ PHP_FUNCTION(http_cache_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
@@ -614,7 +614,7 @@ PHP_FUNCTION(http_cache_last_modified)
  * 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)
 {
@@ -634,7 +634,7 @@ 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)
 {
@@ -713,7 +713,7 @@ PHP_FUNCTION(http_throttle)
  * 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)
 {
@@ -728,7 +728,7 @@ PHP_FUNCTION(http_redirect)
 		RETURN_FALSE;
 	}
 
-#ifdef HAVE_PHP_SESSION
+#ifdef HTTP_HAVE_SESSION
 	/* append session info */
 	if (session) {
 		if (!params) {
@@ -1670,6 +1670,7 @@ PHP_FUNCTION(http_request)
 }
 /* }}} */
 
+#ifdef HAVE_CURL_GETFORMDATA
 static char *file_get_contents(char *file, size_t *len TSRMLS_DC)
 {
 	php_stream *s = NULL;
@@ -1763,6 +1764,7 @@ PHP_FUNCTION(http_request_body_encode)
 			break;
 	}
 }
+#endif /* HAVE_CURL_GETFORMDATA */
 #endif /* HTTP_HAVE_CURL */
 /* }}} HAVE_CURL */