From: Joe Orton <jorton@apache.org>
Date: Mon, 12 Dec 2005 10:17:31 +0000 (+0000)
Subject: Merge r355143 from trunk:
X-Git-Tag: 2.2.1~192
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcd4d7819f747e2ce0c966efd896d35c7d05071d;p=thirdparty%2Fapache%2Fhttpd.git

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@356239 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index fb2dae11373..fb864f68412 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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]
 
diff --git a/STATUS b/STATUS
index 57c47919bbf..8d0864adf5c 100644
--- a/STATUS
+++ b/STATUS
@@ -129,15 +129,11 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       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
+
diff --git a/include/httpd.h b/include/httpd.h
index 7f08b92d1dd..0aba6f16550 100644
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -1074,7 +1074,7 @@ struct conn_rec {
 typedef enum  {
     CONN_STATE_CHECK_REQUEST_LINE_READABLE,
     CONN_STATE_READ_REQUEST_LINE,
-    CONN_STATE_LINGER,
+    CONN_STATE_LINGER
 } conn_state_e;
 
 /**