Merge branch 'master' into jit-dynasm

Author: laruence

.travis.yml

@@ -16,6 +16,7 @@ addons:
       - libsasl2-dev
       - libxpm-dev
       - libt1-dev
+      - libzip-dev
 
 notifications:
     email: 

NEWS

@@ -43,6 +43,9 @@ PHP                                                                        NEWS
   . Fixed bug #74631 (PDO_PCO with PHP-FPM: OCI environment initialized
     before PHP-FPM sets it up). (Ingmar Runge)
 
+- PDO SQLite
+  . Add support for additional open flags
+
 - phar:
   . Fixed bug #74991 (include_path has a 4096 char limit in some cases).
     (bwbroersma)

UPGRADING

@@ -73,6 +73,10 @@ Date:
   . Support for ODBCRouter has been removed.
   . Support for Birdstep has been removed.
 
+ ZIP:
+  . Bunled libzip have been dropped,
+    system library is now required.
+
 ========================================
 10. New Global Constants
 ========================================

Zend/zend_builtin_functions.c

@@ -1176,7 +1176,7 @@ ZEND_FUNCTION(get_object_vars)
 				 */
 				zend_hash_str_add_new(Z_ARRVAL_P(return_value), prop_name, prop_len, value);
 			} else {
-				zend_symbtable_add_new(Z_ARRVAL_P(return_value), key, value);
+				zend_symtable_add_new(Z_ARRVAL_P(return_value), key, value);
 			}
 		} ZEND_HASH_FOREACH_END();
 	}

Zend/zend_hash.h

@@ -346,7 +346,7 @@ static zend_always_inline int zend_hash_str_exists_ind(const HashTable *ht, cons
 			Z_TYPE_P(Z_INDIRECT_P(zv)) != IS_UNDEF);
 }
 
-static zend_always_inline zval *zend_symbtable_add_new(HashTable *ht, zend_string *key, zval *pData)
+static zend_always_inline zval *zend_symtable_add_new(HashTable *ht, zend_string *key, zval *pData)
 {
 	zend_ulong idx;
 

ext/bcmath/libbcmath/src/divmod.c

@@ -59,7 +59,7 @@ bc_divmod (bc_num num1, bc_num num2, bc_num *quot, bc_num *rem, int scale)
   bc_init_num(&temp);
 
   /* Calculate it. */
-  bc_divide (num1, num2, &temp, scale);
+  bc_divide (num1, num2, &temp, 0);
   if (quot)
     quotient = bc_copy_num (temp);
   bc_multiply (temp, num2, &temp, rscale);

ext/bcmath/libbcmath/src/raisemod.c

@@ -75,17 +75,24 @@ bc_raisemod (bc_num base, bc_num expo, bc_num mod, bc_num *result, int scale)
 
   /* Do the calculation. */
   rscale = MAX(scale, base->n_scale);
-  while ( !bc_is_zero(exponent) )
+  if ( !bc_compare(mod, BCG(_one_)) )
     {
-      (void) bc_divmod (exponent, BCG(_two_), &exponent, &parity, 0);
-      if ( !bc_is_zero(parity) )
+      temp = bc_new_num (1, scale);
+    }
+  else
+    {
+      while ( !bc_is_zero(exponent) )
 	{
-	  bc_multiply (temp, power, &temp, rscale);
-	  (void) bc_modulo (temp, mod, &temp, scale);
+	  (void) bc_divmod (exponent, BCG(_two_), &exponent, &parity, 0);
+	  if ( !bc_is_zero(parity) )
+	    {
+	      bc_multiply (temp, power, &temp, rscale);
+	      (void) bc_modulo (temp, mod, &temp, scale);
+	    }
+
+	  bc_multiply (power, power, &power, rscale);
+	  (void) bc_modulo (power, mod, &power, scale);
 	}
-
-      bc_multiply (power, power, &power, rscale);
-      (void) bc_modulo (power, mod, &power, scale);
     }
 
   /* Assign the value. */

ext/bcmath/tests/bug44995.phpt

@@ -0,0 +1,16 @@
+--TEST--
+Bug #44995 (bcpowmod() fails if scale != 0)
+--SKIPIF--
+<?php
+if (!extension_loaded('bcmath')) die('skip bcmath extension not available');
+?>
+--FILE--
+<?php
+var_dump(bcpowmod('4', '4', '3', 1));
+var_dump(bcpowmod('3234', '32345', '22345', 1));
+?>
+===DONE===
+--EXPECT--
+string(3) "1.0"
+string(7) "17334.0"
+===DONE===

ext/bcmath/tests/bug54598.phpt

@@ -0,0 +1,16 @@
+--TEST--
+Bug #54598 (bcpowmod() may return 1 if modulus is 1)
+--SKIPIF--
+<?php
+if (!extension_loaded('bcmath')) die('skip bcmath extension is not available');
+?>
+--FILE--
+<?php
+var_dump(bcpowmod(5, 0, 1));
+var_dump(bcpowmod(5, 0, 1, 3));
+?>
+===DONE===
+--EXPECT--
+string(1) "0"
+string(5) "0.000"
+===DONE===

ext/curl/tests/curl_multi_close_basic001.phpt

@@ -0,0 +1,25 @@
+--TEST--
+curl_multi_close return false when suplied resorce not valid cURL multi handle
+--SKIPIF--
+<?php
+if (!extension_loaded('curl')) print 'skip';
+?>
+--FILE--
+<?php
+$cmh = curl_multi_init();
+var_dump($cmh);
+$multi_close_result = curl_multi_close($cmh);
+var_dump($multi_close_result);
+var_dump($cmh);
+$bad_mh_close_result = curl_multi_close($cmh);
+var_dump($bad_mh_close_result);
+?>
+===DONE===
+--EXPECTF--
+resource(%d) of type (curl_multi)
+NULL
+resource(%d) of type (Unknown)
+
+Warning: curl_multi_close(): supplied resource is not a valid cURL Multi Handle resource in %s on line %d
+bool(false)
+===DONE===