- rel 5

[packages/apache1.git] / apache1-mod_ssl-addon.patch

diff --git a/apache1-mod_ssl-addon.patch b/apache1-mod_ssl-addon.patch
index 192294ac83b962d93753878b4bcb967a11b44ca2..51fb93fc08a19a99158c6696dc062584a27e6829 100644 (file)
--- a/apache1-mod_ssl-addon.patch
+++ b/apache1-mod_ssl-addon.patch
@@ -7,8 +7,8 @@
 ## ____________________________________________________________________________
 ##
 ## Annotated patch file: addon.patch
-## Copyright (c) 1998-2001 Ralf S. Engelschall, All Rights Reserved. 
-## Created on: 01-Nov-2003
+## Copyright (c) 1998-2007 Ralf S. Engelschall, All Rights Reserved. 
+## Created on: 12-Sep-2007
 ##
 ## This file assembles changes to existing Apache source files
 ## between the original Apache and the patched variant. It can be
@@ -21,8 +21,8 @@
 | Add an entry for mod_define.
 +---------------------------------------------------------------------------
 Index: src/Configuration.tmpl
---- src/Configuration.tmpl     28 Jan 2002 19:21:21 -0000      1.1.1.7
-+++ src/Configuration.tmpl     28 Jan 2002 19:40:56 -0000      1.23
+--- src/Configuration.tmpl     11 May 2004 18:28:09 -0000      1.1.1.8
++++ src/Configuration.tmpl     11 May 2004 18:32:15 -0000      1.24
 @@ -258,6 +313,11 @@
  
  AddModule modules/standard/mod_env.o
@@ -40,9 +40,9 @@ Index: src/Configuration.tmpl
 | Add more beautiful optic to the status page table..
 +---------------------------------------------------------------------------
 Index: src/modules/standard/mod_status.c
---- src/modules/standard/mod_status.c  18 Jul 2003 15:44:39 -0000      1.1.1.15
-+++ src/modules/standard/mod_status.c  18 Jul 2003 15:56:59 -0000      1.12
-@@ -484,12 +484,33 @@
+--- src/modules/standard/mod_status.c  10 Sep 2007 20:30:37 -0000      1.1.1.18
++++ src/modules/standard/mod_status.c  12 Sep 2007 05:32:20 -0000
+@@ -442,12 +442,33 @@
            if (no_table_report)
                ap_rputs("<p><hr><h2>Server Details</h2>\n\n", r);
            else
@@ -76,7 +76,7 @@ Index: src/modules/standard/mod_status.c
        }
  
        for (i = 0; i < HARD_SERVER_LIMIT; ++i) {
-@@ -617,6 +638,11 @@
+@@ -576,6 +597,11 @@
                                vhost->server_hostname) : "(unavailable)");
                    }
                    else {              /* !no_table_report */
@@ -88,7 +88,7 @@ Index: src/modules/standard/mod_status.c
                        if (score_record.status == SERVER_DEAD)
  #ifdef TPF
                              if (kill(ps_record.pid, 0) == 0) {
-@@ -629,12 +655,12 @@
+@@ -588,12 +614,12 @@
                              } else
  #endif /* TPF */
                            ap_rprintf(r,
@@ -103,27 +103,39 @@ Index: src/modules/standard/mod_status.c
                                i, (int) ps_record.generation,
                                (int) ps_record.pid, (int) conn_lres,
                                my_lres, lres);
-@@ -738,6 +775,12 @@
- #endif
-       }
- 
-+#ifdef EAPI
-+    ap_hook_use("ap::mod_status::display",
-+                AP_HOOK_SIG4(void,ptr,int,int), AP_HOOK_ALL,
-+                r, no_table_report, short_report);
+@@ -653,6 +679,16 @@
+                           ap_rprintf(r,
+                            "<td>?<td nowrap>?<td nowrap>..reading.. </tr>\n\n");
+                       else
++#ifndef NO_PRETTYPRINT
++                          ap_rprintf(r,
++                           "<td nowrap><font face=\"Arial,Helvetica\" size=\"-1\">%s</font>"
++                           "<td nowrap><font face=\"Arial,Helvetica\" size=\"-1\">%s</font>"
++                           "<td nowrap><font face=\"Arial,Helvetica\" size=\"-1\">%s</font>"
++                           "</tr>\n\n",
++                           score_record.client,
++                           vhost ? vhost->server_hostname : "(unavailable)",
++                           ap_escape_html(r->pool, score_record.request));
++#else
+                           ap_rprintf(r,
+                            "<td>%s<td nowrap>%s<td nowrap>%s</tr>\n\n",
+                            ap_escape_html(r->pool, score_record.client),
+@@ -660,6 +696,7 @@
+                               vhost->server_hostname) : "(unavailable)",
+                            ap_escape_html(r->pool,
+                                             ap_escape_logitem(r->pool, score_record.request)));
 +#endif
-+
-     } else {
- 
-       if (!short_report) {
+                   }           /* no_table_report */
+               }                       /* !short_report */
+           }                   /* if (<active child>) */
 
 +---------------------------------------------------------------------------
 | Add a hyperlink to the mod_define.html document.
 +---------------------------------------------------------------------------
 Index: htdocs/manual/mod/index.html.en
---- htdocs/manual/mod/index.html.en    28 Jan 2002 19:21:43 -0000      1.1.1.2
-+++ htdocs/manual/mod/index.html.en    28 Jan 2002 19:40:56 -0000      1.3
-@@ -101,6 +101,10 @@
+--- htdocs/manual/mod/index.html.en    7 May 2006 18:10:42 -0000       1.1.1.4
++++ htdocs/manual/mod/index.html.en    7 May 2006 18:12:44 -0000       1.5
+@@ -106,6 +106,10 @@
        <dd>Support for Netscape-like cookies. Replaced in Apache 1.2
        by mod_usertrack</dd>
  
@@ -139,9 +151,9 @@ Index: htdocs/manual/mod/index.html.en
 | Add a hyperlink for the Define directives.
 +---------------------------------------------------------------------------
 Index: htdocs/manual/mod/directives.html.en
---- htdocs/manual/mod/directives.html.en       18 Jul 2003 15:44:16 -0000      1.1.1.5
-+++ htdocs/manual/mod/directives.html.en       18 Jul 2003 15:56:57 -0000      1.6
-@@ -228,6 +228,8 @@
+--- htdocs/manual/mod/directives.html.en       7 May 2006 18:10:41 -0000       1.1.1.8
++++ htdocs/manual/mod/directives.html.en       7 May 2006 18:12:44 -0000       1.9
+@@ -233,6 +233,8 @@
  
        <li><a href="core.html#defaulttype">DefaultType</a></li>