Merge branch 'PHP-5.4' into PHP-5.5

kaplanlior · kaplanlior · commit 356c44255866 · 2014-03-13T12:40:14.000+02:00
* PHP-5.4:
  Typo fix: sicret -&gt; secret
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
@@ -5077,7 +5077,7 @@ PHP_FUNCTION(openssl_cipher_iv_length)
 
 
 /* {{{ proto string openssl_dh_compute_key(string pub_key, resource dh_key)
-   Computes shared sicret for public value of remote DH key and local DH key */
+   Computes shared secret for public value of remote DH key and local DH key */
 PHP_FUNCTION(openssl_dh_compute_key)
 {
 	zval *key;

Original file line number	Diff line number	Diff line change
`@@ -5077,7 +5077,7 @@ PHP_FUNCTION(openssl_cipher_iv_length)`
`5077`	`5077`
`5078`	`5078`
`5079`	`5079`	`/* {{{ proto string openssl_dh_compute_key(string pub_key, resource dh_key)`
`5080`		`- Computes shared sicret for public value of remote DH key and local DH key */`
	`5080`	`+ Computes shared secret for public value of remote DH key and local DH key */`
`5081`	`5081`	`PHP_FUNCTION(openssl_dh_compute_key)`
`5082`	`5082`	`{`
`5083`	`5083`	`zval *key;`