Merge branch 'PHP-7.2'

jedisct1 · jedisct1 · commit 85fe49cf104d · 2017-08-22T09:47:51.000+02:00
* PHP-7.2:
  sodium ext: If sodium_init() returns 1, this is fine.
diff --git a/ext/sodium/libsodium.c b/ext/sodium/libsodium.c
@@ -341,7 +341,7 @@ PHP_MINIT_FUNCTION(sodium)
 {
 	zend_class_entry ce;
 
-	if (sodium_init() != 0) {
+	if (sodium_init() < 0) {
 		zend_error(E_ERROR, "sodium_init()");
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ PHP_MINIT_FUNCTION(sodium)`
`341`	`341`	`{`
`342`	`342`	`zend_class_entry ce;`
`343`	`343`
`344`		`- if (sodium_init() != 0) {`
	`344`	`+ if (sodium_init() < 0) {`
`345`	`345`	`zend_error(E_ERROR, "sodium_init()");`
`346`	`346`	`}`
`347`	`347`