rpms/httpd/FC-6 httpd-2.2.4-getserver.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 httpd.spec, 1.101, 1.102

Fri Apr 27 10:31:17 UTC 2007

Author: jorton

Update of /cvs/dist/rpms/httpd/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv27272

Modified Files:
	.cvsignore httpd.spec 
Added Files:
	httpd-2.2.4-getserver.patch 
Log Message:
* Fri Apr 27 2007 Joe Orton <jorton at redhat.com> 2.2.4-2.fc6
- fix loading 2.2.4 DSOs with 2.2.3 httpd (#238045)
- mark httpd.conf noreplace


httpd-2.2.4-getserver.patch:
 generators/mod_info.c      |    2 +-
 generators/mod_status.c    |    2 +-
 mappers/mod_rewrite.c      |    2 +-
 proxy/mod_proxy_balancer.c |    2 +-
 proxy/mod_proxy_connect.c  |    6 +++---
 proxy/mod_proxy_ftp.c      |    2 +-
 ssl/ssl_engine_vars.c      |    2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE httpd-2.2.4-getserver.patch ---

Remove dependence on 2.2.4 symbols so the DSOs load in 2.2.3. #238045

(_banner and _version are equivalent; only functional change here is
in mod_status and mod_info, which go back to reflecting 2.2.3 
behaviour)

--- httpd-2.2.4/modules/ssl/ssl_engine_vars.c.getserver
+++ httpd-2.2.4/modules/ssl/ssl_engine_vars.c
@@ -192,7 +192,7 @@
         if (strlen(var) > 12 && strcEQn(var, "SSL_VERSION_", 12))
             result = ssl_var_lookup_ssl_version(p, var+12);
         else if (strcEQ(var, "SERVER_SOFTWARE"))
-            result = ap_get_server_banner();
+            result = ap_get_server_version();
         else if (strcEQ(var, "API_VERSION")) {
             result = apr_itoa(p, MODULE_MAGIC_NUMBER);
             resdup = FALSE;
--- httpd-2.2.4/modules/mappers/mod_rewrite.c.getserver
+++ httpd-2.2.4/modules/mappers/mod_rewrite.c
@@ -2003,7 +2003,7 @@
 
             case 'S':
                 if (!strcmp(var, "SERVER_SOFTWARE")) {
-                    result = ap_get_server_banner();
+                    result = ap_get_server_version();
                 }
                 break;
             }
--- httpd-2.2.4/modules/proxy/mod_proxy_connect.c.getserver
+++ httpd-2.2.4/modules/proxy/mod_proxy_connect.c
@@ -224,7 +224,7 @@
                   "CONNECT %s HTTP/1.0" CRLF, r->uri);
         apr_socket_send(sock, buffer, &nbytes);
         nbytes = apr_snprintf(buffer, sizeof(buffer),
-                  "Proxy-agent: %s" CRLF CRLF, ap_get_server_banner());
+                  "Proxy-agent: %s" CRLF CRLF, ap_get_server_version());
         apr_socket_send(sock, buffer, &nbytes);
     }
     else {
@@ -235,7 +235,7 @@
         ap_xlate_proto_to_ascii(buffer, nbytes);
         apr_socket_send(client_socket, buffer, &nbytes);
         nbytes = apr_snprintf(buffer, sizeof(buffer),
-                  "Proxy-agent: %s" CRLF CRLF, ap_get_server_banner());
+                  "Proxy-agent: %s" CRLF CRLF, ap_get_server_version());
         ap_xlate_proto_to_ascii(buffer, nbytes);
         apr_socket_send(client_socket, buffer, &nbytes);
 #if 0
@@ -244,7 +244,7 @@
          */
         r->status = HTTP_OK;
         r->header_only = 1;
-        apr_table_set(r->headers_out, "Proxy-agent: %s", ap_get_server_banner());
+        apr_table_set(r->headers_out, "Proxy-agent: %s", ap_get_server_version());
         ap_rflush(r);
 #endif
     }
--- httpd-2.2.4/modules/proxy/mod_proxy_ftp.c.getserver
+++ httpd-2.2.4/modules/proxy/mod_proxy_ftp.c
@@ -1666,7 +1666,7 @@
 
     apr_rfc822_date(dates, r->request_time);
     apr_table_setn(r->headers_out, "Date", dates);
