diff options
author | Pierrick Charron <pierrick@php.net> | 2016-07-27 23:39:34 -0400 |
---|---|---|
committer | Pierrick Charron <pierrick@php.net> | 2016-07-27 23:39:34 -0400 |
commit | 8d44942912e3231623d84b025f727a2f019fc290 (patch) | |
tree | 10a3cbccdb53dc7ba20cbe29e311028524dfa4c9 /ext | |
parent | 206f9f1337991887ed1e2e2300a116554ecbc79b (diff) | |
parent | bf37b97d9cedccf01f6b1cfe9ee61102ac14e2a0 (diff) | |
download | php-git-8d44942912e3231623d84b025f727a2f019fc290.tar.gz |
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'ext')
-rw-r--r-- | ext/curl/interface.c | 43 |
1 files changed, 1 insertions, 42 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 8a6f44a3f0..a20d60ca36 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -1884,38 +1884,6 @@ php_curl *alloc_curl_handle() /* }}} */ #if LIBCURL_VERSION_NUM >= 0x071301 /* Available since 7.19.1 */ -/* {{{ split_certinfo - */ -static void split_certinfo(char *string, zval *hash) -{ - char *org = estrdup(string); - char *s = org; - char *split; - - if(org) { - do { - char *key; - char *val; - char *tmp; - - split = strstr(s, "; "); - if(split) - *split = '\0'; - - key = s; - tmp = memchr(key, '=', 64); - if(tmp) { - *tmp = '\0'; - val = tmp+1; - add_assoc_string(hash, key, val); - } - s = split+2; - } while(split); - efree(org); - } -} -/* }}} */ - /* {{{ create_certinfo */ static void create_certinfo(struct curl_certinfo *ci, zval *listcode) @@ -1938,16 +1906,7 @@ static void create_certinfo(struct curl_certinfo *ci, zval *listcode) if(tmp) { *tmp = '\0'; len = strlen(s); - if (!strcmp(s, "Subject") || !strcmp(s, "Issuer")) { - zval hash; - - array_init(&hash); - - split_certinfo(&slist->data[len+1], &hash); - add_assoc_zval(&certhash, s, &hash); - } else { - add_assoc_string(&certhash, s, &slist->data[len+1]); - } + add_assoc_string(&certhash, s, &slist->data[len+1]); } else { php_error_docref(NULL, E_WARNING, "Could not extract hash key from certificate info"); } |