SOURCES: apache1-mod_ssl-addon.patch, apache1-mod_ssl-eapi.patch -...
hawk
hawk at pld-linux.org
Sun Jul 30 15:23:33 CEST 2006
Author: hawk Date: Sun Jul 30 13:23:33 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated from mod_ssl 2.8.28-1.3.37
---- Files affected:
SOURCES:
apache1-mod_ssl-addon.patch (1.7 -> 1.8) , apache1-mod_ssl-eapi.patch (1.8 -> 1.9)
---- Diffs:
================================================================
Index: SOURCES/apache1-mod_ssl-addon.patch
diff -u SOURCES/apache1-mod_ssl-addon.patch:1.7 SOURCES/apache1-mod_ssl-addon.patch:1.8
--- SOURCES/apache1-mod_ssl-addon.patch:1.7 Tue Oct 18 10:19:39 2005
+++ SOURCES/apache1-mod_ssl-addon.patch Sun Jul 30 15:23:28 2006
@@ -8,7 +8,7 @@
##
## Annotated patch file: addon.patch
## Copyright (c) 1998-2001 Ralf S. Engelschall, All Rights Reserved.
-## Created on: 18-Oct-2005
+## Created on: 28-Jul-2006
##
## This file assembles changes to existing Apache source files
## between the original Apache and the patched variant. It can be
@@ -40,9 +40,9 @@
| Add more beautiful optic to the status page table..
+---------------------------------------------------------------------------
Index: src/modules/standard/mod_status.c
---- 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 @@
+--- src/modules/standard/mod_status.c 28 Jul 2006 13:55:27 -0000 1.1.1.17
++++ src/modules/standard/mod_status.c 28 Jul 2006 13:56:29 -0000 1.14
+@@ -442,12 +442,33 @@
if (no_table_report)
ap_rputs("<p><hr><h2>Server Details</h2>\n\n", r);
else
@@ -76,7 +76,7 @@
}
for (i = 0; i < HARD_SERVER_LIMIT; ++i) {
-@@ -574,6 +595,11 @@
+@@ -575,6 +596,11 @@
vhost->server_hostname) : "(unavailable)");
}
else { /* !no_table_report */
@@ -88,7 +88,7 @@
if (score_record.status == SERVER_DEAD)
#ifdef TPF
if (kill(ps_record.pid, 0) == 0) {
-@@ -586,12 +612,12 @@
+@@ -587,12 +613,12 @@
} else
#endif /* TPF */
ap_rprintf(r,
@@ -103,7 +103,7 @@
i, (int) ps_record.generation,
(int) ps_record.pid, (int) conn_lres,
my_lres, lres);
-@@ -695,6 +732,12 @@
+@@ -696,6 +733,12 @@
#endif
}
@@ -121,9 +121,9 @@
| Add a hyperlink to the mod_define.html document.
+---------------------------------------------------------------------------
Index: htdocs/manual/mod/index.html.en
---- 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 @@
+--- 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 +139,9 @@
| Add a hyperlink for the Define directives.
+---------------------------------------------------------------------------
Index: htdocs/manual/mod/directives.html.en
---- htdocs/manual/mod/directives.html.en 18 Oct 2005 06:26:16 -0000 1.1.1.7
-+++ htdocs/manual/mod/directives.html.en 18 Oct 2005 06:27:33 -0000 1.8
-@@ -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>
================================================================
Index: SOURCES/apache1-mod_ssl-eapi.patch
diff -u SOURCES/apache1-mod_ssl-eapi.patch:1.8 SOURCES/apache1-mod_ssl-eapi.patch:1.9
--- SOURCES/apache1-mod_ssl-eapi.patch:1.8 Tue Oct 18 10:19:40 2005
+++ SOURCES/apache1-mod_ssl-eapi.patch Sun Jul 30 15:23:28 2006
@@ -7,7 +7,7 @@
##
## Annotated patch file: eapi.patch
## Copyright (c) 1998-2001 Ralf S. Engelschall, All Rights Reserved.
-## Created on: 18-Oct-2005
+## Created on: 28-Jul-2006
##
## This file assembles changes to existing Apache source files
## between the original Apache and the patched variant. It can be
@@ -56,9 +56,9 @@
| Patch in implementation of the EAPI rule.
+---------------------------------------------------------------------------
Index: src/Configure
---- src/Configure 18 Oct 2005 06:26:22 -0000 1.1.1.26
-+++ src/Configure 18 Oct 2005 06:27:34 -0000 1.29
-@@ -1867,6 +1867,72 @@
+--- src/Configure 28 Jul 2006 13:55:21 -0000 1.1.1.29
++++ src/Configure 28 Jul 2006 13:56:29 -0000 1.32
+@@ -1868,6 +1868,72 @@
fi
####################################################################
@@ -200,9 +200,9 @@
| EAPI-aware modules and standard modules.
+---------------------------------------------------------------------------
Index: src/include/ap_mmn.h
---- src/include/ap_mmn.h 18 Oct 2005 06:26:23 -0000 1.1.1.14
-+++ src/include/ap_mmn.h 18 Oct 2005 06:27:34 -0000 1.14
-@@ -206,7 +206,23 @@
+--- src/include/ap_mmn.h 28 Jul 2006 13:55:31 -0000 1.1.1.15
++++ src/include/ap_mmn.h 28 Jul 2006 13:56:29 -0000 1.15
+@@ -207,7 +207,23 @@
* 19990320.18 - trace_enable member added to core server_config
*/
@@ -232,9 +232,9 @@
| shared memory pools.
+---------------------------------------------------------------------------
Index: src/include/ap_alloc.h
---- src/include/ap_alloc.h 11 May 2004 18:28:11 -0000 1.1.1.7
-+++ src/include/ap_alloc.h 11 May 2004 18:32:15 -0000 1.8
-@@ -52,6 +52,15 @@
+--- src/include/ap_alloc.h 28 Jul 2006 13:55:32 -0000 1.1.1.9
++++ src/include/ap_alloc.h 28 Jul 2006 13:56:29 -0000 1.10
+@@ -53,6 +53,15 @@
API_EXPORT(pool *) ap_init_alloc(void); /* Set up everything */
void ap_cleanup_alloc(void);
API_EXPORT(pool *) ap_make_sub_pool(pool *); /* All pools are subpools of permanent_pool */
@@ -255,9 +255,9 @@
| Add the additional context variable `ctx' for BUFF structures.
+---------------------------------------------------------------------------
Index: src/include/buff.h
---- src/include/buff.h 11 May 2004 18:28:12 -0000 1.1.1.8
-+++ src/include/buff.h 11 May 2004 18:32:15 -0000 1.12
-@@ -82,6 +82,10 @@
+--- src/include/buff.h 28 Jul 2006 13:55:31 -0000 1.1.1.9
++++ src/include/buff.h 28 Jul 2006 13:56:29 -0000 1.13
+@@ -83,6 +83,10 @@
/* transport handle, for RPC binding handle or some such */
void *t_handle;
@@ -268,7 +268,7 @@
#ifdef B_SFIO
Sfio_t *sf_in;
Sfio_t *sf_out;
-@@ -138,6 +142,10 @@
+@@ -139,6 +143,10 @@
API_EXPORT(int) ap_bflsbuf(int c, BUFF *fb);
API_EXPORT(int) ap_bfilbuf(BUFF *fb);
@@ -284,9 +284,9 @@
| Add the four additional Apache API module hooks.
+---------------------------------------------------------------------------
Index: src/include/http_config.h
---- src/include/http_config.h 11 May 2004 18:28:12 -0000 1.1.1.12
-+++ src/include/http_config.h 11 May 2004 18:32:15 -0000 1.14
-@@ -233,6 +233,65 @@
+--- src/include/http_config.h 28 Jul 2006 13:55:31 -0000 1.1.1.15
++++ src/include/http_config.h 28 Jul 2006 13:56:29 -0000 1.17
+@@ -234,6 +234,65 @@
void (*child_exit) (server_rec *, pool *);
#endif
int (*post_read_request) (request_rec *);
@@ -358,9 +358,9 @@
| global module context.
+---------------------------------------------------------------------------
Index: src/include/http_conf_globals.h
---- src/include/http_conf_globals.h 11 May 2004 18:28:12 -0000 1.1.1.14
-+++ src/include/http_conf_globals.h 11 May 2004 18:32:15 -0000 1.15
-@@ -52,6 +52,9 @@
+--- src/include/http_conf_globals.h 28 Jul 2006 13:55:30 -0000 1.1.1.15
++++ src/include/http_conf_globals.h 28 Jul 2006 13:56:29 -0000 1.16
+@@ -53,6 +53,9 @@
#endif
extern int ap_dump_settings;
extern API_VAR_EXPORT int ap_extended_status;
@@ -379,9 +379,9 @@
| function.
+---------------------------------------------------------------------------
Index: src/include/httpd.h
---- src/include/httpd.h 18 Oct 2005 06:26:24 -0000 1.1.1.26
-+++ src/include/httpd.h 18 Oct 2005 06:27:34 -0000 1.36
-@@ -27,7 +27,19 @@
+--- src/include/httpd.h 28 Jul 2006 13:55:32 -0000 1.1.1.29
++++ src/include/httpd.h 28 Jul 2006 13:56:29 -0000 1.39
+@@ -28,7 +28,19 @@
/* Headers in which EVERYONE has an interest... */
#include "ap_config.h"
@@ -401,7 +401,7 @@
#include "buff.h"
#include "ap.h"
-@@ -102,8 +114,13 @@
+@@ -103,8 +115,13 @@
#define ap_http_method(r) ap_os_http_method((void*)r)
#define ap_default_port(r) ap_os_default_port((void*)r)
#else
@@ -415,7 +415,7 @@
#endif
/* --------- Default user name and group name running standalone ---------- */
-@@ -312,6 +329,19 @@
+@@ -313,6 +330,19 @@
#define SCOREBOARD_MAINTENANCE_INTERVAL 1000000
#endif
@@ -435,7 +435,7 @@
/* Number of requests to try to handle in a single process. If <= 0,
* the children don't die off. That's the default here, since I'm still
* interested in finding and stanching leaks.
-@@ -404,6 +434,9 @@
+@@ -405,6 +435,9 @@
API_EXPORT(const char *) ap_get_server_version(void);
API_EXPORT(void) ap_add_version_component(const char *component);
API_EXPORT(const char *) ap_get_server_built(void);
@@ -445,7 +445,7 @@
/* Numeric release version identifier: MMNNFFRBB: major minor fix final beta
* Always increases along the same track as the source branch.
-@@ -807,6 +840,10 @@
+@@ -808,6 +841,10 @@
* record to improve 64bit alignment the next time we need to break
* binary compatibility for some other reason.
*/
@@ -456,7 +456,7 @@
};
-@@ -855,6 +892,9 @@
+@@ -856,6 +893,9 @@
char *local_host; /* used for ap_get_server_name when
* UseCanonicalName is set to DNS
* (ignores setting of HostnameLookups) */
@@ -466,7 +466,7 @@
};
/* Per-vhost config... */
-@@ -927,6 +967,10 @@
+@@ -928,6 +968,10 @@
int limit_req_line; /* limit on size of the HTTP request line */
int limit_req_fieldsize; /* limit on size of any request header field */
int limit_req_fields; /* limit on number of request header fields */
@@ -482,9 +482,9 @@
| Patch the shared memory pool support into the Apache pool facility.
+---------------------------------------------------------------------------
Index: src/main/alloc.c
---- 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 @@
+--- src/main/alloc.c 28 Jul 2006 13:55:33 -0000 1.1.1.18
++++ src/main/alloc.c 28 Jul 2006 13:56:29 -0000 1.27
+@@ -22,6 +22,10 @@
*/
#include "httpd.h"
@@ -495,7 +495,7 @@
#include "multithread.h"
#include "http_log.h"
-@@ -95,6 +99,10 @@
+@@ -96,6 +100,10 @@
#define BLOCK_MINALLOC 0
#endif
@@ -506,7 +506,7 @@
/*****************************************************************
*
* Managing free storage blocks...
-@@ -123,6 +131,9 @@
+@@ -124,6 +132,9 @@
char *endp;
union block_hdr *next;
char *first_avail;
@@ -516,7 +516,7 @@
#ifdef POOL_DEBUG
union block_hdr *global_next;
struct pool *owning_pool;
-@@ -173,7 +184,11 @@
+@@ -174,7 +185,11 @@
/* Get a completely new block from the system pool. Note that we rely on
malloc() to provide aligned memory. */
@@ -528,7 +528,7 @@
{
union block_hdr *blok;
int request_size;
-@@ -189,6 +204,11 @@
+@@ -190,6 +205,11 @@
num_malloc_bytes += size + sizeof(union block_hdr);
#endif
request_size = size + sizeof(union block_hdr);
@@ -540,7 +540,7 @@
blok = (union block_hdr *) malloc(request_size);
if (blok == NULL) {
fprintf(stderr, "Ouch! malloc(%d) failed in malloc_block()\n",
-@@ -196,6 +216,9 @@
+@@ -197,6 +217,9 @@
exit(1);
}
debug_fill(blok, size + sizeof(union block_hdr));
@@ -550,7 +550,7 @@
blok->h.next = NULL;
blok->h.first_avail = (char *) (blok + 1);
blok->h.endp = size + blok->h.first_avail;
-@@ -256,6 +279,10 @@
+@@ -257,6 +280,10 @@
if (blok == NULL)
return; /* Sanity check --- freeing empty pool? */
@@ -561,7 +561,7 @@
(void) ap_acquire_mutex(alloc_mutex);
old_free_list = block_freelist;
block_freelist = blok;
-@@ -302,6 +329,10 @@
+@@ -303,6 +330,10 @@
#endif
(void) ap_release_mutex(alloc_mutex);
@@ -572,7 +572,7 @@
#endif
}
-@@ -310,7 +341,11 @@
+@@ -311,7 +342,11 @@
* if necessary. Must be called with alarms blocked.
*/
@@ -584,7 +584,7 @@
{
union block_hdr **lastptr = &block_freelist;
union block_hdr *blok = block_freelist;
-@@ -320,7 +355,12 @@
+@@ -321,7 +356,12 @@
*/
while (blok != NULL) {
@@ -597,7 +597,7 @@
*lastptr = blok->h.next;
blok->h.next = NULL;
debug_verify_filled(blok->h.first_avail, blok->h.endp,
-@@ -336,7 +376,11 @@
+@@ -337,7 +377,11 @@
/* Nope. */
min_size += BLOCK_MINFREE;
@@ -609,7 +609,7 @@
return blok;
}
-@@ -386,6 +430,9 @@
+@@ -387,6 +431,9 @@
#ifdef POOL_DEBUG
struct pool *joined;
#endif
@@ -619,7 +619,7 @@
};
static pool *permanent_pool;
-@@ -400,16 +447,28 @@
+@@ -401,16 +448,28 @@
#define POOL_HDR_CLICKS (1 + ((sizeof(struct pool) - 1) / CLICK_SZ))
#define POOL_HDR_BYTES (POOL_HDR_CLICKS * CLICK_SZ)
@@ -648,7 +648,7 @@
new_pool = (pool *) blok->h.first_avail;
blok->h.first_avail += POOL_HDR_BYTES;
#ifdef POOL_DEBUG
-@@ -428,12 +487,38 @@
+@@ -429,12 +488,38 @@
p->sub_pools = new_pool;
}
@@ -687,7 +687,7 @@
#ifdef POOL_DEBUG
static void stack_var_init(char *s)
{
-@@ -448,6 +533,13 @@
+@@ -449,6 +534,13 @@
}
#endif
@@ -701,7 +701,7 @@
#ifdef ALLOC_STATS
static void dump_stats(void)
{
-@@ -480,6 +572,58 @@
+@@ -481,6 +573,58 @@
return permanent_pool;
}
@@ -760,7 +760,7 @@
void ap_cleanup_alloc(void)
{
ap_destroy_mutex(alloc_mutex);
-@@ -490,10 +634,18 @@
+@@ -491,10 +635,18 @@
{
ap_block_alarms();
@@ -779,7 +779,7 @@
/* Don't hold the mutex during cleanups. */
run_cleanups(a->cleanups);
a->cleanups = NULL;
-@@ -527,6 +679,10 @@
+@@ -528,6 +680,10 @@
ap_block_alarms();
ap_clear_pool(a);
@@ -790,7 +790,7 @@
(void) ap_acquire_mutex(alloc_mutex);
if (a->parent) {
if (a->parent->sub_pools == a)
-@@ -537,6 +693,10 @@
+@@ -538,6 +694,10 @@
a->sub_next->sub_prev = a->sub_prev;
}
(void) ap_release_mutex(alloc_mutex);
@@ -801,7 +801,7 @@
free_blocks(a->first);
ap_unblock_alarms();
-@@ -551,6 +711,30 @@
+@@ -552,6 +712,30 @@
return bytes_in_block_list(block_freelist);
}
@@ -832,7 +832,7 @@
/*****************************************************************
* POOL_DEBUG support
*/
-@@ -716,16 +900,31 @@
+@@ -717,16 +901,31 @@
ap_block_alarms();
@@ -864,7 +864,7 @@
ap_unblock_alarms();
-@@ -842,6 +1041,11 @@
+@@ -843,6 +1042,11 @@
size = cur_len << 1;
if (size < AP_PSPRINTF_MIN_SIZE)
size = AP_PSPRINTF_MIN_SIZE;
@@ -876,7 +876,7 @@
ptr = realloc(ps->base, size);
if (ptr == NULL) {
fputs("Ouch! Out of memory!\n", stderr);
-@@ -865,9 +1069,21 @@
+@@ -866,9 +1070,21 @@
size = AP_PSPRINTF_MIN_SIZE;
/* must try another blok */
@@ -898,7 +898,7 @@
memcpy(nblok->h.first_avail, blok->h.first_avail, cur_len);
ps->vbuff.curpos = nblok->h.first_avail + cur_len;
/* save a byte for the NUL terminator */
-@@ -876,10 +1092,18 @@
+@@ -877,10 +1093,18 @@
/* did we allocate the current blok? if so free it up */
if (ps->got_a_new_block) {
debug_fill(blok->h.first_avail, blok->h.endp - blok->h.first_avail);
@@ -917,7 +917,7 @@
}
ps->blok = nblok;
ps->got_a_new_block = 1;
-@@ -898,6 +1122,11 @@
+@@ -899,6 +1123,11 @@
void *ptr;
ap_block_alarms();
@@ -929,7 +929,7 @@
ps.base = malloc(512);
if (ps.base == NULL) {
fputs("Ouch! Out of memory!\n", stderr);
-@@ -910,6 +1139,11 @@
+@@ -911,6 +1140,11 @@
*ps.vbuff.curpos++ = '\0';
ptr = ps.base;
/* shrink */
@@ -947,9 +947,9 @@
| modules to intercept the I/O processing via hooks.
+---------------------------------------------------------------------------
Index: src/main/buff.c
---- src/main/buff.c 11 May 2004 18:28:14 -0000 1.1.1.15
-+++ src/main/buff.c 11 May 2004 18:32:15 -0000 1.23
-@@ -250,6 +250,9 @@
+--- src/main/buff.c 28 Jul 2006 13:55:34 -0000 1.1.1.17
++++ src/main/buff.c 28 Jul 2006 13:56:29 -0000 1.25
+@@ -251,6 +251,9 @@
}
else
#endif
@@ -959,7 +959,7 @@
rv = read(fb->fd_in, buf, nbyte);
return rv;
-@@ -261,6 +264,9 @@
+@@ -262,6 +265,9 @@
#if defined (WIN32) || defined(NETWARE) || defined(CYGWIN_WINSOCK)
if (fb->flags & B_SOCKET) {
@@ -969,7 +969,7 @@
rv = ap_recvwithtimeout(fb->fd_in, buf, nbyte, 0);
if (rv == SOCKET_ERROR)
errno = WSAGetLastError();
-@@ -308,6 +314,9 @@
+@@ -312,6 +318,9 @@
}
else
#endif
@@ -979,7 +979,7 @@
#if defined (B_SFIO)
rv = sfwrite(fb->sf_out, buf, nbyte);
#else
-@@ -338,6 +347,9 @@
+@@ -342,6 +351,9 @@
#if defined(WIN32) || defined(NETWARE)
if (fb->flags & B_SOCKET) {
@@ -989,7 +989,7 @@
rv = ap_sendwithtimeout(fb->fd, buf, nbyte, 0);
if (rv == SOCKET_ERROR)
errno = WSAGetLastError();
-@@ -421,6 +433,10 @@
+@@ -425,6 +437,10 @@
fb->callback_data = NULL;
fb->filter_callback = NULL;
@@ -1000,7 +1000,7 @@
return fb;
}
-@@ -1073,6 +1089,9 @@
+@@ -1077,6 +1093,9 @@
i = 0;
while (i < nvec) {
do
@@ -1017,9 +1017,9 @@
| variables are initialized.
+---------------------------------------------------------------------------
Index: src/main/http_config.c
---- 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 @@
+--- src/main/http_config.c 28 Jul 2006 13:55:33 -0000 1.1.1.21
++++ src/main/http_config.c 28 Jul 2006 13:56:29 -0000 1.24
+@@ -558,6 +558,20 @@
m->name = tmp;
}
#endif /*_OSD_POSIX*/
@@ -1040,7 +1040,7 @@
}
/*
-@@ -571,6 +585,21 @@
+@@ -572,6 +586,21 @@
{
module *modp;
@@ -1062,7 +1062,7 @@
modp = top_module;
if (modp == m) {
/* We are the top module, special case */
-@@ -964,6 +993,27 @@
+@@ -965,6 +994,27 @@
const command_rec *cmd;
module *mod = top_module;
@@ -1090,7 +1090,7 @@
if ((l[0] == '#') || (!l[0]))
return NULL;
-@@ -1428,6 +1478,10 @@
+@@ -1429,6 +1479,10 @@
s->limit_req_fieldsize = main_server->limit_req_fieldsize;
s->limit_req_fields = main_server->limit_req_fields;
@@ -1101,7 +1101,7 @@
*ps = s;
return ap_parse_vhost_addrs(p, hostname, s);
-@@ -1539,6 +1593,10 @@
+@@ -1540,6 +1594,10 @@
s->module_config = create_server_config(p, s);
s->lookup_defaults = create_default_per_dir_config(p);
@@ -1120,9 +1120,9 @@
| is added plus the initialization of one more `ctx' variable.
+---------------------------------------------------------------------------
Index: src/main/http_main.c
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/apache1-mod_ssl-addon.patch?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/SOURCES/apache1-mod_ssl-eapi.patch?r1=1.8&r2=1.9&f=u
More information about the pld-cvs-commit
mailing list