clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix #25131, OS_Guess warnings

Browse Source
This commit is contained in:
Greg Beaver 2003-08-18 16:43:46 +00:00
parent 1fb9d4896a
commit 12f7e9eb4d
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pear/OS/Guess.php
View File

@ -167,7 +167,7 @@ class OS_Guess
$cpp = popen("/usr/bin/cpp $tmpfile", "r"); $cpp = popen("/usr/bin/cpp $tmpfile", "r");
$major = $minor = 0; $major = $minor = 0;
while ($line = fgets($cpp, 1024)) { while ($line = fgets($cpp, 1024)) {
if ($line{0} == '#') { if ($line{0} == '#' || trim($line) == '') {
continue; continue;
} }
if (list($major, $minor) = explode(' ', trim($line))) { if (list($major, $minor) = explode(' ', trim($line))) {

2
pear/package-PEAR.xml
View File

@ -41,6 +41,8 @@
<date>2003-08-??</date> <date>2003-08-??</date>
<state>stable</state> <state>stable</state>
<notes> <notes>
* Fixed #25131 - OS_Guess warnings on empty lines from
popen(&quot;/usr/bin/cpp $tmpfile&quot;, &quot;r&quot;);
* Fixed #25117 - MD5 checksum should be case-insensitive * Fixed #25117 - MD5 checksum should be case-insensitive
* Fixed static calls to PEAR error-handling methods in classes (Greg) * Fixed static calls to PEAR error-handling methods in classes (Greg)
* Added ability to use a static method callback for error-handling, and removed * Added ability to use a static method callback for error-handling, and removed