Return-Path: Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 85782 invoked by uid 500); 31 Aug 2001 03:50:50 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 85770 invoked by uid 500); 31 Aug 2001 03:50:50 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Date: 31 Aug 2001 03:49:42 -0000 Message-ID: <20010831034942.59021.qmail@icarus.apache.org> From: wrowe@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/modules/http http_request.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N Status: O X-Status: X-Keywords: X-UID: 636 wrowe 01/08/30 20:49:42 Modified: modules/http http_request.c Log: Now that stinks, sorry. In moving code - I didn't notice my code now served out (r) info instead of the (rnew) info. Made for nasty cyclic loops in mod_dir :( It looks like this works once again. I'll post completed deltas to the list ASAP. Revision Changes Path 1.113 +8 -8 httpd-2.0/modules/http/http_request.c Index: http_request.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/http/http_request.c,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- http_request.c 2001/08/31 02:46:29 1.112 +++ http_request.c 2001/08/31 03:49:42 1.113 @@ -438,14 +438,14 @@ request_rec *new = internal_internal_redirect(new_uri, r); int access_status = ap_process_request_internal(new); if (access_status == OK) { - if ((access_status = ap_invoke_handler(r)) != 0) { - ap_die(access_status, r); + if ((access_status = ap_invoke_handler(new)) != 0) { + ap_die(access_status, new); return; } - ap_finalize_request_protocol(r); + ap_finalize_request_protocol(new); } else { - ap_die(access_status, r); + ap_die(access_status, new); } } @@ -461,14 +461,14 @@ new->content_type = r->content_type; access_status = ap_process_request_internal(new); if (access_status == OK) { - if ((access_status = ap_invoke_handler(r)) != 0) { - ap_die(access_status, r); + if ((access_status = ap_invoke_handler(new)) != 0) { + ap_die(access_status, new); return; } - ap_finalize_request_protocol(r); + ap_finalize_request_protocol(new); } else { - ap_die(access_status, r); + ap_die(access_status, new); } }