From: Jim Jagielski Date: Fri, 24 Aug 2018 19:46:57 +0000 (+0000) Subject: better struct layout ... X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=43b8f2569b98c1d2c132047fd7c8dea46368f22a;p=apache better struct layout ... git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1838941 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h index d560dfb4ea..7a540aec74 100644 --- a/modules/proxy/mod_proxy.h +++ b/modules/proxy/mod_proxy.h @@ -403,6 +403,9 @@ typedef struct { char uds_path[PROXY_WORKER_MAX_NAME_SIZE]; /* path to worker's unix domain socket if applicable */ char hcuri[PROXY_WORKER_MAX_ROUTE_SIZE]; /* health check uri */ char hcexpr[PROXY_WORKER_MAX_SCHEME_SIZE]; /* name of condition expr for health check */ + char secret[PROXY_WORKER_MAX_SECRET_SIZE]; /* authentication secret (e.g. AJP13) */ + char upgrade[PROXY_WORKER_MAX_SCHEME_SIZE];/* upgrade protocol used by mod_proxy_wstunnel */ + char hostname_ex[PROXY_RFC1035_HOSTNAME_SIZE]; /* RFC1035 compliant version of the remote backend address */ int lbset; /* load balancer cluster set */ int retries; /* number of retries on this worker */ int lbstatus; /* Current lbstatus */ @@ -438,14 +441,11 @@ typedef struct { apr_size_t io_buffer_size; apr_size_t elected; /* Number of times the worker was elected */ apr_size_t busy; /* busyness factor */ + apr_size_t response_field_size; /* Size of proxy response buffer in bytes. */ apr_port_t port; apr_off_t transferred;/* Number of bytes transferred to remote */ apr_off_t read; /* Number of bytes read from remote */ void *context; /* general purpose storage */ - char secret[PROXY_WORKER_MAX_SECRET_SIZE]; /* authentication secret (e.g. AJP13) */ - char upgrade[PROXY_WORKER_MAX_SCHEME_SIZE];/* upgrade protocol used by mod_proxy_wstunnel */ - char hostname_ex[PROXY_RFC1035_HOSTNAME_SIZE]; /* RFC1035 compliant version of the remote backend address */ - apr_size_t response_field_size; /* Size of proxy response buffer in bytes. */ unsigned int keepalive:1; unsigned int disablereuse:1; unsigned int is_address_reusable:1; @@ -460,7 +460,7 @@ typedef struct { unsigned int disablereuse_set:1; unsigned int was_malloced:1; unsigned int is_name_matchable:1; - unsigned int response_field_size_set:1; + unsigned int response_field_size_set:1; } proxy_worker_shared; #define ALIGNED_PROXY_WORKER_SHARED_SIZE (APR_ALIGN_DEFAULT(sizeof(proxy_worker_shared)))