]> git.pld-linux.org Git - packages/apache1.git/commitdiff
projects / packages / apache1.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 409ae41)
- updated to EAPI from mod_ssl-2.8.2-1.3.19. apache-1_3_19-6
authorkloczek <kloczek@pld-linux.org>
Tue, 1 May 2001 12:24:12 +0000 (12:24 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    apache-mod_ssl-addon.patch -> 1.2
    apache-mod_ssl-eapi.patch -> 1.2

apache-mod_ssl-addon.patch patch | blob | blame | history
apache-mod_ssl-eapi.patch patch | blob | blame | history

diff --git a/apache-mod_ssl-addon.patch b/apache-mod_ssl-addon.patch
index 44e62c12c56d3a35e8d250224a48c9fce5010d6c..74cd2a4df188b8ba1e06e2cb4767afad1e2eb022 100644 (file)
--- a/apache-mod_ssl-addon.patch
+++ b/apache-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: 29-Jan-2001
+## Created on: 30-Mar-2001
 ##
 ## This file assembles changes to existing Apache source files
 ## between the original Apache and the patched variant. It can be
diff --git a/apache-mod_ssl-eapi.patch b/apache-mod_ssl-eapi.patch
index 71fc2bf3dc91e6feb6c1a05b0be0d010b3f5217a..1d66b984487e78d7f6f4a130397a4b71cc2939c7 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: 29-Jan-2001
+## Created on: 30-Mar-2001
 ##
 ## This file assembles changes to existing Apache source files
 ## between the original Apache and the patched variant. It can be
@@ -56,8 +56,8 @@ Index: src/Configuration.tmpl
 | Patch in implementation of the EAPI rule.
 +---------------------------------------------------------------------------
 Index: src/Configure
---- src/Configure      2001/01/29 19:36:36     1.1.1.13
-+++ src/Configure      2001/01/29 19:38:39     1.15
+--- src/Configure      2001/02/28 19:40:46     1.1.1.14
++++ src/Configure      2001/02/28 19:44:33     1.16
 @@ -1808,6 +1808,72 @@
  fi
  
@@ -233,8 +233,8 @@ Index: src/include/ap_mmn.h
 | shared memory pools.
 +---------------------------------------------------------------------------
 Index: src/include/ap_alloc.h
---- src/include/ap_alloc.h     2001/01/23 11:35:07     1.1.1.2
-+++ src/include/ap_alloc.h     2001/01/23 11:48:05     1.3
+--- src/include/ap_alloc.h     2001/02/28 19:40:47     1.1.1.3
++++ src/include/ap_alloc.h     2001/02/28 19:44:33     1.4
 @@ -95,6 +95,15 @@
  pool * ap_init_alloc(void);           /* Set up everything */
  void ap_cleanup_alloc(void);
@@ -402,8 +402,8 @@ Index: src/include/http_main.h
 | function.
 +---------------------------------------------------------------------------
 Index: src/include/httpd.h
---- src/include/httpd.h        2001/01/29 19:36:42     1.1.1.13
-+++ src/include/httpd.h        2001/01/29 19:38:39     1.22
+--- src/include/httpd.h        2001/02/28 19:40:48     1.1.1.14
++++ src/include/httpd.h        2001/02/28 19:44:33     1.23
 @@ -70,7 +70,19 @@
  /* Headers in which EVERYONE has an interest... */
  
@@ -1168,8 +1168,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       2001/01/29 19:36:43     1.1.1.12
-+++ src/main/http_main.c       2001/01/29 19:38:39     1.33
+--- src/main/http_main.c       2001/02/28 19:40:49     1.1.1.13
++++ src/main/http_main.c       2001/03/02 23:45:42     1.35
 @@ -260,6 +260,9 @@
  int ap_listenbacklog;
  int ap_dump_settings = 0;
@@ -1211,7 +1211,7 @@ Index: src/main/http_main.c
  #ifndef NETWARE
  static APACHE_TLS int volatile exit_after_unblock = 0;
  #endif
-@@ -1206,6 +1233,10 @@
+@@ -1209,6 +1236,10 @@
            ap_log_transaction(log_req);
        }
  
@@ -1222,7 +1222,7 @@ Index: src/main/http_main.c
        ap_bsetflag(save_req->connection->client, B_EOUT, 1);
        ap_bclose(save_req->connection->client);
        
-@@ -1214,6 +1245,9 @@
+@@ -1217,6 +1248,9 @@
          ap_longjmp(jmpbuffer, 1);
      }
      else {                    /* abort the connection */
@@ -1232,7 +1232,7 @@ Index: src/main/http_main.c
        ap_bsetflag(current_conn->client, B_EOUT, 1);
        ap_bclose(current_conn->client);
        current_conn->aborted = 1;
-@@ -1279,7 +1313,11 @@
+@@ -1282,7 +1316,11 @@
  }
  #endif
  
