Commit e8a3bcd9 authored by Guenter Knauf's avatar Guenter Knauf
Browse files

Fixed only some proxy prototype formats. 

Function names must follow the *_DECLARE() in the same
line regardless how long the function names are!


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

modules/proxy/mod_proxy.h

+9 −5
Changes for modules/proxy/mod_proxy.h: 9 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -597,7 +597,9 @@ PROXY_DECLARE(char *) ap_proxy_define_worker(apr_pool_t *p, 
 * @param i       index into shm

 * @return        APR_SUCCESS or error code

 */

PROXY_DECLARE(apr_status_t) ap_proxy_share_worker(proxy_worker *worker, proxy_worker_shared *shm, int i);

PROXY_DECLARE(apr_status_t) ap_proxy_share_worker(proxy_worker *worker,

                                                  proxy_worker_shared *shm,

                                                  int i);



/**

 * Initialize the worker by setting up worker connection pool and mutex
@@ -827,8 +829,8 @@ PROXY_DECLARE(void) ap_proxy_backend_broke(request_rec *r, 
 * @return     APR_SUCCESS if all buckets could be transformed APR_EGENERAL

 *             otherwise

 */

PROXY_DECLARE(apr_status_t)

ap_proxy_buckets_lifetime_transform(request_rec *r, apr_bucket_brigade *from,

PROXY_DECLARE(apr_status_t) ap_proxy_buckets_lifetime_transform(request_rec *r,

                                                                apr_bucket_brigade *from,

                                                                apr_bucket_brigade *to);

/**

 * Return a hash based on the passed string
@@ -868,7 +870,8 @@ PROXY_DECLARE(char *) ap_proxy_parse_wstatus(apr_pool_t *p, proxy_worker *w); 
 * @param conf config

 * @return   APR_SUCCESS if all goes well

 */

PROXY_DECLARE(apr_status_t) ap_proxy_sync_balancer(proxy_balancer *b, server_rec *s,

PROXY_DECLARE(apr_status_t) ap_proxy_sync_balancer(proxy_balancer *b,

                                                   server_rec *s,

                                                   proxy_server_conf *conf);
@@ -879,7 +882,8 @@ PROXY_DECLARE(apr_status_t) ap_proxy_sync_balancer(proxy_balancer *b, server_rec 
 * @param dconf per-dir config or NULL

 * @return      DECLINED, DONE or OK if matched

 */

PROXY_DECLARE(int) ap_proxy_trans_match(request_rec *r, struct proxy_alias *ent,

PROXY_DECLARE(int) ap_proxy_trans_match(request_rec *r,

                                        struct proxy_alias *ent,

                                        proxy_dir_conf *dconf);



#define PROXY_LBMETHOD "proxylbmethod"