dreid 00/11/08 03:35:42
Modified: src/main http_core.c http_vhost.c listen.c rfc1413.c util.c
util_script.c util_uri.c
src/include http_protocol.h httpd.h util_uri.h
Log:
Start of moving to apr_port_t in the server code. This will probably the
first
of a few...
Revision Changes Path
1.207 +1 -1 apache-2.0/src/main/http_core.c
Index: http_core.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_core.c,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- http_core.c 2000/11/08 06:24:46 1.206
+++ http_core.c 2000/11/08 11:35:06 1.207
@@ -766,7 +766,7 @@
AP_DECLARE(unsigned) ap_get_server_port(const request_rec *r)
{
- unsigned port;
+ apr_port_t port;
core_dir_config *d =
(core_dir_config *)ap_get_module_config(r->per_dir_config,
&core_module);
1.31 +2 -2 apache-2.0/src/main/http_vhost.c
Index: http_vhost.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_vhost.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- http_vhost.c 2000/11/03 15:09:16 1.30
+++ http_vhost.c 2000/11/08 11:35:09 1.31
@@ -854,7 +854,7 @@
* names we'll match have ports associated with them
*/
const char *host = r->hostname;
- unsigned port;
+ apr_port_t port;
server_rec *s;
server_rec *last_s;
name_chain *src;
@@ -914,7 +914,7 @@
server_rec *s;
server_rec *last_s;
name_chain *src;
- unsigned port;
+ apr_port_t port;
apr_get_local_port(&port, r->connection->client_socket);
/*
1.33 +2 -2 apache-2.0/src/main/listen.c
Index: listen.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/listen.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- listen.c 2000/10/08 04:02:11 1.32
+++ listen.c 2000/11/08 11:35:10 1.33
@@ -83,7 +83,7 @@
int one = 1;
char addr[512];
apr_status_t stat;
- apr_uint32_t port;
+ apr_port_t port;
char *ipaddr;
apr_get_local_port(&port,s);
@@ -178,7 +178,7 @@
ap_listen_rec *new;
apr_status_t status;
char *oldaddr;
- unsigned int oldport;
+ apr_port_t oldport;
/* see if we've got an old listener for this address:port */
for (walk = &old_listeners; *walk; walk = &(*walk)->next) {
1.25 +2 -2 apache-2.0/src/main/rfc1413.c
Index: rfc1413.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/rfc1413.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- rfc1413.c 2000/11/07 20:21:54 1.24
+++ rfc1413.c 2000/11/08 11:35:11 1.25
@@ -112,8 +112,8 @@
const char *rmt_ip,
char user[RFC1413_USERLEN+1], server_rec *srv)
{
- unsigned int rmt_port, our_port;
- unsigned int sav_rmt_port, sav_our_port;
+ apr_port_t rmt_port, our_port;
+ apr_port_t sav_rmt_port, sav_our_port;
apr_status_t status;
int i;
char *cp;
1.77 +2 -2 apache-2.0/src/main/util.c
Index: util.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/util.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- util.c 2000/10/23 16:58:21 1.76
+++ util.c 2000/11/08 11:35:12 1.77
@@ -1557,7 +1557,7 @@
}
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)
{
if (ap_is_default_port(port, r))
return apr_pstrdup(p, hostname);
@@ -1846,7 +1846,7 @@
* Parses a host of the form <address>[:port]
* :port is permitted if 'port' is not NULL
*/
-unsigned long ap_get_virthost_addr(char *w, unsigned short *ports)
+unsigned long ap_get_virthost_addr(char *w, apr_port_t *ports)
{
struct hostent *hep;
unsigned long my_addr;
1.47 +1 -1 apache-2.0/src/main/util_script.c
Index: util_script.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/util_script.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- util_script.c 2000/11/03 02:15:50 1.46
+++ util_script.c 2000/11/08 11:35:14 1.47
@@ -166,7 +166,7 @@
apr_array_header_t *hdrs_arr = apr_table_elts(r->headers_in);
apr_table_entry_t *hdrs = (apr_table_entry_t *) hdrs_arr->elts;
int i;
- apr_uint32_t rport;
+ apr_port_t rport;
/* use a temporary apr_table_t which we'll overlap onto
* r->subprocess_env later
1.20 +2 -2 apache-2.0/src/main/util_uri.c
Index: util_uri.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/util_uri.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- util_uri.c 2000/10/16 06:04:53 1.19
+++ util_uri.c 2000/11/08 11:35:15 1.20
@@ -94,7 +94,7 @@
};
-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)
{
schemes_t *scheme;
@@ -105,7 +105,7 @@
return 0;
}
-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)
{
return (r->parsed_uri.scheme)
? ap_default_port_for_scheme(r->parsed_uri.scheme)
1.41 +2 -2 apache-2.0/src/include/http_protocol.h
Index: http_protocol.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/http_protocol.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- http_protocol.h 2000/11/08 06:24:45 1.40
+++ http_protocol.h 2000/11/08 11:35:36 1.41
@@ -552,9 +552,9 @@
* 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
}
1.114 +6 -6 apache-2.0/src/include/httpd.h
Index: httpd.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/httpd.h,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- httpd.h 2000/11/08 11:22:01 1.113
+++ httpd.h 2000/11/08 11:35:37 1.114
@@ -904,7 +904,7 @@
/** 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 @@
/** 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 @@
* @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 @@
* @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...
1.12 +6 -6 apache-2.0/src/include/util_uri.h
Index: util_uri.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/util_uri.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- util_uri.h 2000/10/16 06:04:35 1.11
+++ util_uri.h 2000/11/08 11:35:38 1.12
@@ -78,7 +78,7 @@
/** 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 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 @@
* 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