@@ -1244,7 +1244,7 @@ Index: src/main/http_main.c
  {
      unsigned int old;
  
-@@ -1515,10 +1553,16 @@
+@@ -1518,10 +1556,16 @@
      /* Send any leftover data to the client, but never try to again */
  
      if (ap_bflush(r->connection->client) == -1) {
@@ -1261,7 +1261,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 */
-@@ -2229,6 +2273,9 @@
+@@ -2232,6 +2276,9 @@
      /* Clear the pool - including any registered cleanups */
      ap_destroy_pool(pglobal);
  #endif
@@ -1271,7 +1271,7 @@ Index: src/main/http_main.c
      exit(code);
  }
  
-@@ -3223,6 +3270,24 @@
+@@ -3226,6 +3273,24 @@
      conn->remote_addr = *remaddr;
      conn->remote_ip = ap_pstrdup(conn->pool,
                              inet_ntoa(conn->remote_addr.sin_addr));
@@ -1296,19 +1296,7 @@ Index: src/main/http_main.c
  
      return conn;
  }
-@@ -3545,6 +3610,11 @@
-       else {
-           ap_note_cleanups_for_socket(p, fd);
-       }
-+      if (fd >= 0) {
-+          FD_SET(fd, &listenfds);
-+          if (fd > listenmaxfd)
-+              listenmaxfd = fd;
-+      }
-       FD_SET(fd, &listenfds);
-       if (fd > listenmaxfd)
-           listenmaxfd = fd;
-@@ -3644,6 +3714,15 @@
+@@ -3647,6 +3712,15 @@
      printf("Server's Module Magic Number: %u:%u\n",
           MODULE_MAGIC_NUMBER_MAJOR, MODULE_MAGIC_NUMBER_MINOR);
      printf("Server compiled with....\n");
@@ -1324,7 +1312,7 @@ Index: src/main/http_main.c
  #ifdef BIG_SECURITY_HOLE
      printf(" -D BIG_SECURITY_HOLE\n");
  #endif
-@@ -3797,6 +3876,22 @@
+@@ -3800,6 +3874,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 *));
@@ -1347,7 +1335,7 @@ Index: src/main/http_main.c
  }
  
  #ifndef MULTITHREAD
-@@ -4216,6 +4311,9 @@
+@@ -4219,6 +4309,9 @@
  
            ap_sync_scoreboard_image();
            if (ap_scoreboard_image->global.running_generation != ap_my_generation) {
@@ -1357,7 +1345,7 @@ Index: src/main/http_main.c
                ap_bclose(conn_io);
                clean_child_exit(0);
            }
-@@ -4244,6 +4342,9 @@
+@@ -4247,6 +4340,9 @@
         */
  
  #ifdef NO_LINGCLOSE
@@ -1367,7 +1355,7 @@ Index: src/main/http_main.c
        ap_bclose(conn_io);     /* just close it */
  #else
        if (r && r->connection
-@@ -4254,6 +4355,9 @@
+@@ -4257,6 +4353,9 @@
            lingering_close(r);
        }
        else {
@@ -1377,7 +1365,7 @@ Index: src/main/http_main.c
            ap_bsetflag(conn_io, B_EOUT, 1);
            ap_bclose(conn_io);
        }
-@@ -4978,16 +5082,31 @@
+@@ -4981,16 +5080,31 @@
            usage(argv[0]);
        }
      }
@@ -1409,7 +1397,7 @@ Index: src/main/http_main.c
      }
  
      child_timeouts = !ap_standalone || one_process;
-@@ -5121,6 +5240,10 @@
+@@ -5120,6 +5234,10 @@
            ap_destroy_pool(r->pool);
        }
  
@@ -1420,7 +1408,7 @@ Index: src/main/http_main.c
        ap_bclose(cio);
      }
      exit(0);
-@@ -5467,6 +5590,9 @@
+@@ -5466,6 +5584,9 @@
        ap_kill_cleanups_for_socket(ptrans, csd);
  
  #ifdef NO_LINGCLOSE
@@ -1430,7 +1418,7 @@ Index: src/main/http_main.c
        ap_bclose(conn_io);     /* just close it */
  #else
        if (r && r->connection
-@@ -5477,6 +5603,9 @@
+@@ -5476,6 +5597,9 @@
            lingering_close(r);
        }
        else {
@@ -1440,17 +1428,18 @@ Index: src/main/http_main.c
            ap_bsetflag(conn_io, B_EOUT, 1);
            ap_bclose(conn_io);
        }
-@@ -6979,6 +7108,9 @@
-                        sizeof(ap_server_root));
-         }
-     }
+@@ -6989,6 +7113,10 @@
+     if (!conf_specified)
+         ap_cpystrn(ap_server_confname, SERVER_CONFIG_FILE, sizeof(ap_server_confname));
+ 
 +#ifdef EAPI
 +    ap_init_alloc_shared(TRUE);
 +#endif
