Merge branch 'v2.6.x'
authorMichael Wallner <mike@php.net>
Tue, 24 May 2016 18:27:30 +0000 (20:27 +0200)
committerMichael Wallner <mike@php.net>
Tue, 24 May 2016 18:27:30 +0000 (20:27 +0200)
1  2 
src/php_http_client_curl.c

@@@ -1795,9 -1771,16 +1795,15 @@@ static ZEND_RESULT_CODE php_http_curlm_
        } else {
                rc = curl_share_setopt(curl->handle->share, CURLSHOPT_UNSHARE, CURL_LOCK_DATA_COOKIE);
        }
-       return CURLSHE_OK == rc ? SUCCESS : FAILURE;
+       if (CURLSHE_OK != rc) {
 -              TSRMLS_FETCH_FROM_CTX(client->ts);
 -              php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not set option %s (%s)", opt->name.s, curl_share_strerror(rc));
++              php_error_docref(NULL, E_NOTICE, "Could not set option %s (%s)", opt->name->val, curl_share_strerror(rc));
+               return FAILURE;
+       }
+       return SUCCESS;
  }
  
+ #if PHP_HTTP_CURL_VERSION(7,23,0)
  static ZEND_RESULT_CODE php_http_curlm_option_set_share_ssl(php_http_option_t *opt, zval *value, void *userdata)
  {
        php_http_client_t *client = userdata;
        } else {
                rc = curl_share_setopt(curl->handle->share, CURLSHOPT_UNSHARE, CURL_LOCK_DATA_SSL_SESSION);
        }
-       return CURLSHE_OK == rc ? SUCCESS : FAILURE;
+       if (CURLSHE_OK != rc) {
 -              TSRMLS_FETCH_FROM_CTX(client->ts);
 -              php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not set option %s (%s)", opt->name.s, curl_share_strerror(rc));
++              php_error_docref(NULL, E_NOTICE, "Could not set option %s (%s)", opt->name->val, curl_share_strerror(rc));
+               return FAILURE;
+       }
+       return SUCCESS;
  }
+ #endif
  
 -static void php_http_curlm_options_init(php_http_options_t *registry TSRMLS_DC)
 +static void php_http_curlm_options_init(php_http_options_t *registry)
  {
        php_http_option_t *opt;
  
        }
  #endif
        /* share */
 -      if ((opt = php_http_option_register(registry, ZEND_STRL("share_cookies"), 0, IS_BOOL))) {
 +      if ((opt = php_http_option_register(registry, ZEND_STRL("share_cookies"), 0, _IS_BOOL))) {
                opt->setter = php_http_curlm_option_set_share_cookies;
 -              ZVAL_BOOL(&opt->defval, 1);
 +              ZVAL_TRUE(&opt->defval);
        }
 -      if ((opt = php_http_option_register(registry, ZEND_STRL("share_ssl"), 0, IS_BOOL))) {
+ #if PHP_HTTP_CURL_VERSION(7,23,0)
 +      if ((opt = php_http_option_register(registry, ZEND_STRL("share_ssl"), 0, _IS_BOOL))) {
                opt->setter = php_http_curlm_option_set_share_ssl;
 -              ZVAL_BOOL(&opt->defval, 1);
 +              ZVAL_TRUE(&opt->defval);
        }
+ #endif
  }
  
  static ZEND_RESULT_CODE php_http_curlm_set_option(php_http_option_t *opt, zval *val, void *userdata)
                rv = opt->setter(opt, val, client);
        } else {
                switch (opt->type) {
 -              case IS_BOOL:
 -                      if (CURLM_OK != (rc = curl_multi_setopt(ch, opt->option, (long) Z_BVAL_P(val)))) {
 +              case _IS_BOOL:
 +                      if (CURLM_OK != (rc = curl_multi_setopt(ch, opt->option, (long) zend_is_true(val)))) {
                                rv = FAILURE;
 -                              php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not set option %s (%s)", opt->name.s, curl_multi_strerror(rc));
++                              php_error_docref(NULL, E_NOTICE, "Could not set option %s (%s)", opt->name->val, curl_multi_strerror(rc));
                        }
                        break;
                case IS_LONG:
                        if (CURLM_OK != (rc = curl_multi_setopt(ch, opt->option, Z_LVAL_P(val)))) {
                                rv = FAILURE;
 -                              php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not set option %s (%s)", opt->name.s, curl_multi_strerror(rc));
++                              php_error_docref(NULL, E_NOTICE, "Could not set option %s (%s)", opt->name->val, curl_multi_strerror(rc));
                        }
                        break;
                default:
                        rv = FAILURE;
 -                      php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Could not set option %s", opt->name.s);
++                      php_error_docref(NULL, E_NOTICE, "Could not set option %s", opt->name->val);
                        break;
                }
        }
  
        if (val && val != orig && val != &opt->defval) {
 -              zval_ptr_dtor(&val);
 +              zval_ptr_dtor(val);
        }
  
-       if (rv != SUCCESS) {
-               php_error_docref(NULL, E_NOTICE, "Could not set option %s (%s)", opt->name->val, curl_easy_strerror(rc));
-       }
        return rv;
  }