Merge branch 'PHP-5.6'

rdlowrey · rdlowrey · commit fe29b8134cba · 2015-03-04T23:00:59.000-07:00
* PHP-5.6:
  hexadecimal is case*in*sensitive

Conflicts:
	ext/openssl/xp_ssl.c
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
@@ -313,7 +313,7 @@ static int php_x509_fingerprint_cmp(X509 *peer, const char *method, const char *
 
 	fingerprint = php_openssl_x509_fingerprint(peer, method, 0);
 	if (fingerprint) {
-		result = strcmp(expected, fingerprint->val);
+		result = strcasecmp(expected, fingerprint->val);
 		zend_string_release(fingerprint);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,7 @@ static int php_x509_fingerprint_cmp(X509 peer, const char method, const char *`
`313`	`313`
`314`	`314`	`fingerprint = php_openssl_x509_fingerprint(peer, method, 0);`
`315`	`315`	`if (fingerprint) {`
`316`		`- result = strcmp(expected, fingerprint->val);`
	`316`	`+ result = strcasecmp(expected, fingerprint->val);`
`317`	`317`	`zend_string_release(fingerprint);`
`318`	`318`	`}`
`319`	`319`