- 
-     ap_cpystrn(ap_server_confname,
-                ap_server_root_relative(pcommands, ap_server_confname),
-@@ -7020,6 +7152,9 @@
++
+     if (!ap_os_is_path_absolute(ap_server_confname))
+         ap_cpystrn(ap_server_confname,
+                    ap_server_root_relative(pcommands, ap_server_confname),
+@@ -7030,6 +7158,9 @@
      }
  #else /* ndef WIN32 */
      server_conf = ap_read_config(pconf, ptrans, ap_server_confname);
@@ -1466,9 +1455,9 @@ Index: src/main/http_main.c
 | conn_rec structures.
 +---------------------------------------------------------------------------
 Index: src/main/http_request.c
---- src/main/http_request.c    2001/01/23 11:35:09     1.1.1.10
-+++ src/main/http_request.c    2001/01/23 11:48:07     1.9
-@@ -1387,6 +1387,9 @@
+--- src/main/http_request.c    2001/02/28 19:40:49     1.1.1.11
++++ src/main/http_request.c    2001/02/28 19:44:34     1.10
+@@ -1404,6 +1404,9 @@
      new->no_local_copy   = r->no_local_copy;
      new->read_length     = r->read_length;     /* We can only read it once */
      new->vlist_validator = r->vlist_validator;
@@ -1484,8 +1473,8 @@ Index: src/main/http_request.c
 | request_rec structures.
 +---------------------------------------------------------------------------
 Index: src/main/http_protocol.c
---- src/main/http_protocol.c   2001/01/23 11:35:09     1.1.1.11
-+++ src/main/http_protocol.c   2001/01/23 11:48:06     1.11
+--- src/main/http_protocol.c   2001/02/28 19:40:49     1.1.1.12
++++ src/main/http_protocol.c   2001/02/28 19:44:34     1.12
 @@ -1105,6 +1105,10 @@
      r->status          = HTTP_REQUEST_TIME_OUT;  /* Until we get a request */
      r->the_request     = NULL;
@@ -1643,8 +1632,8 @@ 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 2001/01/23 11:35:13     1.1.1.9
-+++ src/modules/standard/mod_rewrite.c 2001/01/23 11:48:08     1.7
+--- src/modules/standard/mod_rewrite.c 2001/02/28 19:40:52     1.1.1.10
++++ src/modules/standard/mod_rewrite.c 2001/02/28 19:44:34     1.8
 @@ -3637,6 +3637,15 @@
      }
  #endif /* ndef WIN32 && NETWARE*/
@@ -1820,8 +1809,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     2001/01/23 11:35:10     1.1.1.9
-+++ src/modules/proxy/proxy_http.c     2001/01/23 11:48:07     1.17
+--- src/modules/proxy/proxy_http.c     2001/02/28 19:40:51     1.1.1.10
++++ src/modules/proxy/proxy_http.c     2001/02/28 19:44:34     1.18
 @@ -190,6 +190,9 @@
      const char *urlptr = NULL;
      const char *datestr;
@@ -1845,7 +1834,7 @@ Index: src/modules/proxy/proxy_http.c
      strp = strchr(urlptr, '/');
      if (strp == NULL) {
        desthost = ap_pstrdup(p, urlptr);
-@@ -244,12 +253,18 @@
+@@ -245,12 +254,18 @@
        err = ap_proxy_host2addr(proxyhost, &server_hp);
        if (err != NULL)
            return DECLINED;    /* try another */
@@ -1864,7 +1853,7 @@ Index: src/modules/proxy/proxy_http.c
      }
  
      sock = ap_psocket(p, PF_INET, SOCK_STREAM, IPPROTO_TCP);
-@@ -306,13 +321,41 @@
+@@ -307,13 +322,41 @@
      f = ap_bcreate(p, B_RDWR | B_SOCKET);
      ap_bpushfd(f, sock, sock);
  
@@ -1931,9 +1920,9 @@ Index: src/support/apxs.pl
 | and similar braindead platforms as DSO.
 +---------------------------------------------------------------------------
 Index: src/support/httpd.exp
---- src/support/httpd.exp      2000/10/12 08:17:39     1.1.1.8
-+++ src/support/httpd.exp      2000/10/12 08:31:48     1.10
-@@ -421,3 +421,59 @@
+--- src/support/httpd.exp      2001/02/28 19:40:56     1.1.1.9
++++ src/support/httpd.exp      2001/02/28 19:44:35     1.11
+@@ -422,3 +422,59 @@
  XML_SetUnparsedEntityDeclHandler
  XML_SetUserData
  XML_UseParserAsHandlerArg
@@ -2000,8 +1989,8 @@ Index: src/support/httpd.exp
 +---------------------------------------------------------------------------
 Index: src/ApacheCore.def
 --- src/ApacheCore.def 2001/01/23 11:35:01     1.1.1.7
-+++ src/ApacheCore.def 2001/01/23 12:38:37     1.10
-@@ -389,3 +389,70 @@
++++ src/ApacheCore.def 2001/03/03 10:46:41     1.11
+@@ -389,3 +389,69 @@
        ap_stripprefix @380
          ap_os_dso_load @381
          ap_os_dso_error @382
@@ -2026,8 +2015,7 @@ Index: src/ApacheCore.def
 +      ap_set_callback_and_alarm
 +      recvwithtimeout
 +      sendwithtimeout
-+      ap_aquire_pool
-+      ap_make_shared_pool
++      ap_acquire_pool
 +      ap_make_shared_sub_pool
 +      ap_release_pool
 +      ap_mm_useable
The most widely used Web server on the Internet
This page took 0.283082 seconds and 4 git commands to generate.