svn: /pear/pear-core/tags/PEAR-1.9.3/ PEAR/Command/Install.php package.xml package2.xml

dufuz Wed, 01 Jun 2011 02:34:39 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=311685 Log: Fixed Bug #18428: invalid preg_match patterns [glen] Bug: http://pear.php.net/bugs/18428 (unknown) Changed paths: U pear/pear-core/tags/PEAR-1.9.3/PEAR/Command/Install.php U pear/pear-core/tags/PEAR-1.9.3/package.xml U pear/pear-core/tags/PEAR-1.9.3/package2.xml Modified: pear/pear-core/tags/PEAR-1.9.3/PEAR/Command/Install.php =================================================================== --- pear/pear-core/tags/PEAR-1.9.3/PEAR/Command/Install.php 2011-06-01 01:56:09 UTC (rev 311684) +++ pear/pear-core/tags/PEAR-1.9.3/PEAR/Command/Install.php 2011-06-01 02:34:39 UTC (rev 311685) @@ -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 . '=' . Modified: pear/pear-core/tags/PEAR-1.9.3/package.xml =================================================================== --- pear/pear-core/tags/PEAR-1.9.3/package.xml 2011-06-01 01:56:09 UTC (rev 311684) +++ pear/pear-core/tags/PEAR-1.9.3/package.xml 2011-06-01 02:34:39 UTC (rev 311685) @@ -96,6 +96,7 @@ * Fixed Bug #18349: package.xml version not recognized when single quoted [dufuz] * Fixed Bug #18364: date.timezone errors for sh/bat files when TZ is not set in php.ini [dufuz] * Fixed Bug #18388: Parenteses error in REST.php line 232 [dufuz] + * Fixed Bug #18428: invalid preg_match patterns [glen] * Fixed a problem in RunTest and code coverage. Correctly register the code coverage shutdown function in case we are inside a namespace. [sebastian] * Fixed a bug with extensions not providing their config.m4 and co in the root directory Modified: pear/pear-core/tags/PEAR-1.9.3/package2.xml =================================================================== --- pear/pear-core/tags/PEAR-1.9.3/package2.xml 2011-06-01 01:56:09 UTC (rev 311684) +++ pear/pear-core/tags/PEAR-1.9.3/package2.xml 2011-06-01 02:34:39 UTC (rev 311685) @@ -98,6 +98,7 @@ * Fixed Bug #18349: package.xml version not recognized when single quoted [dufuz] * Fixed Bug #18364: date.timezone errors for sh/bat files when TZ is not set in php.ini [dufuz] * Fixed Bug #18388: Parenteses error in REST.php line 232 [dufuz] + * Fixed Bug #18428: invalid preg_match patterns [glen] * Fixed a problem in RunTest and code coverage. Correctly register the code coverage shutdown function in case we are inside a namespace. [sebastian] * Fixed a bug with extensions not providing their config.m4 and co in the root directory of