diff options
author | rbb <rbb@13f79535-47bb-0310-9956-ffa450edef68> | 2000-07-13 16:37:06 +0000 |
---|---|---|
committer | rbb <rbb@13f79535-47bb-0310-9956-ffa450edef68> | 2000-07-13 16:37:06 +0000 |
commit | 0305283ab54fae80c2ea02b87fdca7fb00232b85 (patch) | |
tree | a9981a2546e35d42a04eb9e1ce0bfe617c58cd86 /buckets | |
parent | fcc3a5676cdc3b74c78bee0a8c5e8f4436114880 (diff) | |
download | libapr-0305283ab54fae80c2ea02b87fdca7fb00232b85.tar.gz |
Update the patch to work since buckets were removed from the build process.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@60362 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'buckets')
-rw-r--r-- | buckets/ryan.patch | 88 |
1 files changed, 33 insertions, 55 deletions
diff --git a/buckets/ryan.patch b/buckets/ryan.patch index 541ebca6d..13d75c60c 100644 --- a/buckets/ryan.patch +++ b/buckets/ryan.patch @@ -2,33 +2,16 @@ ? build.err ? .inslog2 ? include/util_filter.h -? lib/apr/build.log -? lib/apr/build.err +? lib/apr/include/apr_buf.h ? lib/apr/shmem/config.cache ? main/util_filter.c -Index: configure.in -=================================================================== -RCS file: /home/cvs/apache-2.0/src/configure.in,v -retrieving revision 1.72 -diff -u -d -b -w -u -r1.72 configure.in ---- configure.in 2000/07/01 14:08:21 1.72 -+++ configure.in 2000/07/12 23:26:38 -@@ -78,7 +78,7 @@ - netdb.h \ - pwd.h \ - grp.h \ --strings.h -+strings.h \ - ) - AC_HEADER_SYS_WAIT - Index: ap/Makefile.in =================================================================== RCS file: /home/cvs/apache-2.0/src/ap/Makefile.in,v retrieving revision 1.4 diff -u -d -b -w -u -r1.4 Makefile.in --- ap/Makefile.in 2000/06/12 20:41:13 1.4 -+++ ap/Makefile.in 2000/07/12 23:26:38 ++++ ap/Makefile.in 2000/07/13 16:30:51 @@ -1,5 +1,5 @@ LTLIBRARY_NAME = libap.la @@ -42,7 +25,7 @@ RCS file: /home/cvs/apache-2.0/src/include/ap_iol.h,v retrieving revision 1.19 diff -u -d -b -w -u -r1.19 ap_iol.h --- include/ap_iol.h 2000/05/29 04:22:02 1.19 -+++ include/ap_iol.h 2000/07/12 23:26:39 ++++ include/ap_iol.h 2000/07/13 16:30:52 @@ -58,6 +58,7 @@ #define AP_IOL_H @@ -51,29 +34,13 @@ diff -u -d -b -w -u -r1.19 ap_iol.h #include "apr_errno.h" /* For ap_status_t and the APR_errnos */ typedef struct ap_iol ap_iol; -Index: include/buff.h -=================================================================== -RCS file: /home/cvs/apache-2.0/src/include/buff.h,v -retrieving revision 1.30 -diff -u -d -b -w -u -r1.30 buff.h ---- include/buff.h 2000/06/29 14:34:24 1.30 -+++ include/buff.h 2000/07/12 23:26:39 -@@ -63,7 +63,7 @@ - extern "C" { - #endif - --#ifdef HAVE_STDARG_H -+#ifdef APR_HAVE_STDARG_H - #include <stdarg.h> - #endif - #include "ap.h" Index: include/http_protocol.h =================================================================== RCS file: /home/cvs/apache-2.0/src/include/http_protocol.h,v retrieving revision 1.19 diff -u -d -b -w -u -r1.19 http_protocol.h --- include/http_protocol.h 2000/07/11 03:48:17 1.19 -+++ include/http_protocol.h 2000/07/12 23:26:39 ++++ include/http_protocol.h 2000/07/13 16:30:52 @@ -89,8 +89,15 @@ API_EXPORT(void) ap_basic_http_header(request_rec *r); @@ -97,7 +64,7 @@ RCS file: /home/cvs/apache-2.0/src/include/httpd.h,v retrieving revision 1.64 diff -u -d -b -w -u -r1.64 httpd.h --- include/httpd.h 2000/06/30 21:18:13 1.64 -+++ include/httpd.h 2000/07/12 23:26:39 ++++ include/httpd.h 2000/07/13 16:30:52 @@ -596,6 +596,11 @@ * pointer back to the main request. */ @@ -110,13 +77,31 @@ diff -u -d -b -w -u -r1.64 httpd.h /* Info about the request itself... we begin with stuff that only * protocol.c should ever touch... */ +Index: lib/apr/configure.in +=================================================================== +RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v +retrieving revision 1.133 +diff -u -d -b -w -u -r1.133 configure.in +--- lib/apr/configure.in 2000/07/13 03:41:04 1.133 ++++ lib/apr/configure.in 2000/07/13 16:30:52 +@@ -678,8 +678,8 @@ + AC_SUBST(EXEEXT) + + echo "Construct Makefiles and header files." +-MAKEFILE1="Makefile lib/Makefile " +-SUBDIRS="lib " ++MAKEFILE1="Makefile lib/Makefile buckets/Makefile" ++SUBDIRS="lib buckets" + for dir in $MODULES + do + test -d $dir || $MKDIR -p $dir Index: main/Makefile.in =================================================================== RCS file: /home/cvs/apache-2.0/src/main/Makefile.in,v retrieving revision 1.16 diff -u -d -b -w -u -r1.16 Makefile.in --- main/Makefile.in 2000/07/01 14:14:15 1.16 -+++ main/Makefile.in 2000/07/12 23:26:48 ++++ main/Makefile.in 2000/07/13 16:31:02 @@ -8,7 +8,7 @@ http_protocol.c http_request.c http_vhost.c util.c util_date.c \ util_script.c util_uri.c util_md5.c util_cfgtree.c util_ebcdic.c \ @@ -132,7 +117,7 @@ RCS file: /home/cvs/apache-2.0/src/main/http_core.c,v retrieving revision 1.88 diff -u -d -b -w -u -r1.88 http_core.c --- main/http_core.c 2000/07/11 03:48:18 1.88 -+++ main/http_core.c 2000/07/12 23:26:48 ++++ main/http_core.c 2000/07/13 16:31:03 @@ -71,6 +71,8 @@ #include "util_md5.h" #include "apr_fnmatch.h" @@ -229,10 +214,10 @@ diff -u -d -b -w -u -r1.88 http_core.c Index: main/http_protocol.c =================================================================== RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v -retrieving revision 1.95 -diff -u -d -b -w -u -r1.95 http_protocol.c ---- main/http_protocol.c 2000/07/11 03:48:18 1.95 -+++ main/http_protocol.c 2000/07/12 23:26:49 +retrieving revision 1.96 +diff -u -d -b -w -u -r1.96 http_protocol.c +--- main/http_protocol.c 2000/07/13 16:26:42 1.96 ++++ main/http_protocol.c 2000/07/13 16:31:03 @@ -64,6 +64,8 @@ */ @@ -279,7 +264,7 @@ diff -u -d -b -w -u -r1.95 http_protocol.c while (!r->connection->aborted && offset < length) { if (length - offset > MMAP_SEGMENT_SIZE) { n = MMAP_SEGMENT_SIZE; -@@ -2467,76 +2477,142 @@ +@@ -2467,76 +2477,137 @@ total_bytes_sent += w; offset += w; } @@ -292,7 +277,6 @@ diff -u -d -b -w -u -r1.95 http_protocol.c + */ + bb = ap_bucket_brigade_create(r->pool); + bb->head = bb->tail = ap_bucket_list_create(); -+ ap_bucket_list_init(bb->head); + b = ap_bucket_new(AP_BUCKET_mmap); + ap_mmap_bucket_insert((ap_bucket_mmap *)b->data, mm); + bb->head->bucket = b; @@ -328,7 +312,6 @@ diff -u -d -b -w -u -r1.95 http_protocol.c + */ + bb = ap_bucket_brigade_create(r->pool); + bb->head = bb->tail = ap_bucket_list_create(); -+ ap_bucket_list_init(bb->head); + b = ap_bucket_new(AP_BUCKET_rwmem); + ap_rwmem_write(b->data, &c, 1, &written); + bb->head->bucket = b; @@ -366,7 +349,6 @@ diff -u -d -b -w -u -r1.95 http_protocol.c + */ + bb = ap_bucket_brigade_create(r->pool); + bb->head = bb->tail = ap_bucket_list_create(); -+ ap_bucket_list_init(bb->head); + b = ap_bucket_new(AP_BUCKET_rwmem); + ap_rwmem_write(b->data, str, strlen(str), &written); + bb->head->bucket = b; @@ -406,7 +388,6 @@ diff -u -d -b -w -u -r1.95 http_protocol.c + */ + bb = ap_bucket_brigade_create(r->pool); + bb->head = bb->tail = ap_bucket_list_create(); -+ ap_bucket_list_init(bb->head); + b = ap_bucket_new(AP_BUCKET_rwmem); + ap_rwmem_write(b->data, buf, nbyte, &written); + bb->head->bucket = b; @@ -442,7 +423,6 @@ diff -u -d -b -w -u -r1.95 http_protocol.c + */ + bb = ap_bucket_brigade_create(r->pool); + bb->head = bb->tail = ap_bucket_list_create(); -+ ap_bucket_list_init(bb->head); + written = ap_brigade_vprintf(bb, fmt, va); + ap_pass_brigade(r, f, bb); + return written; @@ -454,7 +434,7 @@ diff -u -d -b -w -u -r1.95 http_protocol.c API_EXPORT_NONSTD(int) ap_rprintf(request_rec *r, const char *fmt, ...) { va_list va; -@@ -2546,46 +2622,62 @@ +@@ -2546,46 +2617,60 @@ return EOF; va_start(va, fmt); @@ -492,7 +472,6 @@ diff -u -d -b -w -u -r1.95 http_protocol.c + */ + bb = ap_bucket_brigade_create(r->pool); + bb->head = bb->tail = ap_bucket_list_create(); -+ ap_bucket_list_init(bb->head); va_start(va, r); - n = ap_vbputstrs(r->connection->client, va); + written = ap_brigade_vputstrs(bb, va); @@ -531,7 +510,6 @@ diff -u -d -b -w -u -r1.95 http_protocol.c + */ + bb = ap_bucket_brigade_create(r->pool); + bb->head = bb->tail = ap_bucket_list_create(); -+ ap_bucket_list_init(bb->head); + b = ap_bucket_new(AP_BUCKET_eos); + bb->head->bucket = b; + ap_pass_brigade(r, f, bb); @@ -544,7 +522,7 @@ RCS file: /home/cvs/apache-2.0/src/main/http_request.c,v retrieving revision 1.35 diff -u -d -b -w -u -r1.35 http_request.c --- main/http_request.c 2000/06/24 17:33:57 1.35 -+++ main/http_request.c 2000/07/12 23:26:49 ++++ main/http_request.c 2000/07/13 16:31:03 @@ -1263,6 +1263,12 @@ return; } @@ -564,7 +542,7 @@ RCS file: /home/cvs/apache-2.0/src/modules/mpm/config.m4,v retrieving revision 1.23 diff -u -d -b -w -u -r1.23 config.m4 --- modules/mpm/config.m4 2000/07/11 19:00:16 1.23 -+++ modules/mpm/config.m4 2000/07/12 23:26:51 ++++ modules/mpm/config.m4 2000/07/13 16:31:05 @@ -3,7 +3,6 @@ [ --with-mpm=MPM Choose the process model for Apache to use. MPM={dexter,mpmt_beos,mpmt_pthread,prefork,spmt_os2}],[ |