cvs commit: apachen/src/main http_main.c http_protocol.c
randy 97/09/02 21:54:55
Modified:src/main http_main.c http_protocol.c
Log:
Logging tweaks.
Revision ChangesPath
1.214 +1 -1 apachen/src/main/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apachen/src/main/http_main.c,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- http_main.c 1997/08/31 20:13:05 1.213
+++ http_main.c 1997/09/03 04:54:48 1.214
@@ -689,7 +689,7 @@
if (timeout_req != NULL) dirconf = timeout_req->per_dir_config;
else dirconf = current_conn->server->lookup_defaults;
if (sig == SIGPIPE) {
-ap_snprintf(errstr, sizeof(errstr), "%s lost connection to client
%s",
+ap_snprintf(errstr, sizeof(errstr), "%s lost connection to %s",
timeout_name ? timeout_name : "request",
get_remote_host(current_conn, dirconf, REMOTE_NAME));
} else {
1.158 +3 -3 apachen/src/main/http_protocol.c
Index: http_protocol.c
===
RCS file: /export/home/cvs/apachen/src/main/http_protocol.c,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- http_protocol.c 1997/09/01 02:46:47 1.157
+++ http_protocol.c 1997/09/03 04:54:52 1.158
@@ -1671,7 +1671,7 @@
else if (errno == EAGAIN)
continue;
else {
-aplog_error(APLOG_MARK, APLOG_NOTICE, r->server,
+aplog_error(APLOG_MARK, APLOG_WARNING, r->server,
"send body lost connection to %s",
get_remote_host(r->connection,
r->per_dir_config,
REMOTE_NAME));
@@ -1750,7 +1750,7 @@
else if (errno == EAGAIN)
continue;
else {
-aplog_error(APLOG_MARK, APLOG_NOTICE, r->server,
+aplog_error(APLOG_MARK, APLOG_WARNING, r->server,
"send body lost connection to %s",
get_remote_host(r->connection,
r->per_dir_config,
REMOTE_NAME));
@@ -1812,7 +1812,7 @@
else if (errno == EAGAIN)
continue;
else {
-aplog_error(APLOG_MARK, APLOG_NOTICE, r->server,
+aplog_error(APLOG_MARK, APLOG_WARNING, r->server,
"send mmap lost connection to %s",
get_remote_host(r->connection,
r->per_dir_config,
REMOTE_NAME));
cvs commit: apachen/src/helpers GuessOS
jim 97/09/02 16:08:53
Modified:src/helpers GuessOS
Log:
Make GuessOS aware of new 64bit version of SINIX
Revision ChangesPath
1.29 +1 -1 apachen/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apachen/src/helpers/GuessOS,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- GuessOS 1997/08/24 18:24:02 1.28
+++ GuessOS 1997/09/02 23:08:51 1.29
@@ -187,7 +187,7 @@
echo "${MACHINE}-unknown-ultrix"; exit 0
;;
-SINIX*)
+SINIX-?:* | ReliantUNIX-?:*)
echo "${MACHINE}-sni-sysv4"; exit 0
;;
cvs commit: apache-devsite mmn.txt
coar97/09/02 09:27:09 Modified:.mmn.txt Log: Record the latest MMN change (MD5 renaming). Revision ChangesPath 1.5 +1 -0 apache-devsite/mmn.txt Index: mmn.txt === RCS file: /export/home/cvs/apache-devsite/mmn.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mmn.txt 1997/09/01 14:08:47 1.4 +++ mmn.txt 1997/09/02 16:27:07 1.5 @@ -17,3 +17,4 @@ 19970818 (1.3a2-dev) - post read-request phase added 19970825 (1.3a2-dev) - r->mtime cell added 19970831 (1.3a2-dev) - error logging changed to use aplog_error() +19970902 (1.3a2-dev) - MD5 routines and structures renamed to ap_*
cvs commit: apachen/src/main http_config.h
coar97/09/02 09:19:18 Modified:src CHANGES src/main http_config.h Log: Yerg. Note MD5 renames in CHANGES, and bump the MODULE_MAGIC_NUMBER as a consequence. Revision ChangesPath 1.426 +4 -0 apachen/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apachen/src/CHANGES,v retrieving revision 1.425 retrieving revision 1.426 diff -u -r1.425 -r1.426 --- CHANGES 1997/08/31 22:36:21 1.425 +++ CHANGES 1997/09/02 16:19:14 1.426 @@ -1,5 +1,9 @@ Changes with Apache 1.3a2 + *) Some of the MD5 names defined in Apache have been renamed to have + an `ap_' prefix to avoid conflicts with routines supplied by + external libraries. [Ken Coar] + *) Removal of mod_auth_msql.c from the distribution. There are many other options for databases today. Rather than offer one option, offer none at this time. mod_auth_msql and other SQL database 1.48 +1 -1 apachen/src/main/http_config.h Index: http_config.h === RCS file: /export/home/cvs/apachen/src/main/http_config.h,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- http_config.h 1997/09/01 04:14:48 1.47 +++ http_config.h 1997/09/02 16:19:17 1.48 @@ -246,7 +246,7 @@ * handle it back-compatibly, or at least signal an error). */ -#define MODULE_MAGIC_NUMBER 19970831 +#define MODULE_MAGIC_NUMBER 19970902 #define STANDARD_MODULE_STUFF MODULE_MAGIC_NUMBER, -1, __FILE__, NULL /* Generic accessors for other modules to get at their own module-specific
cvs commit: apachen/src/support htdigest.c
coar97/09/02 09:12:18
Modified:src/main http_core.c md5.h md5c.c util_md5.c util_md5.h
src/modules/proxy proxy_util.c
src/modules/standard mod_digest.c
src/support htdigest.c
Log:
`Personalise' Apache's use of MD5 names to avoid collisions,
by prefixing them with `ap_'.
Reviewed by: Mark Cox, Randy Terbush
Revision ChangesPath
1.118 +3 -3 apachen/src/main/http_core.c
Index: http_core.c
===
RCS file: /export/home/cvs/apachen/src/main/http_core.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- http_core.c 1997/09/01 01:47:00 1.117
+++ http_core.c 1997/09/02 16:12:08 1.118
@@ -1656,7 +1656,7 @@
#endif
if (d->content_md5 & 1) {
- table_set (r->headers_out, "Content-MD5", md5digest(r->pool, f));
+ table_set (r->headers_out, "Content-MD5", ap_md5digest(r->pool, f));
}
rangestatus = set_byterange(r);
@@ -1685,12 +1685,12 @@
unblock_alarms();
if (d->content_md5 & 1) {
- MD5_CTX context;
+ AP_MD5_CTX context;
MD5Init(&context);
MD5Update(&context, (void *)mm, r->finfo.st_size);
table_set (r->headers_out, "Content-MD5",
- md5contextTo64(r->pool, &context));
+ ap_md5contextTo64(r->pool, &context));
}
rangestatus = set_byterange(r);
1.6 +4 -4 apachen/src/main/md5.h
Index: md5.h
===
RCS file: /export/home/cvs/apachen/src/main/md5.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- md5.h 1997/07/19 20:16:13 1.5
+++ md5.h 1997/09/02 16:12:09 1.6
@@ -91,9 +91,9 @@
UINT4 state[4]; /* state (ABCD) */
UINT4 count[2];/* number of bits, modulo 2^64 (lsb first) */
unsigned char buffer[64]; /* input buffer */
-} MD5_CTX;
+} AP_MD5_CTX;
-API_EXPORT(void) MD5Init(MD5_CTX *context);
-API_EXPORT(void) MD5Update(MD5_CTX *context, const unsigned char *input,
+API_EXPORT(void) MD5Init(AP_MD5_CTX *context);
+API_EXPORT(void) MD5Update(AP_MD5_CTX *context, const unsigned char *input,
unsigned int inputLen);
-API_EXPORT(void) MD5Final(unsigned char digest[16], MD5_CTX *context);
+API_EXPORT(void) MD5Final(unsigned char digest[16], AP_MD5_CTX *context);
1.7 +4 -3 apachen/src/main/md5c.c
Index: md5c.c
===
RCS file: /export/home/cvs/apachen/src/main/md5c.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- md5c.c1997/07/21 05:53:47 1.6
+++ md5c.c1997/09/02 16:12:09 1.7
@@ -158,7 +158,7 @@
/* MD5 initialization. Begins an MD5 operation, writing a new context.
*/
-API_EXPORT(void) MD5Init(MD5_CTX *context)
+API_EXPORT(void) MD5Init(AP_MD5_CTX *context)
{
context->count[0] = context->count[1] = 0;
/* Load magic initialization constants. */
@@ -172,7 +172,8 @@
operation, processing another message block, and updating the
context.
*/
-API_EXPORT(void) MD5Update(MD5_CTX *context, const unsigned char *input,
unsigned int inputLen)
+API_EXPORT(void) MD5Update(AP_MD5_CTX *context, const unsigned char *input,
+ unsigned int inputLen)
{
unsigned int i, idx, partLen;
@@ -207,7 +208,7 @@
/* MD5 finalization. Ends an MD5 message-digest operation, writing the
the message digest and zeroizing the context.
*/
-API_EXPORT(void) MD5Final(unsigned char digest[16], MD5_CTX *context)
+API_EXPORT(void) MD5Final(unsigned char digest[16], AP_MD5_CTX *context)
{
unsigned char bits[8];
unsigned int idx, padLen;
1.9 +6 -6 apachen/src/main/util_md5.c
Index: util_md5.c
===
RCS file: /export/home/cvs/apachen/src/main/util_md5.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- util_md5.c1997/07/15 21:39:59 1.8
+++ util_md5.c1997/09/02 16:12:09 1.9
@@ -82,9 +82,9 @@
#include "httpd.h"
#include "util_md5.h"
-API_EXPORT(char *) md5 (pool *p, unsigned char *string)
+API_EXPORT(char *) ap_md5 (pool *p, unsigned char *string)
{
-MD5_CTX my_md5;
+AP_MD5_CTX my_md5;
unsigned char hash[16];
char *r, result[33];
int i;
@@ -149,7 +149,7 @@
static char basis_64[] =
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-API_EXPORT(char *) md5contextTo64(pool *a, MD5_CTX *context)
+API_EX
cvs commit: apachen/src/modules/proxy proxy_util.c
coar97/09/02 03:39:36
Modified:src/modules/proxy proxy_util.c
Log:
Remove a bit of unused code (probably optmised away by reasonable
compilers, but why needlessly confuse humans?).
Submitted by: Martin Kraemer
Reviewed by: Dean Gaudet, Ken Coar
Revision ChangesPath
1.26 +1 -2 apachen/src/modules/proxy/proxy_util.c
Index: proxy_util.c
===
RCS file: /export/home/cvs/apachen/src/modules/proxy/proxy_util.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- proxy_util.c 1997/09/01 03:07:28 1.25
+++ proxy_util.c 1997/09/02 10:39:34 1.26
@@ -110,7 +110,7 @@
char *
proxy_canonenc(pool *p, const char *x, int len, enum enctype t, int isenc)
{
-int i, j, ispath, ch;
+int i, j, ch;
char *y;
const char *allowed; /* characters which should not be encoded */
const char *reserved; /* characters which much not be en/de-coded */
@@ -133,7 +133,6 @@
else reserved = "";
y = palloc(p, 3*len+1);
-ispath = (t == enc_path);
for (i=0, j=0; i < len; i++, j++)
{
