- split configs to configdir

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

diff --git a/apache1-mod_ssl-addon.patch b/apache1-mod_ssl-addon.patch
index fbc2890b51d60723c799d9108cf9f6ef391f11b5..8c51a07bdf028497c902f92f65a1775b43fc588f 100644 (file)
--- a/apache1-mod_ssl-addon.patch
+++ b/apache1-mod_ssl-addon.patch
@@ -8,7 +8,7 @@
 ##
 ## Annotated patch file: addon.patch
 ## Copyright (c) 1998-2001 Ralf S. Engelschall, All Rights Reserved. 
-## Created on: 18-Mar-2003
+## Created on: 11-May-2004
 ##
 ## 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  27 Mar 2002 15:23:06 -0000      1.1.1.14
-+++ src/modules/standard/mod_status.c  27 Mar 2002 15:30:03 -0000      1.11
-@@ -484,12 +484,33 @@
+--- src/modules/standard/mod_status.c  11 May 2004 18:28:20 -0000      1.1.1.16
++++ src/modules/standard/mod_status.c  11 May 2004 18:32:16 -0000      1.13
+@@ -441,12 +441,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) {
-@@ -607,14 +628,19 @@
+@@ -574,6 +595,11 @@
                                vhost->server_hostname) : "(unavailable)");
                    }
                    else {              /* !no_table_report */
@@ -86,6 +86,11 @@ Index: src/modules/standard/mod_status.c
 +                      ap_rprintf(r,"<tr>");
 +#endif
                        if (score_record.status == SERVER_DEAD)
+ #ifdef TPF
+                             if (kill(ps_record.pid, 0) == 0) {
+@@ -586,12 +612,12 @@
+                             } else
+ #endif /* TPF */
                            ap_rprintf(r,
 -                              "<tr><td><b>%d-%d</b><td>-<td>%d/%lu/%lu",
 +                              "<td><b>%d-%d</b><td>-<td>%d/%lu/%lu",
@@ -98,37 +103,26 @@ Index: src/modules/standard/mod_status.c
                                i, (int) ps_record.generation,
                                (int) ps_record.pid, (int) conn_lres,
                                my_lres, lres);
-@@ -674,12 +700,23 @@
-                           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),
-                            vhost ? ap_escape_html(r->pool, 
-                               vhost->server_hostname) : "(unavailable)",
-                            ap_escape_html(r->pool, score_record.request));
+@@ -695,6 +732,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);
 +#endif
-                   }           /* no_table_report */
-               }                       /* !short_report */
-           }                   /* if (<active child>) */
++
+     } else {
+ 
+       if (!short_report) {
 
 +---------------------------------------------------------------------------
 | 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
+--- htdocs/manual/mod/index.html.en    11 May 2004 18:28:01 -0000      1.1.1.3
++++ htdocs/manual/mod/index.html.en    11 May 2004 18:32:14 -0000      1.4
 @@ -101,6 +101,10 @@
        <dd>Support for Netscape-like cookies. Replaced in Apache 1.2
        by mod_usertrack</dd>
@@ -145,9 +139,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       4 Oct 2002 11:50:01 -0000       1.1.1.4
-+++ htdocs/manual/mod/directives.html.en       4 Oct 2002 11:54:56 -0000       1.5
-@@ -220,6 +220,8 @@
+--- htdocs/manual/mod/directives.html.en       11 May 2004 18:28:01 -0000      1.1.1.6
++++ htdocs/manual/mod/directives.html.en       11 May 2004 18:32:14 -0000      1.7
+@@ -228,6 +228,8 @@
  
        <li><a href="core.html#defaulttype">DefaultType</a></li>