dgaudet 99/03/10 09:42:47
Modified: src CHANGES
src/include ap_ctype.h ap_mmn.h http_core.h
src/main http_protocol.c util.c util_date.c
src/modules/proxy mod_proxy.c proxy_ftp.c proxy_util.c
Log:
somehow we missed implementing ap_isxdigit... oh and there was a stray
use of isdigit()
Revision Changes Path
1.1277 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1276
retrieving revision 1.1277
diff -u -r1.1276 -r1.1277
--- CHANGES 1999/03/10 13:37:58 1.1276
+++ CHANGES 1999/03/10 17:42:35 1.1277
@@ -1,5 +1,8 @@
Changes with Apache 1.3.5
+ *) ap_isxdigit was somehow neglected when adding the ap_isfoo() macros
+ for 8-bit safeness. [Dean Gaudet]
+
*) Use -fPIC instead of -fpic on Solaris and SunOS for compiling DSOs
because SPARCs have a small machine-specific maximum size for the Global
Offset Table which is often exceeded when compiling one of the larger
1.5 +1 -0 apache-1.3/src/include/ap_ctype.h
Index: ap_ctype.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/include/ap_ctype.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ap_ctype.h 1999/01/01 19:04:39 1.4
+++ ap_ctype.h 1999/03/10 17:42:39 1.5
@@ -79,6 +79,7 @@
#define ap_ispunct(c) (ispunct(((unsigned char)(c))))
#define ap_isspace(c) (isspace(((unsigned char)(c))))
#define ap_isupper(c) (isupper(((unsigned char)(c))))
+#define ap_isxdigit(c) (isxdigit(((unsigned char)(c))))
#define ap_tolower(c) (tolower(((unsigned char)(c))))
#define ap_toupper(c) (toupper(((unsigned char)(c))))
1.31 +2 -1 apache-1.3/src/include/ap_mmn.h
Index: ap_mmn.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/include/ap_mmn.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ap_mmn.h 1999/03/08 15:43:59 1.30
+++ ap_mmn.h 1999/03/10 17:42:40 1.31
@@ -212,6 +212,7 @@
* 19990108.5 - added ap_sub_req_method_uri() and added const to
the
* definition of method in request_rec.
* 19990108.6 - SIGPIPE is now ignored by the core server.
+ * 19990108.7 - ap_isxdigit added
*/
#define MODULE_MAGIC_COOKIE 0x41503133UL /* "AP13" */
@@ -219,7 +220,7 @@
#ifndef MODULE_MAGIC_NUMBER_MAJOR
#define MODULE_MAGIC_NUMBER_MAJOR 19990108
#endif
-#define MODULE_MAGIC_NUMBER_MINOR 6 /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 7 /* 0...n */
#define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR /* backward
compat */
/* Useful for testing for features. */
1.54 +3 -0 apache-1.3/src/include/http_core.h
Index: http_core.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/include/http_core.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- http_core.h 1999/02/05 00:37:48 1.53
+++ http_core.h 1999/03/10 17:42:40 1.54
@@ -238,6 +238,9 @@
*/
unsigned d_is_fnmatch : 1;
+ /* takes sense only if use_canonical_name is on */
+ unsigned use_canonical_port : 1;
+
/* System Resource Control */
#ifdef RLIMIT_CPU
struct rlimit *limit_cpu;
1.261 +2 -2 apache-1.3/src/main/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/main/http_protocol.c,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -r1.260 -r1.261
--- http_protocol.c 1999/03/08 15:44:00 1.260
+++ http_protocol.c 1999/03/10 17:42:42 1.261
@@ -1664,7 +1664,7 @@
{
long chunksize = 0;
- while (isxdigit(*b)) {
+ while (ap_isxdigit(*b)) {
int xvalue = 0;
if (*b >= '0' && *b <= '9')
@@ -1742,7 +1742,7 @@
chunk_start = getline(buffer, bufsiz, r->connection->client, 0);
if ((chunk_start <= 0) || (chunk_start >= (bufsiz - 1))
- || !isxdigit(*buffer)) {
+ || !ap_isxdigit(*buffer)) {
r->connection->keepalive = -1;
return -1;
}
1.155 +1 -1 apache-1.3/src/main/util.c
Index: util.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/main/util.c,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- util.c 1999/03/10 12:11:57 1.154
+++ util.c 1999/03/10 17:42:43 1.155
@@ -1398,7 +1398,7 @@
if (url[y] != '%')
url[x] = url[y];
else {
- if (!isxdigit(url[y + 1]) || !isxdigit(url[y + 2])) {
+ if (!ap_isxdigit(url[y + 1]) || !ap_isxdigit(url[y + 2])) {
badesc = 1;
url[x] = '%';
}
1.15 +1 -1 apache-1.3/src/main/util_date.c
Index: util_date.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/main/util_date.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- util_date.c 1999/01/01 19:04:53 1.14
+++ util_date.c 1999/03/10 17:42:43 1.15
@@ -109,7 +109,7 @@
return 0;
break;
case '&':
- if (!isxdigit(d))
+ if (!ap_isxdigit(d))
return 0;
break;
case '~':
1.65 +1 -1 apache-1.3/src/modules/proxy/mod_proxy.c
Index: mod_proxy.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/modules/proxy/mod_proxy.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- mod_proxy.c 1999/01/01 19:05:02 1.64
+++ mod_proxy.c 1999/03/10 17:42:46 1.65
@@ -546,7 +546,7 @@
ap_get_module_config(s->module_config, &proxy_module);
int *New;
- if (!isdigit(arg[0]))
+ if (!ap_isdigit(arg[0]))
return "AllowCONNECT: port number must be numeric";
New = ap_push_array(conf->allowed_connect_ports);
1.71 +2 -2 apache-1.3/src/modules/proxy/proxy_ftp.c
Index: proxy_ftp.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/modules/proxy/proxy_ftp.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- proxy_ftp.c 1999/02/07 20:48:32 1.70
+++ proxy_ftp.c 1999/03/10 17:42:46 1.71
@@ -77,7 +77,7 @@
for (i = 0, j = 0; x[i] != '\0'; i++, j++) {
/* decode it if not already done */
ch = x[i];
- if (ch == '%' && isxdigit(x[i + 1]) && isxdigit(x[i + 2])) {
+ if (ch == '%' && ap_isxdigit(x[i + 1]) && ap_isxdigit(x[i + 2])) {
ch = ap_proxy_hex2c(&x[i + 1]);
i += 2;
}
@@ -97,7 +97,7 @@
for (i = 0; x[i] != '\0'; i++) {
ch = x[i];
- if (ch == '%' && isxdigit(x[i + 1]) && isxdigit(x[i + 2])) {
+ if (ch == '%' && ap_isxdigit(x[i + 1]) && ap_isxdigit(x[i + 2])) {
ch = ap_proxy_hex2c(&x[i + 1]);
i += 2;
}
1.78 +1 -1 apache-1.3/src/modules/proxy/proxy_util.c
Index: proxy_util.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/modules/proxy/proxy_util.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- proxy_util.c 1999/02/16 14:29:53 1.77
+++ proxy_util.c 1999/03/10 17:42:46 1.78
@@ -178,7 +178,7 @@
}
/* decode it if not already done */
if (isenc && ch == '%') {
- if (!isxdigit(x[i + 1]) || !isxdigit(x[i + 2]))
+ if (!ap_isxdigit(x[i + 1]) || !ap_isxdigit(x[i + 2]))
return NULL;
ch = ap_proxy_hex2c(&x[i + 1]);
i += 2;
