- updated from mod_ssl-2.8.24-1.3.33 (connection timeout handling fix)

Changed files:
    apache-mod_ssl-eapi.patch -> 1.9.2.4

diff --git a/apache-mod_ssl-eapi.patch b/apache-mod_ssl-eapi.patch
index 0db293e6d4052a17cfae41f3f309b9bfb4b7c37f..d5f9c17f096c4caf96709e0951009e57218cdbb4 100644 (file)
--- a/apache-mod_ssl-eapi.patch
+++ b/apache-mod_ssl-eapi.patch
@@ -7,7 +7,7 @@
 ## 
 ## Annotated patch file: eapi.patch
 ## Copyright (c) 1998-2001 Ralf S. Engelschall, All Rights Reserved. 
-## Created on: 11-May-2004
+## Created on: 02-Sep-2005
 ##
 ## This file assembles changes to existing Apache source files
 ## between the original Apache and the patched variant. It can be
@@ -56,9 +56,9 @@ Index: src/Configuration.tmpl
 | Patch in implementation of the EAPI rule.
 +---------------------------------------------------------------------------
 Index: src/Configure
---- src/Configure      11 May 2004 18:28:09 -0000      1.1.1.23
-+++ src/Configure      11 May 2004 18:32:15 -0000      1.26
-@@ -1855,6 +1855,72 @@
+--- src/Configure      30 Oct 2004 13:42:25 -0000      1.1.1.25
++++ src/Configure      30 Oct 2004 13:44:00 -0000      1.28
+@@ -1867,6 +1867,72 @@
  fi
  
  ####################################################################
@@ -379,8 +379,8 @@ Index: src/include/http_conf_globals.h
 | function.
 +---------------------------------------------------------------------------
 Index: src/include/httpd.h
---- src/include/httpd.h        11 May 2004 18:28:12 -0000      1.1.1.23
-+++ src/include/httpd.h        11 May 2004 18:32:15 -0000      1.33
+--- src/include/httpd.h        30 Oct 2004 13:42:25 -0000      1.1.1.25
++++ src/include/httpd.h        30 Oct 2004 13:44:00 -0000      1.35
 @@ -27,7 +27,19 @@
  /* Headers in which EVERYONE has an interest... */
  
@@ -482,8 +482,8 @@ Index: src/include/httpd.h
 | Patch the shared memory pool support into the Apache pool facility.
 +---------------------------------------------------------------------------
 Index: src/main/alloc.c
---- src/main/alloc.c   11 May 2004 18:28:13 -0000      1.1.1.16
-+++ src/main/alloc.c   11 May 2004 18:32:15 -0000      1.25
+--- src/main/alloc.c   22 Oct 2004 10:15:50 -0000      1.1.1.17
++++ src/main/alloc.c   22 Oct 2004 10:18:59 -0000      1.26
 @@ -21,6 +21,10 @@
   */
  
@@ -1017,8 +1017,8 @@ Index: src/main/buff.c
 | variables are initialized.
 +---------------------------------------------------------------------------
 Index: src/main/http_config.c
---- src/main/http_config.c     11 May 2004 18:28:14 -0000      1.1.1.17
-+++ src/main/http_config.c     11 May 2004 18:32:15 -0000      1.20
+--- src/main/http_config.c     22 Oct 2004 10:15:50 -0000      1.1.1.18
++++ src/main/http_config.c     22 Oct 2004 10:18:59 -0000      1.21
 @@ -557,6 +557,20 @@
        m->name = tmp;
      }
@@ -1090,7 +1090,7 @@ Index: src/main/http_config.c
      if ((l[0] == '#') || (!l[0]))
        return NULL;
  
-@@ -1424,6 +1474,10 @@
+@@ -1428,6 +1478,10 @@
      s->limit_req_fieldsize = main_server->limit_req_fieldsize;
      s->limit_req_fields = main_server->limit_req_fields;
  
