You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2018/08/24 19:46:57 UTC

svn commit: r1838941 - /httpd/httpd/trunk/modules/proxy/mod_proxy.h

Author: jim
Date: Fri Aug 24 19:46:57 2018
New Revision: 1838941

URL: http://svn.apache.org/viewvc?rev=1838941&view=rev
Log:
better struct layout ...

Modified:
    httpd/httpd/trunk/modules/proxy/mod_proxy.h

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.h?rev=1838941&r1=1838940&r2=1838941&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.h (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.h Fri Aug 24 19:46:57 2018
@@ -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)))



Re: svn commit: r1838941 - /httpd/httpd/trunk/modules/proxy/mod_proxy.h

Posted by William A Rowe Jr <wr...@rowe-clan.net>.
MMN major, please?

On Fri, Aug 24, 2018 at 2:46 PM, <ji...@apache.org> wrote:

> Author: jim
> Date: Fri Aug 24 19:46:57 2018
> New Revision: 1838941
>
> URL: http://svn.apache.org/viewvc?rev=1838941&view=rev
> Log:
> better struct layout ...
>
> Modified:
>     httpd/httpd/trunk/modules/proxy/mod_proxy.h
>
> Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.h
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/
> proxy/mod_proxy.h?rev=1838941&r1=1838940&r2=1838941&view=diff
> ============================================================
> ==================
> --- httpd/httpd/trunk/modules/proxy/mod_proxy.h (original)
> +++ httpd/httpd/trunk/modules/proxy/mod_proxy.h Fri Aug 24 19:46:57 2018
> @@ -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)))
>
>
>