svn: /pear/pear-core/trunk/PEAR/Command/ Install.php

[Helgi Þormar Þorbjörnsson]

dufuz Wed, 01 Jun 2011 02:35:01 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=311686

Log:
Fixed Bug #18428: invalid preg_match patterns [glen]

# Ported from tag PEAR-1.9.3

Bug: http://pear.php.net/bugs/18428 (unknown)

Changed paths:
U pear/pear-core/trunk/PEAR/Command/Install.php

Modified: pear/pear-core/trunk/PEAR/Command/Install.php
===================================================================
--- pear/pear-core/trunk/PEAR/Command/Install.php 2011-06-01 02:34:39 UTC (rev 311685)
+++ pear/pear-core/trunk/PEAR/Command/Install.php 2011-06-01 02:35:01 UTC (rev 311686)
@@ -364,7 +364,7 @@
$info = ob_get_contents();
ob_end_clean();
$debug = function_exists('leak') ? '_debug' : '';
- $ts = preg_match('Thread Safety.+enabled', $info) ? '_ts' : '';
+ $ts = preg_match('/Thread Safety.+enabled/', $info) ? '_ts' : '';
$enable = 'zend_extension' . $debug . $ts;
}
foreach ($ini[$search] as $line => $extension) {
@@ -417,7 +417,7 @@
$info = ob_get_contents();
ob_end_clean();
$debug = function_exists('leak') ? '_debug' : '';
- $ts = preg_match('Thread Safety.+enabled', $info) ? '_ts' : '';
+ $ts = preg_match('/Thread Safety.+enabled/', $info) ? '_ts' : '';
$enable = 'zend_extension' . $debug . $ts;
}
$found = false;
@@ -774,7 +774,7 @@
$info = ob_get_contents();
ob_end_clean();
$debug = function_exists('leak') ? '_debug' : '';
- $ts = preg_match('Thread Safety.+enabled', $info) ? '_ts' : '';
+ $ts = preg_match('/Thread Safety.+enabled/', $info) ? '_ts' : '';
$exttype = 'zend_extension' . $debug . $ts;
}
$extrainfo[] = 'You should add "' . $exttype . '=' .
@@ -1035,7 +1035,7 @@
$info = ob_get_contents();
ob_end_clean();
$debug = function_exists('leak') ? '_debug' : '';
- $ts = preg_match('Thread Safety.+enabled', $info) ? '_ts' : '';
+ $ts = preg_match('/Thread Safety.+enabled/', $info) ? '_ts' : '';
$exttype = 'zend_extension' . $debug . $ts;
}
$this->ui->outputData('Unable to remove "' . $exttype . '=' .