Changeset 62 for trunk

Timestamp:

04.09.2006 10:53:26 (2 years ago)

Author:

m

Message:

Fixed PEAR Bug #5836. Closes #13.

Location:

trunk

Files:

• File/Bittorrent/Decode.php (modified) (1 diff)
• File/Bittorrent/Encode.php (modified) (3 diffs)
• Tests/FileBittorrent.php (added)
• package2.xml (modified) (3 diffs)

trunk/File/Bittorrent/Decode.php

@@ -365 +365 @@
     {
         $pos_e  = strpos($this->_source, 'e', $this->_position);
-        $return = intval(substr($this->_source, $this->_position, $pos_e - $this->_position));
+        // The return value showld be automatically casted to float if the intval would
+        // overflow. The "+ 0" accomplishes exactly that, using the internal casting
+        // logic of PHP
+        $return = substr($this->_source, $this->_position, $pos_e - $this->_position) + 0;
         $this->_position = $pos_e + 1;
         return $return;

trunk/File/Bittorrent/Encode.php

@@ -78 +78 @@
         case is_null($mixed):
             return $this->encode_string('');
-            break;
         case 'string':
             return $this->encode_string($mixed);
-            break;
         case 'integer':
-            return  $this->encode_int($mixed);
-            break;
+        case 'double':
+            return  $this->encode_int(round($mixed));
         case 'array':
             return $this->encode_array($mixed);
-            break;
         default:
-            PEAR::raiseError('File_Bittorrent_Encode()::encode() - Unsupported type.', null, null, "Variable must be one of 'string', 'integer' or 'array'");
+            PEAR::raiseError('File_Bittorrent_Encode::encode() - Unsupported type.', null, null, "Variable must be one of 'string', 'integer', 'double' or 'array'");
         }
     }
@@ -105 +102 @@
     function encode_string($str)
     {
-        return sprintf('%s:%s', strlen($str), $str);
+        return strlen($str) . ':' . $str;
     }
 
@@ -120 +117 @@
     function encode_int($int)
     {
-        return sprintf('i%se', $int);
+        return 'i' . $int . 'e';
     }
 

trunk/package2.xml

@@ -23 +23 @@
         <active>yes</active>
     </developer>
-    <date>2006-07-02</date>
-    <time>19:28:43</time>
+    <date>2006-09-04</date>
+    <time>00:00:00</time>
     <version>
-        <release>1.0.1</release>
-        <api>57</api>
+        <release>1.0.2</release>
+        <api>62</api>
     </version>
     <stability>
@@ -35 +35 @@
     <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
     <notes>
-        * Updated dependencies to PEAR 1.4.2 / PHP 4.4.
-        * Fixed _addDir return value. Bug #7406.
-        * Changed announce_list behaviour. Bug #8085.
+        * Alexiev fixed bug #5836
+        * Added test for info hash
     </notes>
     <contents>
@@ -254 +253 @@
             </notes>
         </release>
+        <release>
+            <date>2006-09-04</date>
+            <version>
+                <release>1.0.2</release>
+                <api>62</api>
+            </version>
+            <stability>
+                <release>stable</release>
+                <api>stable</api>
+            </stability>
+            <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
+            <notes>
+                * Alexiev fixed bug #5836
+                * Added test for info hash
+            </notes>
+        </release>
     </changelog>
 </package>