diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/http_protocol.h | 4 | ||||
| -rw-r--r-- | include/httpd.h | 12 | ||||
| -rw-r--r-- | include/util_uri.h | 12 |
3 files changed, 14 insertions, 14 deletions
diff --git a/include/http_protocol.h b/include/http_protocol.h index 112ca0d13f..b56c8225e7 100644 --- a/include/http_protocol.h +++ b/include/http_protocol.h @@ -552,9 +552,9 @@ AP_DECLARE_HOOK(const char *,http_method,(const request_rec *)) * Return the default port from the current request * @param r The current request * @return The current port - * @deffunc unsigned short ap_run_default_port(const request_rec *r) + * @deffunc apr_port_t ap_run_default_port(const request_rec *r) */ -AP_DECLARE_HOOK(unsigned short,default_port,(const request_rec *)) +AP_DECLARE_HOOK(apr_port_t,default_port,(const request_rec *)) #ifdef __cplusplus } diff --git a/include/httpd.h b/include/httpd.h index 76a0ea3ca9..6aa52234e6 100644 --- a/include/httpd.h +++ b/include/httpd.h @@ -904,7 +904,7 @@ struct server_addr_rec { /** The bound address, for this server */ apr_in_addr host_addr; /** The bound port, for this server */ - unsigned short host_port; + apr_port_t host_port; /** The name given in <VirtualHost> */ char *virthost; }; @@ -928,7 +928,7 @@ struct server_rec { /** The server hostname */ char *server_hostname; /** for redirects, etc. */ - unsigned short port; + apr_port_t port; /* Log files --- note that transfer log is now in the modules... */ @@ -1277,10 +1277,10 @@ AP_DECLARE(char *) ap_escape_html(apr_pool_t *p, const char *s); * @param port The port the server is running on * @param r The current request * @return The server's hostname - * @deffunc char *ap_construct_server(apr_pool_t *p, const char *hostname, unsiged port, const request_rec *r) + * @deffunc char *ap_construct_server(apr_pool_t *p, const char *hostname, apr_port_t port, const request_rec *r) */ AP_DECLARE(char *) ap_construct_server(apr_pool_t *p, const char *hostname, - unsigned port, const request_rec *r); + apr_port_t port, const request_rec *r); /** * Escape a shell command * @param p The pool to allocate out of @@ -1569,9 +1569,9 @@ char *ap_get_local_host(apr_pool_t *p); * @param hostname The hostname to parse * @param port The port found in the hostname * @return The address of the server - * @deffunc unsigned long ap_get_virthost_addr(char *hostname, unsigned shor *port) + * @deffunc unsigned long ap_get_virthost_addr(char *hostname, apr_port_t *port) */ -unsigned long ap_get_virthost_addr(char *hostname, unsigned short *port); +unsigned long ap_get_virthost_addr(char *hostname, apr_port_t *port); /* * Redefine assert() to something more useful for an Apache... diff --git a/include/util_uri.h b/include/util_uri.h index a67ead165c..fc785fd8e8 100644 --- a/include/util_uri.h +++ b/include/util_uri.h @@ -78,7 +78,7 @@ struct schemes_t { /** The name of the scheme */ const char *name; /** The default port for the scheme */ - unsigned short default_port; + apr_port_t default_port; }; #define DEFAULT_FTP_DATA_PORT 20 @@ -128,7 +128,7 @@ struct uri_components { struct hostent *hostent; /** The port number, numeric, valid only if port_str != NULL */ - unsigned short port; + apr_port_t port; /** has the structure been initialized */ unsigned is_initialized:1; @@ -145,17 +145,17 @@ struct uri_components { * http, ftp, https, gopher, wais, nntp, snews, and prospero * @param scheme_str The string that contains the current scheme * @return The default port for this scheme - * @deffunc unsigned short ap_default_port_for_scheme(const char *scheme_str) + * @deffunc apr_port_t ap_default_port_for_scheme(const char *scheme_str) */ -AP_DECLARE(unsigned short) ap_default_port_for_scheme(const char *scheme_str); +AP_DECLARE(apr_port_t) ap_default_port_for_scheme(const char *scheme_str); /** * Return the default for the current request * @param r The current request * @return The default port - * @deffunc unsigned short ap_default_port_for_request(const request_rec *r) + * @deffunc apr_port_t ap_default_port_for_request(const request_rec *r) */ -AP_DECLARE(unsigned short) ap_default_port_for_request(const request_rec *r); +AP_DECLARE(apr_port_t) ap_default_port_for_request(const request_rec *r); /** * Create a copy of a "struct hostent" record; it was presumably returned |