Fix binary safety (bug #24727)

git-svn-id: http://svn.php.net/repository/pear/packages/Net_NNTP/trunk@136523 c90b9560-bf6c-de11-be94-00142212c4b1
pear · Aug 3, 2003 · ad210e9 · ad210e9
1 parent 4581df7
commit ad210e9
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/NNTP.php b/NNTP.php
@@ -215,7 +215,7 @@ function getArticle($article)
         }
         $post = null;
         while (!feof($this->fp)) {
-            $line = trim(fgets($this->fp, 256));
+            $line = rtrim(fgets($this->fp, 256), "\r\n");
 
             if ($line == ".") {
                 break;
@@ -260,7 +260,7 @@ function post($subject, $newsgroup, $from, $body, $aditional = "")
         fputs($this->fp, "POST\n");
 
         /* The servers' response */
-        $response = trim(fgets($this->fp, 128));
+        $response = rtrim(fgets($this->fp, 128), "\r\n");
 
         fputs($this->fp, "From: $from\n");
         fputs($this->fp, "Newsgroups: $newsgroup\n");
@@ -270,7 +270,7 @@ function post($subject, $newsgroup, $from, $body, $aditional = "")
         fputs($this->fp, "\n$body\n.\n");
 
         /* The servers' response */
-        $response = trim(fgets($this->fp, 128));
+        $response = rtrim(fgets($this->fp, 128), "\r\n");
 
         return $response;
     }
@@ -295,7 +295,7 @@ function getHeaders($article)
 
         $headers = '';
         while(!feof($this->fp)) {
-            $line = trim(fgets($this->fp, 256));
+            $line = rtrim(fgets($this->fp, 256), "\r\n");
 
             if ($line == '.') {
                 break;
@@ -379,7 +379,7 @@ function getBody($article)
 
         $body = null;
         while (!feof($this->fp)) {
-            $line = trim(fgets($this->fp, 256));
+            $line = rtrim(fgets($this->fp, 256), "\r\n");
 
             if ($line == '.') {
                 break;
@@ -408,7 +408,7 @@ function _getData()
     {
         $body = array();
         while(!feof($this->fp)) {
-            $line = trim(fgets($this->fp, 256));
+            $line = rtrim(fgets($this->fp, 256), "\r\n");
             if ($line == '.') {
                 break;
             } else {