# HG changeset patch # User Olaf Wintermann # Date 1484501229 -3600 # Node ID d861ee1455bf11ae660b10f82b4810bd03767a9a # Parent d050449c3b9e6bf8ef7f96254b554f93c7ff0b3c removes some unused stuff diff -r d050449c3b9e -r d861ee1455bf src/server/util/pblock.h --- a/src/server/util/pblock.h Sun Jan 15 17:53:16 2017 +0100 +++ b/src/server/util/pblock.h Sun Jan 15 18:27:09 2017 +0100 @@ -109,199 +109,199 @@ typedef struct pb_key pb_key; -BASE_DLL extern const pb_key *const pb_key_accept; -BASE_DLL extern const pb_key *const pb_key_accept_charset; -BASE_DLL extern const pb_key *const pb_key_accept_encoding; -BASE_DLL extern const pb_key *const pb_key_accept_language; -BASE_DLL extern const pb_key *const pb_key_accept_ranges; -BASE_DLL extern const pb_key *const pb_key_actual_route; -BASE_DLL extern const pb_key *const pb_key_age; -BASE_DLL extern const pb_key *const pb_key_always_allow_chunked; -BASE_DLL extern const pb_key *const pb_key_always_use_keep_alive; -BASE_DLL extern const pb_key *const pb_key_auth_cert; -BASE_DLL extern const pb_key *const pb_key_auth_expiring; -BASE_DLL extern const pb_key *const pb_key_auth_group; -BASE_DLL extern const pb_key *const pb_key_auth_type; -BASE_DLL extern const pb_key *const pb_key_auth_user; -BASE_DLL extern const pb_key *const pb_key_authorization; -BASE_DLL extern const pb_key *const pb_key_browser; -BASE_DLL extern const pb_key *const pb_key_c2p_cl; -BASE_DLL extern const pb_key *const pb_key_c2p_hl; -BASE_DLL extern const pb_key *const pb_key_cache_info; -BASE_DLL extern const pb_key *const pb_key_charset; -BASE_DLL extern const pb_key *const pb_key_check_http_server; -BASE_DLL extern const pb_key *const pb_key_ChunkedRequestBufferSize; -BASE_DLL extern const pb_key *const pb_key_ChunkedRequestTimeout; -BASE_DLL extern const pb_key *const pb_key_cipher; -BASE_DLL extern const pb_key *const pb_key_clf_request; -BASE_DLL extern const pb_key *const pb_key_cli_status; -BASE_DLL extern const pb_key *const pb_key_client_cert_nickname; -BASE_DLL extern const pb_key *const pb_key_client_ip; -BASE_DLL extern const pb_key *const pb_key_close; -BASE_DLL extern const pb_key *const pb_key_connect_timeout; -BASE_DLL extern const pb_key *const pb_key_connection; -BASE_DLL extern const pb_key *const pb_key_cont; -BASE_DLL extern const pb_key *const pb_key_content_encoding; -BASE_DLL extern const pb_key *const pb_key_content_language; -BASE_DLL extern const pb_key *const pb_key_content_length; -BASE_DLL extern const pb_key *const pb_key_content_location; -BASE_DLL extern const pb_key *const pb_key_content_md5; -BASE_DLL extern const pb_key *const pb_key_content_range; -BASE_DLL extern const pb_key *const pb_key_content_type; -BASE_DLL extern const pb_key *const pb_key_cookie; -BASE_DLL extern const pb_key *const pb_key_date; -BASE_DLL extern const pb_key *const pb_key_DATE_GMT; -BASE_DLL extern const pb_key *const pb_key_DATE_LOCAL; -BASE_DLL extern const pb_key *const pb_key_dir; -BASE_DLL extern const pb_key *const pb_key_Directive; -BASE_DLL extern const pb_key *const pb_key_dns; -BASE_DLL extern const pb_key *const pb_key_DOCUMENT_NAME; -BASE_DLL extern const pb_key *const pb_key_DOCUMENT_URI; -BASE_DLL extern const pb_key *const pb_key_domain; -BASE_DLL extern const pb_key *const pb_key_enc; -BASE_DLL extern const pb_key *const pb_key_engine; -BASE_DLL extern const pb_key *const pb_key_error_action; -BASE_DLL extern const pb_key *const pb_key_error_desc; -BASE_DLL extern const pb_key *const pb_key_error_fn; -BASE_DLL extern const pb_key *const pb_key_escape; -BASE_DLL extern const pb_key *const pb_key_escaped; -BASE_DLL extern const pb_key *const pb_key_etag; -BASE_DLL extern const pb_key *const pb_key_expect; -BASE_DLL extern const pb_key *const pb_key_expires; -BASE_DLL extern const pb_key *const pb_key_expr; -BASE_DLL extern const pb_key *const pb_key_filter; -BASE_DLL extern const pb_key *const pb_key_find_pathinfo_forward; -BASE_DLL extern const pb_key *const pb_key_flushTimer; -BASE_DLL extern const pb_key *const pb_key_fn; -BASE_DLL extern const pb_key *const pb_key_from; -BASE_DLL extern const pb_key *const pb_key_full_headers; -BASE_DLL extern const pb_key *const pb_key_hdr; -BASE_DLL extern const pb_key *const pb_key_host; -BASE_DLL extern const pb_key *const pb_key_hostname; -BASE_DLL extern const pb_key *const pb_key_if_match; -BASE_DLL extern const pb_key *const pb_key_if_modified_since; -BASE_DLL extern const pb_key *const pb_key_if_none_match; -BASE_DLL extern const pb_key *const pb_key_if_range; -BASE_DLL extern const pb_key *const pb_key_if_unmodified_since; -BASE_DLL extern const pb_key *const pb_key_ip; -BASE_DLL extern const pb_key *const pb_key_iponly; -BASE_DLL extern const pb_key *const pb_key_issuer_dn; -BASE_DLL extern const pb_key *const pb_key_jroute; -BASE_DLL extern const pb_key *const pb_key_keep_alive; -BASE_DLL extern const pb_key *const pb_key_keep_alive_timeout; -BASE_DLL extern const pb_key *const pb_key_keysize; -BASE_DLL extern const pb_key *const pb_key_lang; -BASE_DLL extern const pb_key *const pb_key_LAST_MODIFIED; -BASE_DLL extern const pb_key *const pb_key_last_modified; -BASE_DLL extern const pb_key *const pb_key_level; -BASE_DLL extern const pb_key *const pb_key_location; -BASE_DLL extern const pb_key *const pb_key_lock_owner; -BASE_DLL extern const pb_key *const pb_key_magnus_charset; -BASE_DLL extern const pb_key *const pb_key_magnus_internal; -BASE_DLL extern const pb_key *const pb_key_magnus_internal_dav_src; -BASE_DLL extern const pb_key *const pb_key_magnus_internal_default_acls_only; -BASE_DLL extern const pb_key *const pb_key_magnus_internal_error_j2ee; -BASE_DLL extern const pb_key *const pb_key_magnus_internal_j2ee_nsapi; -BASE_DLL extern const pb_key *const pb_key_magnus_internal_preserve_srvhdrs; -BASE_DLL extern const pb_key *const pb_key_magnus_internal_set_request_status; -BASE_DLL extern const pb_key *const pb_key_magnus_internal_set_response_status; -BASE_DLL extern const pb_key *const pb_key_magnus_internal_webapp_errordesc; -BASE_DLL extern const pb_key *const pb_key_matched_browser; -BASE_DLL extern const pb_key *const pb_key_max_age; -BASE_DLL extern const pb_key *const pb_key_max_forwards; -BASE_DLL extern const pb_key *const pb_key_message; -BASE_DLL extern const pb_key *const pb_key_method; -BASE_DLL extern const pb_key *const pb_key_name; -BASE_DLL extern const pb_key *const pb_key_nocache; -BASE_DLL extern const pb_key *const pb_key_nostat; -BASE_DLL extern const pb_key *const pb_key_ntrans_base; -BASE_DLL extern const pb_key *const pb_key_offline_origin_addr; -BASE_DLL extern const pb_key *const pb_key_offline_proxy_addr; -BASE_DLL extern const pb_key *const pb_key_origin_addr; -BASE_DLL extern const pb_key *const pb_key_p2c_cl; -BASE_DLL extern const pb_key *const pb_key_p2c_hl; -BASE_DLL extern const pb_key *const pb_key_p2r_cl; -BASE_DLL extern const pb_key *const pb_key_p2r_hl; -BASE_DLL extern const pb_key *const pb_key_parse_timeout; -BASE_DLL extern const pb_key *const pb_key_password; -BASE_DLL extern const pb_key *const pb_key_path; -BASE_DLL extern const pb_key *const pb_key_PATH_INFO; -BASE_DLL extern const pb_key *const pb_key_path_info; -BASE_DLL extern const pb_key *const pb_key_pblock; -BASE_DLL extern const pb_key *const pb_key_poll_interval; -BASE_DLL extern const pb_key *const pb_key_pool; // new -BASE_DLL extern const pb_key *const pb_key_port; -BASE_DLL extern const pb_key *const pb_key_ppath; -BASE_DLL extern const pb_key *const pb_key_pragma; -BASE_DLL extern const pb_key *const pb_key_process_request_body; -BASE_DLL extern const pb_key *const pb_key_process_response_body; -BASE_DLL extern const pb_key *const pb_key_protocol; -BASE_DLL extern const pb_key *const pb_key_proxy_addr; -BASE_DLL extern const pb_key *const pb_key_proxy_agent; -BASE_DLL extern const pb_key *const pb_key_proxy_auth_cert; -BASE_DLL extern const pb_key *const pb_key_proxy_authorization; -BASE_DLL extern const pb_key *const pb_key_proxy_cipher; -BASE_DLL extern const pb_key *const pb_key_proxy_issuer_dn; -BASE_DLL extern const pb_key *const pb_key_proxy_jroute; -BASE_DLL extern const pb_key *const pb_key_proxy_keysize; -BASE_DLL extern const pb_key *const pb_key_proxy_ping; -BASE_DLL extern const pb_key *const pb_key_proxy_request; -BASE_DLL extern const pb_key *const pb_key_proxy_secret_keysize; -BASE_DLL extern const pb_key *const pb_key_proxy_ssl_id; -BASE_DLL extern const pb_key *const pb_key_proxy_user_dn; -BASE_DLL extern const pb_key *const pb_key_query; -BASE_DLL extern const pb_key *const pb_key_QUERY_STRING; -BASE_DLL extern const pb_key *const pb_key_QUERY_STRING_UNESCAPED; -BASE_DLL extern const pb_key *const pb_key_r2p_cl; -BASE_DLL extern const pb_key *const pb_key_r2p_hl; -BASE_DLL extern const pb_key *const pb_key_range; -BASE_DLL extern const pb_key *const pb_key_referer; -BASE_DLL extern const pb_key *const pb_key_reformat_request_headers; -BASE_DLL extern const pb_key *const pb_key_remote_status; -BASE_DLL extern const pb_key *const pb_key_request_jroute; -BASE_DLL extern const pb_key *const pb_key_required_rights; -BASE_DLL extern const pb_key *const pb_key_retries; -BASE_DLL extern const pb_key *const pb_key_rewrite_content_location; -BASE_DLL extern const pb_key *const pb_key_rewrite_host; -BASE_DLL extern const pb_key *const pb_key_rewrite_location; -BASE_DLL extern const pb_key *const pb_key_rewrite_set_cookie; -BASE_DLL extern const pb_key *const pb_key_root; -BASE_DLL extern const pb_key *const pb_key_route; -BASE_DLL extern const pb_key *const pb_key_route_cookie; -BASE_DLL extern const pb_key *const pb_key_route_hdr; -BASE_DLL extern const pb_key *const pb_key_route_offline; -BASE_DLL extern const pb_key *const pb_key_script_name; -BASE_DLL extern const pb_key *const pb_key_secret_keysize; -BASE_DLL extern const pb_key *const pb_key_secure; -BASE_DLL extern const pb_key *const pb_key_server; -BASE_DLL extern const pb_key *const pb_key_set_cookie; -BASE_DLL extern const pb_key *const pb_key_socks_addr; -BASE_DLL extern const pb_key *const pb_key_ssl_id; -BASE_DLL extern const pb_key *const pb_key_ssl_unclean_shutdown; -BASE_DLL extern const pb_key *const pb_key_status; -BASE_DLL extern const pb_key *const pb_key_sticky_cookie; -BASE_DLL extern const pb_key *const pb_key_sticky_param; -BASE_DLL extern const pb_key *const pb_key_suppress_request_headers; -BASE_DLL extern const pb_key *const pb_key_svr_status; -BASE_DLL extern const pb_key *const pb_key_timeout; -BASE_DLL extern const pb_key *const pb_key_to; -BASE_DLL extern const pb_key *const pb_key_transfer_encoding; -BASE_DLL extern const pb_key *const pb_key_transmit_timeout; -BASE_DLL extern const pb_key *const pb_key_tunnel_non_http_response; -BASE_DLL extern const pb_key *const pb_key_type; -BASE_DLL extern const pb_key *const pb_key_upstream_jroute; -BASE_DLL extern const pb_key *const pb_key_uri; -BASE_DLL extern const pb_key *const pb_key_url; -BASE_DLL extern const pb_key *const pb_key_url_prefix; -BASE_DLL extern const pb_key *const pb_key_UseOutputStreamSize; -BASE_DLL extern const pb_key *const pb_key_user; -BASE_DLL extern const pb_key *const pb_key_user_agent; -BASE_DLL extern const pb_key *const pb_key_user_dn; -BASE_DLL extern const pb_key *const pb_key_validate_server_cert; -BASE_DLL extern const pb_key *const pb_key_value; -BASE_DLL extern const pb_key *const pb_key_vary; -BASE_DLL extern const pb_key *const pb_key_via; -BASE_DLL extern const pb_key *const pb_key_warning; +const pb_key *const pb_key_accept; +const pb_key *const pb_key_accept_charset; +const pb_key *const pb_key_accept_encoding; +const pb_key *const pb_key_accept_language; +const pb_key *const pb_key_accept_ranges; +const pb_key *const pb_key_actual_route; +const pb_key *const pb_key_age; +const pb_key *const pb_key_always_allow_chunked; +const pb_key *const pb_key_always_use_keep_alive; +const pb_key *const pb_key_auth_cert; +const pb_key *const pb_key_auth_expiring; +const pb_key *const pb_key_auth_group; +const pb_key *const pb_key_auth_type; +const pb_key *const pb_key_auth_user; +const pb_key *const pb_key_authorization; +const pb_key *const pb_key_browser; +const pb_key *const pb_key_c2p_cl; +const pb_key *const pb_key_c2p_hl; +const pb_key *const pb_key_cache_info; +const pb_key *const pb_key_charset; +const pb_key *const pb_key_check_http_server; +const pb_key *const pb_key_ChunkedRequestBufferSize; +const pb_key *const pb_key_ChunkedRequestTimeout; +const pb_key *const pb_key_cipher; +const pb_key *const pb_key_clf_request; +const pb_key *const pb_key_cli_status; +const pb_key *const pb_key_client_cert_nickname; +const pb_key *const pb_key_client_ip; +const pb_key *const pb_key_close; +const pb_key *const pb_key_connect_timeout; +const pb_key *const pb_key_connection; +const pb_key *const pb_key_cont; +const pb_key *const pb_key_content_encoding; +const pb_key *const pb_key_content_language; +const pb_key *const pb_key_content_length; +const pb_key *const pb_key_content_location; +const pb_key *const pb_key_content_md5; +const pb_key *const pb_key_content_range; +const pb_key *const pb_key_content_type; +const pb_key *const pb_key_cookie; +const pb_key *const pb_key_date; +const pb_key *const pb_key_DATE_GMT; +const pb_key *const pb_key_DATE_LOCAL; +const pb_key *const pb_key_dir; +const pb_key *const pb_key_Directive; +const pb_key *const pb_key_dns; +const pb_key *const pb_key_DOCUMENT_NAME; +const pb_key *const pb_key_DOCUMENT_URI; +const pb_key *const pb_key_domain; +const pb_key *const pb_key_enc; +const pb_key *const pb_key_engine; +const pb_key *const pb_key_error_action; +const pb_key *const pb_key_error_desc; +const pb_key *const pb_key_error_fn; +const pb_key *const pb_key_escape; +const pb_key *const pb_key_escaped; +const pb_key *const pb_key_etag; +const pb_key *const pb_key_expect; +const pb_key *const pb_key_expires; +const pb_key *const pb_key_expr; +const pb_key *const pb_key_filter; +const pb_key *const pb_key_find_pathinfo_forward; +const pb_key *const pb_key_flushTimer; +const pb_key *const pb_key_fn; +const pb_key *const pb_key_from; +const pb_key *const pb_key_full_headers; +const pb_key *const pb_key_hdr; +const pb_key *const pb_key_host; +const pb_key *const pb_key_hostname; +const pb_key *const pb_key_if_match; +const pb_key *const pb_key_if_modified_since; +const pb_key *const pb_key_if_none_match; +const pb_key *const pb_key_if_range; +const pb_key *const pb_key_if_unmodified_since; +const pb_key *const pb_key_ip; +const pb_key *const pb_key_iponly; +const pb_key *const pb_key_issuer_dn; +const pb_key *const pb_key_jroute; +const pb_key *const pb_key_keep_alive; +const pb_key *const pb_key_keep_alive_timeout; +const pb_key *const pb_key_keysize; +const pb_key *const pb_key_lang; +const pb_key *const pb_key_LAST_MODIFIED; +const pb_key *const pb_key_last_modified; +const pb_key *const pb_key_level; +const pb_key *const pb_key_location; +const pb_key *const pb_key_lock_owner; +const pb_key *const pb_key_magnus_charset; +const pb_key *const pb_key_magnus_internal; +const pb_key *const pb_key_magnus_internal_dav_src; +const pb_key *const pb_key_magnus_internal_default_acls_only; +const pb_key *const pb_key_magnus_internal_error_j2ee; +const pb_key *const pb_key_magnus_internal_j2ee_nsapi; +const pb_key *const pb_key_magnus_internal_preserve_srvhdrs; +const pb_key *const pb_key_magnus_internal_set_request_status; +const pb_key *const pb_key_magnus_internal_set_response_status; +const pb_key *const pb_key_magnus_internal_webapp_errordesc; +const pb_key *const pb_key_matched_browser; +const pb_key *const pb_key_max_age; +const pb_key *const pb_key_max_forwards; +const pb_key *const pb_key_message; +const pb_key *const pb_key_method; +const pb_key *const pb_key_name; +const pb_key *const pb_key_nocache; +const pb_key *const pb_key_nostat; +const pb_key *const pb_key_ntrans_base; +const pb_key *const pb_key_offline_origin_addr; +const pb_key *const pb_key_offline_proxy_addr; +const pb_key *const pb_key_origin_addr; +const pb_key *const pb_key_p2c_cl; +const pb_key *const pb_key_p2c_hl; +const pb_key *const pb_key_p2r_cl; +const pb_key *const pb_key_p2r_hl; +const pb_key *const pb_key_parse_timeout; +const pb_key *const pb_key_password; +const pb_key *const pb_key_path; +const pb_key *const pb_key_PATH_INFO; +const pb_key *const pb_key_path_info; +const pb_key *const pb_key_pblock; +const pb_key *const pb_key_poll_interval; +const pb_key *const pb_key_pool; // new +const pb_key *const pb_key_port; +const pb_key *const pb_key_ppath; +const pb_key *const pb_key_pragma; +const pb_key *const pb_key_process_request_body; +const pb_key *const pb_key_process_response_body; +const pb_key *const pb_key_protocol; +const pb_key *const pb_key_proxy_addr; +const pb_key *const pb_key_proxy_agent; +const pb_key *const pb_key_proxy_auth_cert; +const pb_key *const pb_key_proxy_authorization; +const pb_key *const pb_key_proxy_cipher; +const pb_key *const pb_key_proxy_issuer_dn; +const pb_key *const pb_key_proxy_jroute; +const pb_key *const pb_key_proxy_keysize; +const pb_key *const pb_key_proxy_ping; +const pb_key *const pb_key_proxy_request; +const pb_key *const pb_key_proxy_secret_keysize; +const pb_key *const pb_key_proxy_ssl_id; +const pb_key *const pb_key_proxy_user_dn; +const pb_key *const pb_key_query; +const pb_key *const pb_key_QUERY_STRING; +const pb_key *const pb_key_QUERY_STRING_UNESCAPED; +const pb_key *const pb_key_r2p_cl; +const pb_key *const pb_key_r2p_hl; +const pb_key *const pb_key_range; +const pb_key *const pb_key_referer; +const pb_key *const pb_key_reformat_request_headers; +const pb_key *const pb_key_remote_status; +const pb_key *const pb_key_request_jroute; +const pb_key *const pb_key_required_rights; +const pb_key *const pb_key_retries; +const pb_key *const pb_key_rewrite_content_location; +const pb_key *const pb_key_rewrite_host; +const pb_key *const pb_key_rewrite_location; +const pb_key *const pb_key_rewrite_set_cookie; +const pb_key *const pb_key_root; +const pb_key *const pb_key_route; +const pb_key *const pb_key_route_cookie; +const pb_key *const pb_key_route_hdr; +const pb_key *const pb_key_route_offline; +const pb_key *const pb_key_script_name; +const pb_key *const pb_key_secret_keysize; +const pb_key *const pb_key_secure; +const pb_key *const pb_key_server; +const pb_key *const pb_key_set_cookie; +const pb_key *const pb_key_socks_addr; +const pb_key *const pb_key_ssl_id; +const pb_key *const pb_key_ssl_unclean_shutdown; +const pb_key *const pb_key_status; +const pb_key *const pb_key_sticky_cookie; +const pb_key *const pb_key_sticky_param; +const pb_key *const pb_key_suppress_request_headers; +const pb_key *const pb_key_svr_status; +const pb_key *const pb_key_timeout; +const pb_key *const pb_key_to; +const pb_key *const pb_key_transfer_encoding; +const pb_key *const pb_key_transmit_timeout; +const pb_key *const pb_key_tunnel_non_http_response; +const pb_key *const pb_key_type; +const pb_key *const pb_key_upstream_jroute; +const pb_key *const pb_key_uri; +const pb_key *const pb_key_url; +const pb_key *const pb_key_url_prefix; +const pb_key *const pb_key_UseOutputStreamSize; +const pb_key *const pb_key_user; +const pb_key *const pb_key_user_agent; +const pb_key *const pb_key_user_dn; +const pb_key *const pb_key_validate_server_cert; +const pb_key *const pb_key_value; +const pb_key *const pb_key_vary; +const pb_key *const pb_key_via; +const pb_key *const pb_key_warning; NSAPI_PUBLIC pool_handle_t *pblock_pool(pblock *pb); diff -r d050449c3b9e -r d861ee1455bf src/server/util/system.c --- a/src/server/util/system.c Sun Jan 15 17:53:16 2017 +0100 +++ b/src/server/util/system.c Sun Jan 15 18:27:09 2017 +0100 @@ -56,7 +56,8 @@ static char* temp_dir = NULL; #ifdef XP_WIN32 -_PNH original_newhandler = 0; +// TODO: +//_PNH original_newhandler = 0; #else typedef void (newhandler)(void); static newhandler *original_newhandler = 0; @@ -341,6 +342,8 @@ //PR_ASSERT(thread_malloc_key); } +// TODO: don't know what this is +/* #ifdef XP_WIN32 static int _cdecl system_newhandler(unsigned int size) { @@ -386,3 +389,5 @@ //original_newhandler = set_new_handler(system_newhandler); // TODO: ... #endif } + +*/ \ No newline at end of file diff -r d050449c3b9e -r d861ee1455bf src/server/util/util.h --- a/src/server/util/util.h Sun Jan 15 17:53:16 2017 +0100 +++ b/src/server/util/util.h Sun Jan 15 18:27:09 2017 +0100 @@ -37,7 +37,10 @@ #include "../daemon/netsite.h" #include #include "pool.h" + +#ifdef XP_UNIX #include +#endif #ifndef NOINTNSAPI #define INTNSAPI