Return-Path: Delivered-To: apmail-apache-cvs-archive@apache.org Received: (qmail 91333 invoked by uid 500); 8 Aug 2001 06:05:53 -0000 Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm Precedence: bulk Reply-To: new-httpd@apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list apache-cvs@apache.org Received: (qmail 91304 invoked by uid 500); 8 Aug 2001 06:05:53 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Date: 8 Aug 2001 06:04:07 -0000 Message-ID: <20010808060407.44895.qmail@icarus.apache.org> From: jwoolley@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/server error_bucket.c X-Spam-Rating: h31.sny.collab.net 1.6.2 0/1000/N Status: O X-Status: X-Keywords: X-UID: 117 jwoolley 01/08/07 23:04:07 Modified: include ap_mmn.h server error_bucket.c Log: Update httpd to reflect change with free() pointer in buckets code Revision Changes Path 1.18 +2 -2 httpd-2.0/include/ap_mmn.h Index: ap_mmn.h =================================================================== RCS file: /home/cvs/httpd-2.0/include/ap_mmn.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -u -r1.17 -r1.18 --- ap_mmn.h 2001/08/08 00:01:41 1.17 +++ ap_mmn.h 2001/08/08 06:04:07 1.18 @@ -77,13 +77,13 @@ * 20010523 (2.0.19-dev) bump for scoreboard structure reordering * 20010627 (2.0.19-dev) more API changes than I can count * 20010726 (2.0.22-dev) more big API changes - * 20010807 (2.0.23-dev) the dir d_is_absolute bit is introduced, etc + * 20010808 (2.0.23-dev) dir d_is_absolute bit introduced, bucket changes, etc */ #define MODULE_MAGIC_COOKIE 0x41503230UL /* "AP20" */ #ifndef MODULE_MAGIC_NUMBER_MAJOR -#define MODULE_MAGIC_NUMBER_MAJOR 20010807 +#define MODULE_MAGIC_NUMBER_MAJOR 20010808 #endif #define MODULE_MAGIC_NUMBER_MINOR 0 /* 0...n */ #define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR /* backward compat */ 1.6 +1 -1 httpd-2.0/server/error_bucket.c Index: error_bucket.c =================================================================== RCS file: /home/cvs/httpd-2.0/server/error_bucket.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -u -r1.5 -r1.6 --- error_bucket.c 2001/08/03 14:26:03 1.5 +++ error_bucket.c 2001/08/08 06:04:07 1.6 @@ -93,12 +93,12 @@ apr_bucket *b = (apr_bucket *)malloc(sizeof(*b)); APR_BUCKET_INIT(b); + b->free = free; return ap_bucket_error_make(b, error, buf, p); } AP_DECLARE_DATA const apr_bucket_type_t ap_bucket_type_error = { "ERROR", 5, - free, free, error_read, apr_bucket_setaside_notimpl,