httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r356239 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS include/httpd.h
Date Mon, 12 Dec 2005 10:17:37 GMT
Author: jorton
Date: Mon Dec 12 02:17:31 2005
New Revision: 356239

URL: http://svn.apache.org/viewcvs?rev=356239&view=rev
Log:
Merge r355143 from trunk:

* include/httpd.h (conn_state_e): Remove trailing comma from enum.

PR: 37840
Submitted by: Per Olausson <pao darkheim.freeserve.co.uk>
Reviewed by: jorton, rpluem, pquerna

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/include/httpd.h

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/CHANGES?rev=356239&r1=356238&r2=356239&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Mon Dec 12 02:17:31 2005
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.1
 
+  *) Fix syntax error in httpd.h with strict compilers.  PR 38740.
+     [Per Olausson <pao darkheim.freeserve.co.uk>]
+
   *) Preserve the Content-Length header for a proxied HEAD response.
      PR 18757.  [Greg Ames]
 

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/STATUS?rev=356239&r1=356238&r2=356239&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Mon Dec 12 02:17:31 2005
@@ -129,15 +129,11 @@
       http://svn.apache.org/viewcvs.cgi/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=356030&view=diff&r1=356030&r2=332306
       +1: jim
 
-    * httpd.h build fix for strict compilers.
-      http://svn.apache.org/viewcvs.cgi?rev=355143&view=rev
-      PR: 37840
-      +1: jorton, rpluem, pquerna 
-
     * mod_ssl: Fix PR37791 (SEGV if the client is connection plain to a SSL
       enabled port)
       Trunk version of patch:
          http://svn.apache.org/viewcvs.cgi?rev=354394&view=rev
       Backport version for 2.2.x of patch:
          Trunk version of patch works
-      +1: rpluem
+      +1: rpluem, jorton
+

Modified: httpd/httpd/branches/2.2.x/include/httpd.h
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/include/httpd.h?rev=356239&r1=356238&r2=356239&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/include/httpd.h (original)
+++ httpd/httpd/branches/2.2.x/include/httpd.h Mon Dec 12 02:17:31 2005
@@ -1074,7 +1074,7 @@
 typedef enum  {
     CONN_STATE_CHECK_REQUEST_LINE_READABLE,
     CONN_STATE_READ_REQUEST_LINE,
-    CONN_STATE_LINGER,
+    CONN_STATE_LINGER
 } conn_state_e;
 
 /** 



Mime
View raw message