- attempt to fix gcc-2.95 build by using less HTTP_HAVE_$EXT magic

[m6w6/ext-http] / http_functions.c

diff --git a/http_functions.c b/http_functions.c
index ad220d3024c349849303ff1aee2a47fb881ae5bf..bf1e19393557e10c0105bec88a384c755ab7b2f7 100644 (file)
--- 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
 
@@ -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)
 {
@@ -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)
 {
@@ -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 */