From 6589da0e87798e8be8c8080c3b8fefc3a729e17d Mon Sep 17 00:00:00 2001
From: Paul Tarjan <ptarjan@fb.com>
Date: Thu, 2 May 2013 21:23:22 -0700
Subject: [PATCH] lots of race conditions in zlib

---
 hphp/test/zend/bad/ext-zlib/gzopen_basic2.php |  2 +-
 hphp/test/zend/bad/ext-zlib/gzwrite_error.php |  2 +-
 .../test/zend/bad/ext-zlib/gzwrite_error2.php |  2 +-
 .../ext-zlib/zlib_wrapper_fflush_basic.php    |  2 +-
 .../ext-zlib/zlib_wrapper_ftruncate_basic.php |  2 +-
 .../zend/good/ext-zlib/gzeof_variation1.php   |  2 +-
 hphp/test/zend/good/ext-zlib/gzputs_basic.php |  2 +-
 .../zend/good/ext-zlib/gzread_variation1.php  |  2 +-
 .../test/zend/good/ext-zlib/gzwrite_basic.php |  2 +-
 hphp/tools/import_zend_test.py                | 19 ++++++++++++++++++-
 10 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/hphp/test/zend/bad/ext-zlib/gzopen_basic2.php b/hphp/test/zend/bad/ext-zlib/gzopen_basic2.php
index 84a125bd6..4889fdf78 100644
--- a/hphp/test/zend/bad/ext-zlib/gzopen_basic2.php
+++ b/hphp/test/zend/bad/ext-zlib/gzopen_basic2.php
@@ -9,7 +9,7 @@ echo "*** Testing gzopen() : basic functionality ***\n";
 
 
 // Initialise all required variables
-$filename = "temp.txt.gz";
+$filename = "gzopen_basic2.gz";
 $modes = array('w', 'w+');
 $data = "This was the information that was written";
 
diff --git a/hphp/test/zend/bad/ext-zlib/gzwrite_error.php b/hphp/test/zend/bad/ext-zlib/gzwrite_error.php
index 620848c71..0bf274a86 100644
--- a/hphp/test/zend/bad/ext-zlib/gzwrite_error.php
+++ b/hphp/test/zend/bad/ext-zlib/gzwrite_error.php
@@ -1,5 +1,5 @@
 <?php
-$filename = "temp.txt.gz";
+$filename = "gzwrite_error.gz";
 $h = gzopen($filename, 'w');
 $str = "Here is the string to be written. ";
 $length = 10;
diff --git a/hphp/test/zend/bad/ext-zlib/gzwrite_error2.php b/hphp/test/zend/bad/ext-zlib/gzwrite_error2.php
index 4b8543dab..76011ae2d 100644
--- a/hphp/test/zend/bad/ext-zlib/gzwrite_error2.php
+++ b/hphp/test/zend/bad/ext-zlib/gzwrite_error2.php
@@ -1,6 +1,6 @@
 <?php
 
-$filename = "temp.txt.gz";
+$filename = "gzwrite_error2.gz";
 $h = gzopen($filename, 'w');
 $str = "Here is the string to be written. ";
 var_dump(gzwrite( $h, $str, 0 ) );
diff --git a/hphp/test/zend/bad/ext-zlib/zlib_wrapper_fflush_basic.php b/hphp/test/zend/bad/ext-zlib/zlib_wrapper_fflush_basic.php
index b1dac7b9d..aec03a4eb 100644
--- a/hphp/test/zend/bad/ext-zlib/zlib_wrapper_fflush_basic.php
+++ b/hphp/test/zend/bad/ext-zlib/zlib_wrapper_fflush_basic.php
@@ -1,6 +1,6 @@
 <?php
 
-$filename = "temp.txt.gz";
+$filename = "zlib_wrapper_fflush_basic.gz";
 $h = gzopen($filename, 'w');
 $str = "Here is the string to be written.";
 $length = 10;
diff --git a/hphp/test/zend/bad/ext-zlib/zlib_wrapper_ftruncate_basic.php b/hphp/test/zend/bad/ext-zlib/zlib_wrapper_ftruncate_basic.php
index 6d3de9c9e..dcafcb266 100644
--- a/hphp/test/zend/bad/ext-zlib/zlib_wrapper_ftruncate_basic.php
+++ b/hphp/test/zend/bad/ext-zlib/zlib_wrapper_ftruncate_basic.php
@@ -1,6 +1,6 @@
 <?php
 $f = dirname(__FILE__)."/004.txt.gz";
-$f2 = "temp.txt.gz";
+$f2 = "zlib_wrapper_ftruncate_basic.gz";
 copy($f, $f2);
 
 $h = gzopen($f2, "r");
