Commit 76b3e48c authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r442758 from trunk: 

PR 31759 (mutated) - reported by Jo Rhett
Don't return apr_status_t error value from input filter chain.

Submitted by: niq
Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@483980 13f79535-47bb-0310-9956-ffa450edef68
parent ced04e5e

CHANGES

+4 −0
Changes for CHANGES: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                        -*- coding: utf-8 -*-

Changes with Apache 2.2.4









    * mod_cgi and mod_cgid: Don't use apr_status_t error return









      from input filters as HTTP return value from the handler.









      PR#31579.

















  *) mod_cache: Eliminate a bogus error in the log when a filter returns









     AP_FILTER_ERROR. [Niklas Edmundsson <nikke acc.umu.se>]










































STATUS



+0
−6



























Changes for STATUS: 0 added lines, 6 removed lines.



Original line number
Diff line number
Diff line







@@ -78,12 +78,6 @@ RELEASE SHOWSTOPPERS:







PATCHES ACCEPTED TO BACKPORT FROM TRUNK:









  [ start all new proposals below, under PATCHES PROPOSED. ]



















    * mod_cgi and mod_cgid: Don't use apr_status_t error return









      from input filters as HTTP return value from the handler.









      PR#31579.









      Trunk: http://svn.apache.org/viewvc?view=rev&revision=442758









      +1: niq, bnicholes, wrowe



















    * mod_mem_cache: Convert mod_mem_cache to use APR memory pool functions









      by creating a root pool for object persistence across requests. This









      also eliminates the need for custom serialization code.


































include/util_mutex.h
0 → 100644



+60
−0



























Changes for include/util_mutex.h: 60 added lines, 0 removed lines.



Original line number
Diff line number
Diff line









/* Licensed to the Apache Software Foundation (ASF) under one or more









 * contributor license agreements.  See the NOTICE file distributed with









 * this work for additional information regarding copyright ownership.









 * The ASF licenses this file to You under the Apache License, Version 2.0









 * (the "License"); you may not use this file except in compliance with









 * the License.  You may obtain a copy of the License at









 *









 *     http://www.apache.org/licenses/LICENSE-2.0









 *









 * Unless required by applicable law or agreed to in writing, software









 * distributed under the License is distributed on an "AS IS" BASIS,









 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.









 * See the License for the specific language governing permissions and









 * limitations under the License.









 */



















/**









 * @file  util_mutex.h









 * @brief Apache Mutex support library









 *









 * @defgroup APACHE_CORE_MUTEX Mutex Library









 * @ingroup  APACHE_CORE









 * @{









 */



















#ifndef UTIL_MUTEX_H









#define UTIL_MUTEX_H



















#include "httpd.h"









#include "apr_global_mutex.h"



















#ifdef __cplusplus









extern "C" {









#endif



















AP_DECLARE_DATA extern const char ap_available_mutexes_string[];









AP_DECLARE_DATA extern const char ap_all_available_mutexes_string[];



















/**









 * Get Mutex config data and parse it









 * @param arg The mutex config string









 * @param pool The allocation pool









 * @param mutexmech The APR mutex locking mechanism









 * @param mutexfile The lockfile to use as required









 * @return APR status code









 * @deffunc apr_status_t ap_parse_mutex(const char *arg, apr_pool_t *pool,









                                        apr_lockmech_e *mutexmech,









                                        const char **mutexfile)









 */









AP_DECLARE(apr_status_t) ap_parse_mutex(const char *arg, apr_pool_t *pool,









                                        apr_lockmech_e *mutexmech,









                                        const char **mutexfile);





























#ifdef __cplusplus









}









#endif



















#endif /* UTIL_MUTEX_H */









/** @} */
























modules/generators/mod_cgi.c



+3
−1



























Changes for modules/generators/mod_cgi.c: 3 added lines, 1 removed line.



Original line number
Diff line number
Diff line







@@ -837,7 +837,9 @@ static int cgi_handler(request_rec *r)







                            APR_BLOCK_READ, HUGE_STRING_LEN);



















        if (rv != APR_SUCCESS) {









            return rv;









            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,









                          "Error reading request entity data");









            return HTTP_INTERNAL_SERVER_ERROR;









        }



















        for (bucket = APR_BRIGADE_FIRST(bb);


































modules/generators/mod_cgid.c



+3
−1



























Changes for modules/generators/mod_cgid.c: 3 added lines, 1 removed line.



Original line number
Diff line number
Diff line







@@ -1387,7 +1387,9 @@ static int cgid_handler(request_rec *r)







                            APR_BLOCK_READ, HUGE_STRING_LEN);



















        if (rv != APR_SUCCESS) {









            return rv;









            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,









                          "Error reading request entity data");









            return HTTP_INTERNAL_SERVER_ERROR;









        }



















        for (bucket = APR_BRIGADE_FIRST(bb);