-    apr_table_setn(r->headers_out, "Server", ap_get_server_banner());
+    apr_table_setn(r->headers_out, "Server", ap_get_server_version());
 
     /* set content-type */
     if (dirlisting) {
--- httpd-2.2.4/modules/proxy/mod_proxy_balancer.c.getserver
+++ httpd-2.2.4/modules/proxy/mod_proxy_balancer.c
@@ -705,7 +705,7 @@
         ap_rputs("<body><h1>Load Balancer Manager for ", r);
         ap_rvputs(r, ap_get_server_name(r), "</h1>\n\n", NULL);
         ap_rvputs(r, "<dl><dt>Server Version: ",
-                  ap_get_server_description(), "</dt>\n", NULL);
+                  ap_get_server_version(), "</dt>\n", NULL);
         ap_rvputs(r, "<dt>Server Built: ",
                   ap_get_server_built(), "\n</dt></dl>\n", NULL);
         balancer = (proxy_balancer *)conf->balancers->elts;
--- httpd-2.2.4/modules/generators/mod_info.c.getserver
+++ httpd-2.2.4/modules/generators/mod_info.c
@@ -346,7 +346,7 @@
     ap_rprintf(r,
                "<dl><dt><strong>Server Version:</strong> "
                "<font size=\"+1\"><tt>%s</tt></font></dt>\n",
-               ap_get_server_description());
+               ap_get_server_version());
     ap_rprintf(r,
                "<dt><strong>Server Built:</strong> "
                "<font size=\"+1\"><tt>%s</tt></font></dt>\n",
--- httpd-2.2.4/modules/generators/mod_status.c.getserver
+++ httpd-2.2.4/modules/generators/mod_status.c
@@ -397,7 +397,7 @@
         ap_rputs("<h1>Apache Server Status for ", r);
         ap_rvputs(r, ap_get_server_name(r), "</h1>\n\n", NULL);
         ap_rvputs(r, "<dl><dt>Server Version: ",
-                  ap_get_server_description(), "</dt>\n", NULL);
+                  ap_get_server_version(), "</dt>\n", NULL);
         ap_rvputs(r, "<dt>Server Built: ",
                   ap_get_server_built(), "\n</dt></dl><hr /><dl>\n", NULL);
         ap_rvputs(r, "<dt>Current Time: ",


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/httpd/FC-6/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore	28 Jul 2006 15:19:20 -0000	1.17
+++ .cvsignore	27 Apr 2007 10:31:14 -0000	1.18
@@ -1 +1,3 @@
 httpd-2.2.3.tar.gz
+httpd-2.2.4
+clog


Index: httpd.spec
===================================================================
RCS file: /cvs/dist/rpms/httpd/FC-6/httpd.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- httpd.spec	23 Mar 2007 10:55:21 -0000	1.101
+++ httpd.spec	27 Apr 2007 10:31:14 -0000	1.102
@@ -7,7 +7,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -40,6 +40,7 @@
 Patch25: httpd-2.0.54-selinux.patch
 # Bug fixes
 Patch54: httpd-2.2.0-authnoprov.patch
+Patch55: httpd-2.2.4-getserver.patch
 License: Apache Software License
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-root
@@ -117,6 +118,7 @@
 %patch25 -p1 -b .selinux
 
 %patch54 -p1 -b .authnoprov
+%patch55 -p1 -b .getserver
 
 # Patch in vendor/release string
 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -417,7 +419,7 @@
 %{_sysconfdir}/httpd/logs
 %{_sysconfdir}/httpd/run
 %dir %{_sysconfdir}/httpd/conf
-%config %{_sysconfdir}/httpd/conf/httpd.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf/httpd.conf
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/welcome.conf
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/proxy_ajp.conf
 %config(noreplace) %{_sysconfdir}/httpd/conf/magic
@@ -484,6 +486,10 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Fri Apr 27 2007 Joe Orton <jorton at redhat.com> 2.2.4-2.fc6
+- fix loading 2.2.4 DSOs with 2.2.3 httpd (#238045)
+- mark httpd.conf noreplace
+
 * Fri Mar 23 2007 Joe Orton <jorton at redhat.com> 2.2.4-1.fc6
 - update to 2.2.4
 - fix path to special.mk in apxs (#217092)


