You are viewing a plain text version of this content. The canonical link for it is here.
Posted to websh-cvs@tcl.apache.org by ro...@apache.org on 2007/04/30 11:52:25 UTC

svn commit: r533653 - in /tcl/websh/trunk: CHANGES src/ChangeLog src/generic/response_ap.c

Author: ronnie
Date: Mon Apr 30 02:52:24 2007
New Revision: 533653

URL: http://svn.apache.org/viewvc?view=rev&rev=533653
Log:
- fixed http response problem with Apache 2.2.1 and later

Modified:
    tcl/websh/trunk/CHANGES
    tcl/websh/trunk/src/ChangeLog
    tcl/websh/trunk/src/generic/response_ap.c

Modified: tcl/websh/trunk/CHANGES
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/CHANGES?view=diff&rev=533653&r1=533652&r2=533653
==============================================================================
--- tcl/websh/trunk/CHANGES (original)
+++ tcl/websh/trunk/CHANGES Mon Apr 30 02:52:24 2007
@@ -9,6 +9,8 @@
 Trunk
 -----
 
+- Fixed http response problem with Apache 2.2.1 and later
+
 - Fixed websh.spec dependencies, paths, and improved installation 
   directories (more common rpm style) for Unix
 

Modified: tcl/websh/trunk/src/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/ChangeLog?view=diff&rev=533653&r1=533652&r2=533653
==============================================================================
--- tcl/websh/trunk/src/ChangeLog (original)
+++ tcl/websh/trunk/src/ChangeLog Mon Apr 30 02:52:24 2007
@@ -1,4 +1,16 @@
+2007-04-30 Brunner Ronnie <ro...@netcetera.ch>
+
+	* generic/response_ap.c:
+	- fix http response for Apache 2.2.1 and later
+
 2007-03-19 Brunner Ronnie <ro...@netcetera.ch>
+
+	* generic/hashutl.c, src/generic/hashutl.h, src/generic/log.c,
+	  src/generic/log.h, src/generic/macros.h, src/generic/paramlist.c,
+	  src/generic/paramlist.h, src/generic/web.c, src/generic/web.h,
+	  src/generic/webout.h, src/generic/weboutint.c, src/generic/webutl.c,
+	  src/generic/webutl.h:
+	- export some functions to allow dynamic linking on Windows
 
 	* src/unix/Makefile.in, doc/mod_websh/conf/websh.conf, websh.spec:
 	- more consistent installation directories (rpm style)

Modified: tcl/websh/trunk/src/generic/response_ap.c
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/response_ap.c?view=diff&rev=533653&r1=533652&r2=533653
==============================================================================
--- tcl/websh/trunk/src/generic/response_ap.c (original)
+++ tcl/websh/trunk/src/generic/response_ap.c Mon Apr 30 02:52:24 2007
@@ -69,6 +69,17 @@
 		r->status_line = ap_pstrdup(r->pool, ++response);
 #else /* APACHE2 */
 		r->status_line = (char *) apr_pstrdup(r->pool, ++response);
+		/* as of Apache 2.2.1, r->status_line must be in line with
+		   r->status, therefore r->status must be set too */
+		if (strlen(response) > 3) {
+		  /* status code must be 3 digit numeric, which is supposed
+		     to be followed by a blank in the status line */
+		  char tmp = response[3];
+		  response[3] = 0;
+		  Tcl_GetInt(interp, response, &(r->status));
+		  response[3] = tmp;
+		}
+		
 #endif /* APACHE2 */
 	}
 	assignIteratorToHashTable(responseObj->headers, &iterator);



---------------------------------------------------------------------
To unsubscribe, e-mail: websh-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: websh-cvs-help@tcl.apache.org