cvs: pear-core(PEAR_1_5) /PEAR RunTest.php

cellog          Thu Apr 12 01:53:48 2007 UTC

  Modified files:              (Branch: PEAR_1_5)
    /pear-core/PEAR     RunTest.php 
  Log:
  fix Bug #10690        RunTest.php parses HTTP headers for non-CGI tests 
[jstump]
  
http://cvs.php.net/viewvc.cgi/pear-core/PEAR/RunTest.php?r1=1.36.2.1&r2=1.36.2.2&diff_format=u
Index: pear-core/PEAR/RunTest.php
diff -u pear-core/PEAR/RunTest.php:1.36.2.1 pear-core/PEAR/RunTest.php:1.36.2.2
--- pear-core/PEAR/RunTest.php:1.36.2.1 Mon Apr  9 04:31:22 2007
+++ pear-core/PEAR/RunTest.php  Thu Apr 12 01:53:48 2007
@@ -16,7 +16,7 @@
  * @author     Greg Beaver <cellog@xxxxxxx>
  * @copyright  1997-2006 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: RunTest.php,v 1.36.2.1 2007/04/09 04:31:22 cellog Exp 
$
+ * @version    CVS: $Id: RunTest.php,v 1.36.2.2 2007/04/12 01:53:48 cellog Exp 
$
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.3.3
  */
@@ -509,6 +509,7 @@
         /* when using CGI, strip the headers from the output */
         $headers = "";
         if (!empty($this->_options['cgi']) &&
+              $php == $this->_options['cgi'] && 
               preg_match("/^(.*?)\r?\n\r?\n(.*)/s", $out, $match)) {
             $output = trim($match[2]);
             $rh = preg_split("/[\n\r]+/",$match[1]);