From: Jeff Trawick <trawick@apache.org>
Date: Wed, 6 Jun 2001 12:51:21 +0000 (+0000)
Subject: nicer to compare r->finfo.filetype with APR_NOFILE instead of 0
X-Git-Tag: 2.0.19~138
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc3207f9bf37284b6ba467608d726e64defcea03;p=thirdparty%2Fapache%2Fhttpd.git

nicer to compare r->finfo.filetype with APR_NOFILE instead of 0

the sub request output filter shouldn't lose the return code from
the next filter


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89275 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/request.c b/server/request.c
index b015def039f..4e2e1edbc58 100644
--- a/server/request.c
+++ b/server/request.c
@@ -231,7 +231,7 @@ static int get_path_info(request_rec *r)
     char bStripSlash=1;
 #endif
 
-    if (r->finfo.filetype) {
+    if (r->finfo.filetype != APR_NOFILE) {
 	/* assume path_info already set */
 	return OK;
     }
@@ -810,8 +810,7 @@ AP_CORE_DECLARE_NONSTD(apr_status_t) ap_sub_req_output_filter(ap_filter_t *f,
     if (APR_BUCKET_IS_EOS(e)) {
         apr_bucket_delete(e);
     }
-    ap_pass_brigade(f->next, bb);
-    return APR_SUCCESS;
+    return ap_pass_brigade(f->next, bb);
 }