Changeset 2462

Timestamp:

05/16/2008 07:59:42 AM (7 months ago)

Author:

tof

Message:

Fixed #841

Location:

trunk

Files:

• HISTORY (modified) (1 diff)
• framework/Web/THttpRequest.php (modified) (1 diff)
• framework/Web/THttpResponse.php (modified) (2 diffs)

trunk/HISTORY

@@ -2 +2 @@
 ============================
 BUG: Ticket#836 - TRatingList downgrade (Christophe)
+BUG: Ticket#841 - Strange output from THttpResponse (Christophe)
 BUG: Ticket#843 - TDataList alternatinItem issue after changes in rev 2227 (Christophe)
 BUG: Ticket#849 - TDatePicker selecting current date problem (Christophe)

trunk/framework/Web/THttpRequest.php

@@ -346 +346 @@
 
         /**
+         * @return string the requested http procolol. Blank string if not defined.
+         */
+        public function getHttpProtocolVersion ()
+        {
+                return isset($_SERVER['SERVER_PROTOCOL'])?$_SERVER['SERVER_PROTOCOL']:'';
+        }
+        
+        /**
          * @return string part of that request URL after the host info (including pathinfo and query string)
          */

trunk/framework/Web/THttpResponse.php

@@ -258 +258 @@
         /**
          * Set the HTTP status code for the response.
+         * The code and its reason will be sent to client using the currently requested http protocol version (see {@link THttpRequest::getHttpProtocolVersion})
+         * Keep in mind that HTTP/1.0 clients might not understand all status codes from HTTP/1.1
          * 
          * @param integer HTTP status code
+         * @param string HTTP status reason, defaults to standard HTTP reasons
          */
         public function setStatusCode($status, $reason=null)
@@ -433 +436 @@
         protected function sendHttpHeader ()
         {
-                header("HTTP/1.1 {$this->_status} {$this->_reason}", true, $this->_status);
+                if (($version=$this->getRequest()->getHttpProtocolVersion())==='')
+                        header (' ', true, $this->_status);
+                else
+                        header($version.' '.$this->_status.' '.$this->_reason, true, $this->_status);
         }