X-Git-Url: http://www.privoxy.org/gitweb/show-status?a=blobdiff_plain;f=project.h;h=ffe6d0ae70e811c94202336e26c014cf7fe9b7b5;hb=3ae63d7d1c161a9e4076ae9c5ef4d7e0ca06cdae;hp=3f6f588d622393606a00a9b6bd49edcc541fa0c0;hpb=2c4bb864aa69ff3c48350db30785dc2245278db6;p=privoxy.git diff --git a/project.h b/project.h index 3f6f588d..ffe6d0ae 100644 --- a/project.h +++ b/project.h @@ -335,11 +335,10 @@ struct http_request char *version; /**< Protocol version */ int status; /**< HTTP Status */ - char *host; /**< Host part of URL */ int port; /**< Port of URL or 80 (default) */ + char *host; /**< Host part of URL */ char *path; /**< Path of URL */ char *hostport; /**< host[:port] */ - int ssl; /**< Flag if protocol is https */ char *host_ip_addr_str; /**< String with dotted decimal representation of host's IP. NULL before connect_to() */ @@ -354,6 +353,7 @@ struct http_request unsigned char hash_of_host_hex[(HASH_OF_HOST_BUF_SIZE * 2) + 1]; /**< chars for hash in hex string and one for '\0' */ unsigned char hash_of_host[HASH_OF_HOST_BUF_SIZE+1]; /**< chars for bytes of hash and one for '\0' */ #endif + short int ssl; /**< Flag if protocol is https */ }; @@ -1005,6 +1005,9 @@ struct client_state /** Multi-purpose flag container, see CSP_FLAG_* above */ unsigned int flags; + /** MIME-Type key, see CT_* above */ + unsigned int content_type; + /** Client PC's IP address, as reported by the accept() function. As a string. */ char *ip_addr_str; @@ -1070,9 +1073,6 @@ struct client_state char *client_address; #endif - /** MIME-Type key, see CT_* above */ - unsigned int content_type; - /** Actions files associated with this client */ struct file_list *actions_list[MAX_AF_FILES]; @@ -1135,8 +1135,8 @@ struct client_state * Thanks to this flags, we can call function to close both connections * and we don't have to care about more details. */ - int ssl_with_server_is_opened; - int ssl_with_client_is_opened; + short int ssl_with_server_is_opened; + short int ssl_with_client_is_opened; /* * Server certificate chain of trust including strings with certificates @@ -1358,7 +1358,7 @@ struct access_control_list struct access_control_addr src[1]; /**< Client IP address */ struct access_control_addr dst[1]; /**< Website or parent proxy IP address */ #ifdef HAVE_RFC2553 - int wildcard_dst; /** < dst address is wildcard */ + short wildcard_dst; /** < dst address is wildcard */ #endif short action; /**< ACL_PERMIT or ACL_DENY */