sniper          Fri Apr  4 11:18:15 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /php4/ext/curl      curl.c 
  Log:
  Fix bug #23048, CURLOPT_ENCODING is not always available
  
Index: php4/ext/curl/curl.c
diff -u php4/ext/curl/curl.c:1.124.2.7 php4/ext/curl/curl.c:1.124.2.8
--- php4/ext/curl/curl.c:1.124.2.7      Wed Apr  2 06:42:16 2003
+++ php4/ext/curl/curl.c        Fri Apr  4 11:18:15 2003
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: curl.c,v 1.124.2.7 2003/04/02 11:42:16 sniper Exp $ */
+/* $Id: curl.c,v 1.124.2.8 2003/04/04 16:18:15 sniper Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -191,7 +191,9 @@
        REGISTER_CURL_CONSTANT(CURLOPT_SSLENGINE);
        REGISTER_CURL_CONSTANT(CURLOPT_SSLENGINE_DEFAULT);
        REGISTER_CURL_CONSTANT(CURLOPT_CRLF);
+#ifdef CURLOPT_ENCODING
        REGISTER_CURL_CONSTANT(CURLOPT_ENCODING);
+#endif
                
        /* Constants effecting the way CURLOPT_CLOSEPOLICY works */
        REGISTER_CURL_CONSTANT(CURLCLOSEPOLICY_LEAST_RECENTLY_USED);
@@ -740,8 +742,10 @@
                case CURLOPT_SSLKEYTYPE: 
                case CURLOPT_SSLKEYPASSWD: 
                case CURLOPT_SSLENGINE: 
-               case CURLOPT_SSLENGINE_DEFAULT:
-               case CURLOPT_ENCODING: {
+#ifdef CURLOPT_ENCODING
+               case CURLOPT_ENCODING: 
+#endif
+               case CURLOPT_SSLENGINE_DEFAULT: {
                        char *copystr = NULL;
        
                        convert_to_string_ex(zvalue);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to