Merge branch 'PHP-7.4'

* PHP-7.4: Make bug52820.phpt more robust Explicitly start mysql Use "set -e" in some pipeline steps
gerardroche · Mar 18, 2020 · e957a8c · e957a8c
2 parents 70ef2f3 + ba6834f
commit e957a8c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/azure/i386/job.yml b/azure/i386/job.yml
@@ -70,6 +70,7 @@ jobs:
     - script: make -j$(/usr/bin/nproc) >/dev/null
       displayName: 'Make Build'
     - script: |
+        set -e
         sudo make install
         sudo mkdir     /etc/php.d
         sudo chmod 777 /etc/php.d
@@ -79,6 +80,8 @@ jobs:
         echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini
       displayName: 'Install Build'
     - script: |
+        set -e
+        sudo service mysql start
         mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
         sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';"
         sudo -u postgres psql -c "CREATE DATABASE test;"

diff --git a/azure/install.yml b/azure/install.yml
@@ -1,5 +1,6 @@
 steps:
   - script: |
+      set -e
       sudo make install
       sudo mkdir     /etc/php.d
       sudo chmod 777 /etc/php.d

diff --git a/azure/job.yml b/azure/job.yml
@@ -18,6 +18,8 @@ jobs:
       displayName: 'Make Build'
     - template: install.yml
     - script: |
+        set -e
+        sudo service mysql start
         mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
         sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';"
         sudo -u postgres psql -c "CREATE DATABASE test;"

diff --git a/azure/msan_job.yml b/azure/msan_job.yml
@@ -63,6 +63,7 @@ jobs:
         echo pdo_mysql.default_socket=/var/run/mysqld/mysqld.sock  > /etc/php.d/pdo_mysql.ini
       displayName: 'Install Build'
     - script: |
+        sudo service mysql start
         mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
       displayName: 'Setup'
     - template: test.yml

diff --git a/ext/standard/tests/file/bug52820.phpt b/ext/standard/tests/file/bug52820.phpt
@@ -7,15 +7,15 @@ if (!function_exists('zend_leak_variable'))
 /* unfortunately no standard function does a cast to FILE*, so we need
  * curl to test this */
 if (!extension_loaded("curl")) exit("skip curl extension not loaded");
-$handle=curl_init('http://127.0.0.1:37349/');
+$handle=curl_init('file:///i_dont_exist/');
 curl_setopt($handle, CURLOPT_VERBOSE, true);
 curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
 if (!@curl_setopt($handle, CURLOPT_STDERR, fopen("php://memory", "w+")))
     die("skip fopencookie not supported on this platform");
 --FILE--
 <?php
 function do_stuff($url) {
-    $handle=curl_init('http://127.0.0.1:37349/');
+    $handle=curl_init('file:///i_dont_exist/');
     curl_setopt($handle, CURLOPT_VERBOSE, true);
     curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
     curl_setopt($handle, CURLOPT_STDERR, $o = fopen($url, "w+"));
@@ -42,22 +42,22 @@ echo "\nDone.\n";
 --EXPECTF--
 temp stream (close after):
 About to rewind!
-* %ATrying 127.0.0.1...%AConnection refused%A
+* Couldn't open file /i_dont_exist/
 * Closing connection%A%d
 
 memory stream (close after):
 About to rewind!
-* %ATrying 127.0.0.1...%AConnection refused%A
+* Couldn't open file /i_dont_exist/
 * Closing connection%A%d
 
 temp stream (leak):
 About to rewind!
-* %ATrying 127.0.0.1...%AConnection refused%A
+* Couldn't open file /i_dont_exist/
 * Closing connection%A%d
 
 memory stream (leak):
 About to rewind!
-* %ATrying 127.0.0.1...%AConnection refused%A
+* Couldn't open file /i_dont_exist/
 * Closing connection%A%d
 
 Done.