* more compatibility
authorMichael Wallner <mike@php.net>
Tue, 22 Feb 2005 12:06:19 +0000 (12:06 +0000)
committerMichael Wallner <mike@php.net>
Tue, 22 Feb 2005 12:06:19 +0000 (12:06 +0000)
http.c

diff --git a/http.c b/http.c
index e174ba11f241aa21e7efe0d2dd24a6173b1dad89..6e798f5fc5c4263eb8e8f1a67d40586a687d7fef 100644 (file)
--- a/http.c
+++ b/http.c
@@ -765,7 +765,7 @@ void _httpi_request_destroy_object(void *object, zend_object_handle handle TSRML
 void _httpi_request_free_object(zend_object /* void */ *object TSRMLS_DC)
 {
        httpi_request_object *o = (httpi_request_object *) object;
 void _httpi_request_free_object(zend_object /* void */ *object TSRMLS_DC)
 {
        httpi_request_object *o = (httpi_request_object *) object;
-       
+
        if (OBJ_PROP(o)) {
                zend_hash_destroy(OBJ_PROP(o));
                FREE_HASHTABLE(OBJ_PROP(o));
        if (OBJ_PROP(o)) {
                zend_hash_destroy(OBJ_PROP(o));
                FREE_HASHTABLE(OBJ_PROP(o));
@@ -868,9 +868,9 @@ PHP_METHOD(HTTPi_Request, __construct)
 PHP_METHOD(HTTPi_Request, __destruct)
 {
        getObject(httpi_request_object, obj);
 PHP_METHOD(HTTPi_Request, __destruct)
 {
        getObject(httpi_request_object, obj);
-       
+
        NO_ARGS;
        NO_ARGS;
-       
+
        FREE_PARR(obj, options);
        FREE_PARR(obj, responseInfo);
        FREE_PARR(obj, responseData);
        FREE_PARR(obj, options);
        FREE_PARR(obj, responseInfo);
        FREE_PARR(obj, responseData);
@@ -2272,7 +2272,7 @@ PHP_MINIT_FUNCTION(http)
        ZEND_INIT_MODULE_GLOBALS(http, php_http_init_globals, NULL);
        REGISTER_INI_ENTRIES();
 
        ZEND_INIT_MODULE_GLOBALS(http, php_http_init_globals, NULL);
        REGISTER_INI_ENTRIES();
 
-#ifdef HTTP_HAVE_CURL
+#if defined(HTTP_HAVE_CURL) && (LIBCURL_VERSION_NUM >= 0x070a05)
        REGISTER_LONG_CONSTANT("HTTP_AUTH_BASIC", CURLAUTH_BASIC, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("HTTP_AUTH_DIGEST", CURLAUTH_DIGEST, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("HTTP_AUTH_NTLM", CURLAUTH_NTLM, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("HTTP_AUTH_BASIC", CURLAUTH_BASIC, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("HTTP_AUTH_DIGEST", CURLAUTH_DIGEST, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("HTTP_AUTH_NTLM", CURLAUTH_NTLM, CONST_CS | CONST_PERSISTENT);