diff --git a/hphp/test/zend/good/ext-zlib/gzeof_variation1.php b/hphp/test/zend/good/ext-zlib/gzeof_variation1.php
index 4e6ad2841..80123e8de 100644
--- a/hphp/test/zend/good/ext-zlib/gzeof_variation1.php
+++ b/hphp/test/zend/good/ext-zlib/gzeof_variation1.php
@@ -1,6 +1,6 @@
 <?php
 
-$filename = dirname(__FILE__)."/temp.txt.gz";
+$filename = dirname(__FILE__)."/gzeof_variation1.gz";
 $h = gzopen($filename, 'w');
 $str = "Here is the string to be written. ";
 $length = 10;
diff --git a/hphp/test/zend/good/ext-zlib/gzputs_basic.php b/hphp/test/zend/good/ext-zlib/gzputs_basic.php
index 2c37b1823..2670d1bb4 100644
--- a/hphp/test/zend/good/ext-zlib/gzputs_basic.php
+++ b/hphp/test/zend/good/ext-zlib/gzputs_basic.php
@@ -1,6 +1,6 @@
 <?php
 
-$filename = dirname(__FILE__)."/temp.txt.gz";
+$filename = dirname(__FILE__)."/gzputs_basic.gz";
 $h = gzopen($filename, 'w');
 $str = "Here is the string to be written. ";
 $length = 10;
diff --git a/hphp/test/zend/good/ext-zlib/gzread_variation1.php b/hphp/test/zend/good/ext-zlib/gzread_variation1.php
index f538e01c7..30aa12100 100644
--- a/hphp/test/zend/good/ext-zlib/gzread_variation1.php
+++ b/hphp/test/zend/good/ext-zlib/gzread_variation1.php
@@ -1,6 +1,6 @@
 <?php
 
-$filename = "temp.txt.gz";
+$filename = "gzread_variation1.gz";
 $h = gzopen($filename, 'w');
 $str = "Here is the string to be written. ";
 var_dump(gzread($h, 100));
diff --git a/hphp/test/zend/good/ext-zlib/gzwrite_basic.php b/hphp/test/zend/good/ext-zlib/gzwrite_basic.php
index d8bcfb077..f50d909f9 100644
--- a/hphp/test/zend/good/ext-zlib/gzwrite_basic.php
+++ b/hphp/test/zend/good/ext-zlib/gzwrite_basic.php
@@ -1,6 +1,6 @@
 <?php
 
-$filename = "temp.txt.gz";
+$filename = "gzwrite_basic.gz";
 $h = gzopen($filename, 'w');
 $str = "Here is the string to be written. ";
 $length = 10;
diff --git a/hphp/tools/import_zend_test.py b/hphp/tools/import_zend_test.py
index ce9da4833..517972cd2 100755
--- a/hphp/tools/import_zend_test.py
+++ b/hphp/tools/import_zend_test.py
@@ -501,7 +501,24 @@ def walk(filename, source):
         test = test.replace('hash_file_example.txt', 'hash_file_basic_example.txt')
     if '/ext-hash/hash_file_error.php' in full_dest_filename:
         test = test.replace('hash_file_example.txt', 'hash_file_error_example.txt')
-
+    if '/ext-zlib/gzopen_basic2.php' in full_dest_filename:
+        test = test.replace('temp.txt.gz', 'gzopen_basic2.gz')
+    if '/ext-zlib/gzwrite_error.php' in full_dest_filename:
+        test = test.replace('temp.txt.gz', 'gzwrite_error.gz')
+    if '/ext-zlib/gzwrite_error2.php' in full_dest_filename:
+        test = test.replace('temp.txt.gz', 'gzwrite_error2.gz')
+    if '/ext-zlib/zlib_wrapper_fflush_basic.php' in full_dest_filename:
+        test = test.replace('temp.txt.gz', 'zlib_wrapper_fflush_basic.gz')
+    if '/ext-zlib/zlib_wrapper_ftruncate_basic.php' in full_dest_filename:
+        test = test.replace('temp.txt.gz', 'zlib_wrapper_ftruncate_basic.gz')
+    if '/ext-zlib/gzeof_variation1.php' in full_dest_filename:
+        test = test.replace('temp.txt.gz', 'gzeof_variation1.gz')
+    if '/ext-zlib/gzputs_basic.php' in full_dest_filename:
+        test = test.replace('temp.txt.gz', 'gzputs_basic.gz')
+    if '/ext-zlib/gzread_variation1.php' in full_dest_filename:
+        test = test.replace('temp.txt.gz', 'gzread_variation1.gz')
+    if '/ext-zlib/gzwrite_basic.php' in full_dest_filename:
+        test = test.replace('temp.txt.gz', 'gzwrite_basic.gz')
 
     file(full_dest_filename, 'w').write(test)