aboutsummaryrefslogtreecommitdiffstats
path: root/www/apache2/files
diff options
context:
space:
mode:
Diffstat (limited to 'www/apache2/files')
-rw-r--r--www/apache2/files/exp-http-ready.patch21
-rw-r--r--www/apache2/files/patch-fix-srclib:apr:network_io:unix:sockaddr.c10
-rw-r--r--www/apache2/files/patch-secfix-modules:dav:fs:lock.c46
-rw-r--r--www/apache2/files/patch-secfix-modules:ssl:ssl_engine_io.c34
-rw-r--r--www/apache2/files/patch-secfix-server:utils.c132
-rw-r--r--www/apache2/files/patch-secfix-srclib:apr-util:test:testuri.c33
-rw-r--r--www/apache2/files/patch-srclib:apr:include:apr_atomic.h17
-rw-r--r--www/apache2/files/patch-support:apachectl.in26
8 files changed, 8 insertions, 311 deletions
diff --git a/www/apache2/files/exp-http-ready.patch b/www/apache2/files/exp-http-ready.patch
deleted file mode 100644
index 6ee0663cd540..000000000000
--- a/www/apache2/files/exp-http-ready.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: server/listen.c
-===================================================================
-RCS file: /home/cvspublic/httpd-2.0/server/listen.c,v
-retrieving revision 1.95
-diff -u -r1.95 listen.c
---- server/listen.c 1 Jan 2004 13:26:23 -0000 1.95
-+++ server/listen.c 3 Feb 2004 17:34:08 -0000
-@@ -199,7 +199,13 @@
-
- #if APR_HAS_SO_ACCEPTFILTER
- #ifndef ACCEPT_FILTER_NAME
-+#define ACCEPT_FILTER_NAME "httpready"
-+#ifdef __FreeBSD_version
-+#if __FreeBSD_version < 411000 /* httpready broken before 4.1.1 */
-+#undef ACCEPT_FILTER_NAME
- #define ACCEPT_FILTER_NAME "dataready"
-+#endif
-+#endif
- #endif
- apr_socket_accept_filter(s, ACCEPT_FILTER_NAME, "");
- #endif
diff --git a/www/apache2/files/patch-fix-srclib:apr:network_io:unix:sockaddr.c b/www/apache2/files/patch-fix-srclib:apr:network_io:unix:sockaddr.c
deleted file mode 100644
index 336671027754..000000000000
--- a/www/apache2/files/patch-fix-srclib:apr:network_io:unix:sockaddr.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- srclib/apr/network_io/unix/sockaddr.c.orig Tue Jul 13 09:08:03 2004
-+++ srclib/apr/network_io/unix/sockaddr.c Tue Jul 13 09:08:46 2004
-@@ -612,6 +612,7 @@
- struct sockaddr_in tmpsa;
- tmpsa.sin_family = AF_INET;
- tmpsa.sin_addr.s_addr = ((apr_uint32_t *)sockaddr->ipaddr_ptr)[3];
-+ tmpsa.sin_len = sizeof(tmpsa);
-
- rc = getnameinfo((const struct sockaddr *)&tmpsa, sizeof(tmpsa),
- tmphostname, sizeof(tmphostname), NULL, 0,
diff --git a/www/apache2/files/patch-secfix-modules:dav:fs:lock.c b/www/apache2/files/patch-secfix-modules:dav:fs:lock.c
deleted file mode 100644
index 802456eb8c51..000000000000
--- a/www/apache2/files/patch-secfix-modules:dav:fs:lock.c
+++ /dev/null
@@ -1,46 +0,0 @@
-===================================================================
-RCS file: /home/cvspublic/httpd-2.0/modules/dav/fs/lock.c,v
-retrieving revision 1.25.2.5
-retrieving revision 1.25.2.6
-diff -u -r1.25.2.5 -r1.25.2.6
---- modules/dav/fs/lock.c 2004/04/26 15:45:52 1.25.2.5
-+++ modules/dav/fs/lock.c 2004/09/15 08:26:48 1.25.2.6
-@@ -66,7 +66,7 @@
- ** INDIRECT LOCK: [char (DAV_LOCK_INDIRECT),
- ** apr_uuid_t locktoken,
- ** time_t expires,
--** int key_size,
-+** apr_size_t key_size,
- ** char[] key]
- ** The key is to the collection lock that resulted in this indirect lock
- */
-@@ -157,7 +157,7 @@
- /* Stored indirect lock info - lock token and apr_datum_t */
- #define dav_size_indirect(a) (1 + sizeof(apr_uuid_t) \
- + sizeof(time_t) \
-- + sizeof(int) + (a)->key.dsize)
-+ + sizeof((a)->key.dsize) + (a)->key.dsize)
-
- /*
- ** The lockdb structure.
-@@ -1469,13 +1469,13 @@
- }
- if (dav_fs_do_refresh(dp_scan, ltl, new_time)) {
- /* the lock was refreshed. return the lock. */
-- newlock = dav_fs_alloc_lock(lockdb, ip->key, dp->locktoken);
-+ newlock = dav_fs_alloc_lock(lockdb, ip->key, dp_scan->locktoken);
- newlock->is_locknull = !resource->exists;
-- newlock->scope = dp->f.scope;
-- newlock->type = dp->f.type;
-- newlock->depth = dp->f.depth;
-- newlock->timeout = dp->f.timeout;
-- newlock->owner = dp->owner;
-+ newlock->scope = dp_scan->f.scope;
-+ newlock->type = dp_scan->f.type;
-+ newlock->depth = dp_scan->f.depth;
-+ newlock->timeout = dp_scan->f.timeout;
-+ newlock->owner = dp_scan->owner;
- newlock->auth_user = dp_scan->auth_user;
-
- newlock->next = *locks;
-
diff --git a/www/apache2/files/patch-secfix-modules:ssl:ssl_engine_io.c b/www/apache2/files/patch-secfix-modules:ssl:ssl_engine_io.c
deleted file mode 100644
index f29cfd5aed4d..000000000000
--- a/www/apache2/files/patch-secfix-modules:ssl:ssl_engine_io.c
+++ /dev/null
@@ -1,34 +0,0 @@
-===================================================================
-RCS file: /home/cvspublic/httpd-2.0/modules/ssl/ssl_engine_io.c,v
-retrieving revision 1.124
-retrieving revision 1.126
-diff -u -r1.124 -r1.126
---- modules/ssl/ssl_engine_io.c 2004/07/13 18:11:22 1.124
-+++ modules/ssl/ssl_engine_io.c 2004/08/17 16:31:23 1.126
-@@ -564,8 +564,12 @@
- *len = bytes;
- if (inctx->mode == AP_MODE_SPECULATIVE) {
- /* We want to rollback this read. */
-- inctx->cbuf.value -= bytes;
-- inctx->cbuf.length += bytes;
-+ if (inctx->cbuf.length > 0) {
-+ inctx->cbuf.value -= bytes;
-+ inctx->cbuf.length += bytes;
-+ } else {
-+ char_buffer_write(&inctx->cbuf, buf, (int)bytes);
-+ }
- return APR_SUCCESS;
- }
- /* This could probably be *len == wanted, but be safe from stray
-@@ -589,6 +593,10 @@
- while (1) {
-
- if (!inctx->filter_ctx->pssl) {
-+ /* Ensure a non-zero error code is returned */
-+ if (inctx->rc == APR_SUCCESS) {
-+ inctx->rc = APR_EGENERAL;
-+ }
- break;
- }
-
-
diff --git a/www/apache2/files/patch-secfix-server:utils.c b/www/apache2/files/patch-secfix-server:utils.c
deleted file mode 100644
index ed56554a3360..000000000000
--- a/www/apache2/files/patch-secfix-server:utils.c
+++ /dev/null
@@ -1,132 +0,0 @@
-diff -Nur httpd-2.0~/server/util.c httpd-2.0/server/util.c
---- server/util.c
-+++ server/util.c
-@@ -722,7 +722,7 @@
-
- *resp++ = '\0';
- #if RESOLVE_ENV_PER_TOKEN
-- return ap_resolve_env(p,result);
-+ return (char *)ap_resolve_env(p,result);
- #else
- return result;
- #endif
-@@ -782,39 +782,87 @@
- */
- AP_DECLARE(const char *) ap_resolve_env(apr_pool_t *p, const char * word)
- {
-- char tmp[ MAX_STRING_LEN ];
-- const char *s, *e;
-- tmp[0] = '\0';
--
-- if (!(s=ap_strchr_c(word,'$')))
-- return word;
--
-- do {
-- /* XXX - relies on strncat() to add '\0'
-- */
-- strncat(tmp,word,s - word);
-- if ((s[1] == '{') && (e=ap_strchr_c(s,'}'))) {
-- const char *e2 = e;
-- char *var;
-- word = e + 1;
-- var = apr_pstrndup(p, s+2, e2-(s+2));
-- e = getenv(var);
-- if (e) {
-- strcat(tmp,e);
-- } else {
-- strncat(tmp, s, e2-s);
-- strcat(tmp,"}");
-- }
-- } else {
-- /* ignore invalid strings */
-- word = s+1;
-- strcat(tmp,"$");
-- };
-- } while ((s=ap_strchr_c(word,'$')));
-- strcat(tmp,word);
-+# define SMALL_EXPANSION 5
-+ struct sll {
-+ struct sll *next;
-+ const char *string;
-+ apr_size_t len;
-+ } *result, *current, sresult[SMALL_EXPANSION];
-+ char *res_buf, *cp;
-+ const char *s, *e, *ep;
-+ unsigned spc;
-+ apr_size_t outlen;
-+
-+ s = ap_strchr_c(word, '$');
-+ if (!s) {
-+ return word;
-+ }
-+
-+ /* well, actually something to do */
-+ ep = word + strlen(word);
-+ spc = 0;
-+ result = current = &(sresult[spc++]);
-+ current->next = NULL;
-+ current->string = word;
-+ current->len = s - word;
-+ outlen = current->len;
-+
-+ do {
-+ /* prepare next entry */
-+ if (current->len) {
-+ current->next = (spc < SMALL_EXPANSION)
-+ ? &(sresult[spc++])
-+ : (struct sll *)apr_palloc(p,
-+ sizeof(*current->next));
-+ current = current->next;
-+ current->next = NULL;
-+ current->len = 0;
-+ }
-
-- return apr_pstrdup(p,tmp);
-+ if (*s == '$') {
-+ if (s[1] == '{' && (e = ap_strchr_c(s, '}'))) {
-+ word = getenv(apr_pstrndup(p, s+2, e-s-2));
-+ if (word) {
-+ current->string = word;
-+ current->len = strlen(word);
-+ outlen += current->len;
-+ }
-+ else {
-+ current->string = s;
-+ current->len = e - s + 1;
-+ outlen += current->len;
-+ }
-+ s = e + 1;
-+ }
-+ else {
-+ current->string = s++;
-+ current->len = 1;
-+ ++outlen;
-+ }
-+ }
-+ else {
-+ word = s;
-+ s = ap_strchr_c(s, '$');
-+ current->string = word;
-+ current->len = s ? s - word : ep - word;
-+ outlen += current->len;
-+ }
-+ } while (s && *s);
-+
-+ /* assemble result */
-+ res_buf = cp = apr_palloc(p, outlen + 1);
-+ do {
-+ if (result->len) {
-+ memcpy(cp, result->string, result->len);
-+ cp += result->len;
-+ }
-+ result = result->next;
-+ } while (result);
-+ res_buf[outlen] = '\0';
-+
-+ return res_buf;
- }
-+
- AP_DECLARE(int) ap_cfg_closefile(ap_configfile_t *cfp)
- {
- #ifdef DEBUG
-
diff --git a/www/apache2/files/patch-secfix-srclib:apr-util:test:testuri.c b/www/apache2/files/patch-secfix-srclib:apr-util:test:testuri.c
deleted file mode 100644
index 2efb768f9c79..000000000000
--- a/www/apache2/files/patch-secfix-srclib:apr-util:test:testuri.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- srclib/apr-util/test/testuri.c
-+++ srclib/apr-util/test/testuri.c
-@@ -36,6 +37,10 @@
-
- struct aup_test aup_tests[] =
- {
-+ { "http://[/::1]/index.html", APR_EGENERAL },
-+ { "http://[", APR_EGENERAL },
-+ { "http://[?::1]/index.html", APR_EGENERAL },
-+
- {
- "http://127.0.0.1:9999/asdf.html",
- 0, "http", "127.0.0.1:9999", NULL, NULL, "127.0.0.1", "9999", "/asdf.html", NULL, NULL, 9999
---- srclib/apr-util/uri/apr_uri.c
-+++ srclib/apr-util/uri/apr_uri.c
-@@ -307,11 +307,11 @@
- if (*hostinfo == '[') {
- v6_offset1 = 1;
- v6_offset2 = 2;
-- s = uri;
-- do {
-- --s;
-- } while (s >= hostinfo && *s != ':' && *s != ']');
-- if (s < hostinfo || *s == ']') {
-+ s = memchr(hostinfo, ']', uri - hostinfo);
-+ if (s == NULL) {
-+ return APR_EGENERAL;
-+ }
-+ if (*++s != ':') {
- s = NULL; /* no port */
- }
- }
-
diff --git a/www/apache2/files/patch-srclib:apr:include:apr_atomic.h b/www/apache2/files/patch-srclib:apr:include:apr_atomic.h
deleted file mode 100644
index 14d1dd444ba3..000000000000
--- a/www/apache2/files/patch-srclib:apr:include:apr_atomic.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- srclib/apr/include/apr_atomic.h.orig Wed May 1 03:41:59 2002
-+++ srclib/apr/include/apr_atomic.h Tue May 7 19:37:45 2002
-@@ -175,10 +175,10 @@
- #include <machine/atomic.h>
-
- #define apr_atomic_t apr_uint32_t
--#define apr_atomic_add(mem, val) atomic_add_int(mem,val)
--#define apr_atomic_dec(mem) atomic_subtract_int(mem,1)
--#define apr_atomic_inc(mem) atomic_add_int(mem,1)
--#define apr_atomic_set(mem, val) atomic_set_int(mem, val)
-+#define apr_atomic_add(mem, val) (atomic_add_int(mem,val),mem)
-+#define apr_atomic_dec(mem) (atomic_subtract_int(mem,1),mem)
-+#define apr_atomic_inc(mem) (atomic_add_int(mem,1),mem)
-+#define apr_atomic_set(mem, val) (atomic_set_int(mem, val),mem)
- #define apr_atomic_read(mem) (*mem)
-
- #define APR_ATOMIC_NEED_CAS_DEFAULT 1
diff --git a/www/apache2/files/patch-support:apachectl.in b/www/apache2/files/patch-support:apachectl.in
index 57d2af876b8f..7c5c3238e955 100644
--- a/www/apache2/files/patch-support:apachectl.in
+++ b/www/apache2/files/patch-support:apachectl.in
@@ -1,21 +1,11 @@
---- support/apachectl.in.orig Mon May 27 20:46:01 2002
-+++ support/apachectl.in Thu Jul 11 21:12:36 2002
-@@ -31,8 +31,8 @@
- HTTPD='@exp_sbindir@/@progname@'
- #
- # pick up any necessary environment variables
--if test -f @exp_bindir@/envvars; then
-- . @exp_bindir@/envvars
-+if test -f @exp_sbindir@/envvars; then
-+ . @exp_sbindir@/envvars
- fi
- #
- # a command that outputs a formatted text version of the HTML at the
-@@ -46,6 +46,7 @@
- #
+--- support/apachectl.in.orig Thu Sep 16 09:28:54 2004
++++ support/apachectl.in Thu Sep 16 09:29:14 2004
+@@ -63,7 +63,7 @@
+ ULIMIT_MAX_FILES="@APACHECTL_ULIMIT@"
# -------------------- --------------------
# |||||||||||||||||||| END CONFIGURATION SECTION ||||||||||||||||||||
+-
+eval `limits -e -C daemon` >/dev/null 2>&1
-
- ERROR=0
- if [ "x$ARGV" = "x" ] ; then
+ # Set the maximum number of file descriptors allowed per child process.
+ if [ "x$ULIMIT_MAX_FILES" != "x" ] ; then
+ $ULIMIT_MAX_FILES
generated by cgit (git 2.34.1) at 2025-02-27 04:48:27 +0800