Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
	classes/statusnet.ini

1 files changed, 41 insertions, 45 deletions

diff --git a/extlib/Stomp/Frame.php b/extlib/Stomp/Frame.php
index dc59c1cb7..195e3b627 100644
--- a/extlib/Stomp/Frame.php
+++ b/extlib/Stomp/Frame.php
@@ -1,33 +1,29 @@
-<?php
-/**
- *
- * Copyright 2005-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* vim: set expandtab tabstop=3 shiftwidth=3: */
+<?php

+/**

+ *

+ * Copyright 2005-2006 The Apache Software Foundation

+ *

+ * Licensed under the Apache License, Version 2.0 (the "License");

+ * you may not use this file except in compliance with the License.

+ * You may obtain a copy of the License at

+ *

+ * http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing, software

+ * distributed under the License is distributed on an "AS IS" BASIS,

+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+ * See the License for the specific language governing permissions and

+ * limitations under the License.

+ */

+

+/* vim: set expandtab tabstop=3 shiftwidth=3: */

 

 /**

- * Stomp Frames are messages that are sent and received on a StompConnection.

+ * Stomp Frames are messages that are sent and received on a stomp connection.

  *

  * @package Stomp

- * @author Hiram Chirino <hiram@hiramchirino.com>

- * @author Dejan Bosanac <dejan@nighttale.net>

- * @author Michael Caplan <mcaplan@labnet.net>

- * @version $Revision: 36 $

  */

-class Stomp_Frame

+class StompFrame

 {

     public $command;

     public $headers = array();

@@ -54,27 +50,27 @@ class Stomp_Frame
         $this->body = $body;

         

         if ($this->command == 'ERROR') {

-            require_once 'Stomp/Exception.php';

-            throw new Stomp_Exception($this->headers['message'], 0, $this->body);

+            require_once 'Exception.php';

+            throw new StompException($this->headers['message'], 0, $this->body);

+        }

+    }

+    

+    /**

+     * Convert frame to transportable string

+     *

+     * @return string

+     */

+    public function __toString()

+    {

+        $data = $this->command . "\n";

+        

+        foreach ($this->headers as $name => $value) {

+            $data .= $name . ": " . $value . "\n";

         }

-    }
-    
-    /**
-     * Convert frame to transportable string
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        $data = $this->command . "\n";
-        
-        foreach ($this->headers as $name => $value) {
-            $data .= $name . ": " . $value . "\n";
-        }
-        
-        $data .= "\n";
-        $data .= $this->body;
-        return $data .= "\x00\n";
+        

+        $data .= "\n";

+        $data .= $this->body;

+        return $data .= "\x00";

     }

 }

 ?>
\ No newline at end of file