@@ -1101,7 +1101,7 @@ Index: src/main/http_config.c
      *ps = s;
  
      return ap_parse_vhost_addrs(p, hostname, s);
-@@ -1535,6 +1589,10 @@
+@@ -1539,6 +1593,10 @@
      s->module_config = create_server_config(p, s);
      s->lookup_defaults = create_default_per_dir_config(p);
  
@@ -1120,8 +1120,8 @@ Index: src/main/http_config.c
 | is added plus the initialization of one more `ctx' variable.
 +---------------------------------------------------------------------------
 Index: src/main/http_main.c
---- src/main/http_main.c       11 May 2004 18:28:14 -0000      1.1.1.22
-+++ src/main/http_main.c       11 May 2004 18:32:15 -0000      1.44
+--- src/main/http_main.c       22 Oct 2004 10:15:50 -0000      1.1.1.23
++++ src/main/http_main.c       6 Jul 2005 12:29:22 -0000       1.46
 @@ -242,6 +242,9 @@
  
  int ap_dump_settings = 0;
@@ -1163,28 +1163,27 @@ Index: src/main/http_main.c
  #ifndef NETWARE
  static APACHE_TLS int volatile exit_after_unblock = 0;
  #endif
-@@ -1541,6 +1568,10 @@
-           ap_log_transaction(log_req);
+@@ -1542,6 +1569,9 @@
        }
  
+       ap_bsetflag(save_req->connection->client, B_EOUT, 1);
 +#ifdef EAPI
 +      ap_call_close_connection_hook(save_req->connection);
 +#endif /* EAPI */
-+
-       ap_bsetflag(save_req->connection->client, B_EOUT, 1);
        ap_bclose(save_req->connection->client);
        
-@@ -1549,6 +1580,9 @@
-         ap_longjmp(jmpbuffer, 1);
+       if (!ap_standalone)
+@@ -1550,6 +1580,9 @@
      }
      else {                    /* abort the connection */
+       ap_bsetflag(current_conn->client, B_EOUT, 1);
 +#ifdef EAPI
 +      ap_call_close_connection_hook(current_conn);
 +#endif /* EAPI */
-       ap_bsetflag(current_conn->client, B_EOUT, 1);
        ap_bclose(current_conn->client);
        current_conn->aborted = 1;
-@@ -1851,10 +1885,16 @@
+     }
+@@ -1851,10 +1884,16 @@
      /* Send any leftover data to the client, but never try to again */
  
      if (ap_bflush(r->connection->client) == -1) {
@@ -1201,7 +1200,7 @@ Index: src/main/http_main.c
      ap_bsetflag(r->connection->client, B_EOUT, 1);
  
      /* Close our half of the connection --- send the client a FIN */
-@@ -2553,6 +2593,9 @@
+@@ -2553,6 +2592,9 @@
      /* Clear the pool - including any registered cleanups */
      ap_destroy_pool(pglobal);
  #endif
@@ -1211,7 +1210,7 @@ Index: src/main/http_main.c
      exit(code);
  }
  
-@@ -3623,6 +3666,24 @@
+@@ -3623,6 +3665,24 @@
      conn->remote_addr = *remaddr;
      conn->remote_ip = ap_pstrdup(conn->pool,
                              inet_ntoa(conn->remote_addr.sin_addr));
@@ -1236,7 +1235,7 @@ Index: src/main/http_main.c
  
      return conn;
  }
-@@ -4133,6 +4194,15 @@
+@@ -4133,6 +4193,15 @@
      printf("Server's Module Magic Number: %u:%u\n",
           MODULE_MAGIC_NUMBER_MAJOR, MODULE_MAGIC_NUMBER_MINOR);
      printf("Server compiled with....\n");
@@ -1252,7 +1251,7 @@ Index: src/main/http_main.c
  #ifdef TPF
      show_os_specific_compile_settings();
  #endif
-@@ -4307,6 +4377,22 @@
+@@ -4307,6 +4376,22 @@
      ap_server_pre_read_config  = ap_make_array(pcommands, 1, sizeof(char *));
      ap_server_post_read_config = ap_make_array(pcommands, 1, sizeof(char *));
      ap_server_config_defines   = ap_make_array(pcommands, 1, sizeof(char *));
@@ -1275,7 +1274,7 @@ Index: src/main/http_main.c
  }
  
  #ifndef MULTITHREAD
-@@ -4808,6 +4894,9 @@
+@@ -4808,6 +4893,9 @@
  
            ap_sync_scoreboard_image();
            if (ap_scoreboard_image->global.running_generation != ap_my_generation) {
@@ -1285,7 +1284,7 @@ Index: src/main/http_main.c
                ap_bclose(conn_io);
                clean_child_exit(0);
            }
-@@ -4836,6 +4925,9 @@
+@@ -4836,6 +4924,9 @@
         */
  
  #ifdef NO_LINGCLOSE
@@ -1295,7 +1294,7 @@ Index: src/main/http_main.c
        ap_bclose(conn_io);     /* just close it */
  #else
        if (r && r->connection
-@@ -4846,6 +4938,9 @@
+@@ -4846,6 +4937,9 @@
            lingering_close(r);
        }
        else {
@@ -1305,7 +1304,7 @@ Index: src/main/http_main.c
            ap_bsetflag(conn_io, B_EOUT, 1);
            ap_bclose(conn_io);
        }
-@@ -5619,16 +5714,31 @@
+@@ -5629,16 +5723,31 @@
            usage(argv[0]);
        }
      }
@@ -1337,7 +1336,7 @@ Index: src/main/http_main.c
      }
  
      child_timeouts = !ap_standalone || one_process;
-@@ -5776,6 +5886,10 @@
+@@ -5786,6 +5895,10 @@
            ap_destroy_pool(r->pool);
        }
  
@@ -1348,7 +1347,7 @@ Index: src/main/http_main.c
        ap_bclose(cio);
      }
      exit(0);
-@@ -6152,6 +6266,9 @@
+@@ -6162,6 +6275,9 @@
        ap_kill_cleanups_for_socket(ptrans, csd);
  
  #ifdef NO_LINGCLOSE
@@ -1358,7 +1357,7 @@ Index: src/main/http_main.c
        ap_bclose(conn_io);     /* just close it */
  #else
        if (r && r->connection
-@@ -6162,6 +6279,9 @@
+@@ -6172,6 +6288,9 @@
            lingering_close(r);
        }
        else {
@@ -1368,7 +1367,7 @@ Index: src/main/http_main.c
            ap_bsetflag(conn_io, B_EOUT, 1);
            ap_bclose(conn_io);
        }
-@@ -7737,6 +7857,10 @@
+@@ -7747,6 +7866,10 @@
      if (!conf_specified)
          ap_cpystrn(ap_server_confname, SERVER_CONFIG_FILE, sizeof(ap_server_confname));
  
@@ -1379,7 +1378,7 @@ Index: src/main/http_main.c
      if (!ap_os_is_path_absolute(ap_server_confname))
          ap_cpystrn(ap_server_confname,
                     ap_server_root_relative(pcommands, ap_server_confname),
-@@ -7777,6 +7901,9 @@
+@@ -7787,6 +7910,9 @@
  #else /* ndef WIN32 */
      server_conf = ap_read_config(pconf, ptrans, ap_server_confname);
  #endif
@@ -1395,9 +1394,9 @@ Index: src/main/http_main.c
 | conn_rec structures.
 +---------------------------------------------------------------------------
 Index: src/main/http_request.c
---- src/main/http_request.c    11 May 2004 18:28:15 -0000      1.1.1.18
-+++ src/main/http_request.c    11 May 2004 18:32:15 -0000      1.18
-@@ -1363,6 +1363,10 @@
+--- src/main/http_request.c    22 Oct 2004 10:15:57 -0000      1.1.1.19
++++ src/main/http_request.c    22 Oct 2004 10:18:59 -0000      1.19
+@@ -1372,6 +1372,10 @@
  
      new->method          = r->method;
      new->method_number   = r->method_number;
@@ -1414,9 +1413,9 @@ Index: src/main/http_request.c
 | request_rec structures.
 +---------------------------------------------------------------------------
 Index: src/main/http_protocol.c
---- src/main/http_protocol.c   11 May 2004 18:28:15 -0000      1.1.1.20
-+++ src/main/http_protocol.c   11 May 2004 18:32:15 -0000      1.20
-@@ -1160,6 +1160,10 @@
+--- src/main/http_protocol.c   22 Oct 2004 10:15:51 -0000      1.1.1.21
++++ src/main/http_protocol.c   22 Oct 2004 10:18:59 -0000      1.21
+@@ -1172,6 +1172,10 @@
      r->status          = HTTP_REQUEST_TIME_OUT;  /* Until we get a request */
      r->the_request     = NULL;
  
@@ -1427,7 +1426,7 @@ Index: src/main/http_protocol.c
  #ifdef CHARSET_EBCDIC
      ap_bsetflag(r->connection->client, B_ASCII2EBCDIC, r->ebcdic.conv_in  = 1);
      ap_bsetflag(r->connection->client, B_EBCDIC2ASCII, r->ebcdic.conv_out = 1);
-@@ -1316,6 +1320,11 @@
+@@ -1328,6 +1332,11 @@
      rnew->read_body       = REQUEST_NO_BODY;
  
      rnew->main = (request_rec *) r;
@@ -1444,9 +1443,9 @@ Index: src/main/http_protocol.c
 | Add support for loading both EAPI and AP13 modules.
 +---------------------------------------------------------------------------
 Index: src/modules/standard/mod_so.c
---- src/modules/standard/mod_so.c      11 May 2004 18:28:20 -0000      1.1.1.11
-+++ src/modules/standard/mod_so.c      11 May 2004 18:32:16 -0000      1.12
-@@ -226,11 +226,24 @@
+--- src/modules/standard/mod_so.c      22 Oct 2004 10:15:57 -0000      1.1.1.12
++++ src/modules/standard/mod_so.c      22 Oct 2004 10:18:59 -0000      1.13
+@@ -266,11 +266,24 @@
       * Make sure the found module structure is really a module structure
       * 
       */
@@ -1573,9 +1572,9 @@ Index: src/modules/standard/mod_log_config.c
 | variables from other modules.
 +---------------------------------------------------------------------------
 Index: src/modules/standard/mod_rewrite.c
---- src/modules/standard/mod_rewrite.c 11 May 2004 18:28:20 -0000      1.1.1.19
-+++ src/modules/standard/mod_rewrite.c 11 May 2004 18:32:16 -0000      1.17
-@@ -3848,6 +3848,15 @@
+--- src/modules/standard/mod_rewrite.c 30 Oct 2004 13:42:28 -0000      1.1.1.21
++++ src/modules/standard/mod_rewrite.c 30 Oct 2004 13:44:00 -0000      1.19
+@@ -3863,6 +3863,15 @@
      }
  #endif /* ndef WIN32 && NETWARE*/
  
@@ -1759,8 +1758,8 @@ Index: src/modules/proxy/mod_proxy.c
 | to enhance it by intercepting this processing.
 +---------------------------------------------------------------------------
 Index: src/modules/proxy/proxy_http.c
---- src/modules/proxy/proxy_http.c     11 May 2004 18:28:18 -0000      1.1.1.17
-+++ src/modules/proxy/proxy_http.c     11 May 2004 18:32:16 -0000      1.25
+--- src/modules/proxy/proxy_http.c     22 Oct 2004 10:15:57 -0000      1.1.1.18
++++ src/modules/proxy/proxy_http.c     22 Oct 2004 10:18:59 -0000      1.26
 @@ -127,6 +127,9 @@
      const char *datestr, *urlstr;
      int result, major, minor;