Merge branch '0.8.x' of gitorious.org:statusnet/mainline into 0.8.x

extlib/Stomp.php

@@ -237,7 +237,7 @@ class Stomp
      * @param boolean $sync Perform request synchronously
      * @return boolean
      */
-    public function send ($destination, $msg, $properties = array(), $sync = null)
+    public function send ($destination, $msg, $properties = null, $sync = null)
     {
         if ($msg instanceof Stomp_Frame) {
             $msg->headers['destination'] = $destination;
@@ -319,10 +319,8 @@ class Stomp
     public function subscribe ($destination, $properties = null, $sync = null)
     {
         $headers = array('ack' => 'client');
-        // FIXME: this seems to be activemq specific, but not hurting rabbitmq?
 		$headers['activemq.prefetchSize'] = $this->prefetchSize;
 		if ($this->clientId != null) {
-            // FIXME: this seems to be activemq specific, but not hurting rabbitmq?
 			$headers["activemq.subcriptionName"] = $this->clientId;
 		}
         if (isset($properties)) {
@@ -435,27 +433,21 @@ class Stomp
      */
     public function ack ($message, $transactionId = null)
     {
-        // Handle the headers,
-        $headers = array();
-
         if ($message instanceof Stomp_Frame) {
-            // Copy headers from the object
+            $frame = new Stomp_Frame('ACK', $message->headers);
-            // FIXME: at least content-length can be wrong here (set to 3 sometimes).
+            $this->_writeFrame($frame);
-            $headers = $message->headers;
+            return true;
         } else {
+            $headers = array();
             if (isset($transactionId)) {
                 $headers['transaction'] = $transactionId;
             }
             $headers['message-id'] = $message;
-        }
-        // An ACK has no content
-        $headers['content-length'] = 0;
-
-        // Create it and write it out
             $frame = new Stomp_Frame('ACK', $headers);
             $this->_writeFrame($frame);
             return true;
         }
+    }
     /**
      * Graceful disconnect from the server
      *
@@ -525,25 +517,15 @@ class Stomp
         $rb = 1024;
         $data = '';
         do {
-             $read = fread($this->_socket, $rb);
+            $read = fgets($this->_socket, $rb);
             if ($read === false) {
                 $this->_reconnect();
                 return $this->readFrame();
             }
             $data .= $read;
             $len = strlen($data);
+        } while (($len < 2 || ! ($data[$len - 2] == "\x00" && $data[$len - 1] == "\n")));
         
-             $continue = true;
-             // ActiveMq apparently add \n after 0 char
-             if($data[$len - 2] == "\x00" && $data[$len - 1] == "\n")  {
-               $continue = false;
-             }
-
-             // RabbitMq does not
-             if($data[$len - 1] == "\x00") {
-                $continue = false;
-             }
-        } while ( $continue );
         list ($header, $body) = explode("\n\n", $data, 2);
         $header = explode("\n", $header);
         $headers = array();

extlib/Stomp/Frame.php

@@ -74,8 +74,7 @@ class Stomp_Frame
         
         $data .= "\n";
         $data .= $this->body;
-        $data .= "\x00\n"; // Should there really be a linefeed here?
+        return $data .= "\x00\n";
-        return $data;
     }
 }
 ?>

extlib/Stomp/Message.php

@@ -29,12 +29,8 @@ require_once 'Stomp/Frame.php';
  */
 class Stomp_Message extends Stomp_Frame
 {
-    public function __construct ($body, $headers = array())
+    public function __construct ($body, $headers = null)
     {
-        if(!isset($headers['content-length'])) {
-          // TODO: log this, to see if this is correct
-          $headers['content-length'] = strlen($body);
-        }
         $this->_init("SEND", $headers, $body);
     }
 }

lib/stompqueuemanager.php

@@ -141,11 +141,10 @@ class StompQueueManager
                 $this->con->ack($frame);
             } else {
                 if ($handler->handle_notice($notice)) {
-                    $this->_log(LOG_INFO, 'Successfully handled notice '. $notice->id .' originally posted at ' . $notice->created . ' in queue '. $queue);
+                    $this->_log(LOG_INFO, 'Successfully handled notice '. $notice->id .' posted at ' . $frame->headers['created'] . ' in queue '. $queue);
-                    
                     $this->con->ack($frame);
                 } else {
-                    $this->_log(LOG_WARNING, 'Failed handling notice '. $notice->id .' originally posted at ' . $notice->created   . ' in queue '. $queue);
+                    $this->_log(LOG_WARNING, 'Failed handling notice '. $notice->id .' posted at ' . $frame->headers['created']  . ' in queue '. $queue);
                     // FIXME we probably shouldn't have to do
                     // this kind of queue management ourselves
                     $this->con->ack($frame);