cvs commit: apache-2.0/src acinclude.m4
rbb 00/02/17 18:12:16 Modified:src acinclude.m4 Log: These changes didn't get into the patch for dynamic modules. With this, dynamic modules should work. :-) Revision ChangesPath 1.20 +2 -0 apache-2.0/src/acinclude.m4 Index: acinclude.m4 === RCS file: /home/cvs/apache-2.0/src/acinclude.m4,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- acinclude.m4 2000/01/21 01:25:20 1.19 +++ acinclude.m4 2000/02/18 02:12:16 1.20 @@ -50,6 +50,7 @@ APACHE_SUBST(CC) APACHE_SUBST(CFLAGS) APACHE_SUBST(CPPFLAGS) + APACHE_SUBST(LTFLAGS) APACHE_SUBST(LDFLAGS) APACHE_SUBST(DEFS) APACHE_SUBST(LIBTOOL) @@ -250,6 +251,7 @@ case $enable_$1 in shared*) enable_$1=`echo $ac_n $enable_$1$ac_c|sed 's/shared,*//'` + sharedobjs=yes shared=yes;; *) MODLIST=$MODLIST ifelse($4,,$1,$4)
cvs commit: apache-2.0/src/modules/standard mod_rewrite.c
stoddard00/02/17 18:53:12
Modified:src/lib/apr/file_io/win32 fileio.h readwrite.c
src/lib/apr/include apr_file_io.h
src/main iol_file.c
src/modules/standard mod_rewrite.c
Log:
Have seperate variable on ap_writev to set the number of iovecs passed in
and pass back the number of bytes written. Use ap_iovec_t on the call rather
than struct iovec (I may reverse this tomorrow :-). Whatever we do, the
network_io
and file_io calls need to use iovecs consistently, which isn't the case now.
Revision ChangesPath
1.6 +1 -1 apache-2.0/src/lib/apr/file_io/win32/fileio.h
Index: fileio.h
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/fileio.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fileio.h 2000/01/11 23:21:29 1.5
+++ fileio.h 2000/02/18 02:53:11 1.6
@@ -122,7 +122,7 @@
struct iovec_t {
ap_context_t *cntxt;
-struct iovec *iov;
+struct iovec *theiov;
};
ap_status_t file_cleanup(void *);
1.11 +7 -6 apache-2.0/src/lib/apr/file_io/win32/readwrite.c
Index: readwrite.c
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/readwrite.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- readwrite.c 2000/02/01 00:40:40 1.10
+++ readwrite.c 2000/02/18 02:53:11 1.11
@@ -117,19 +117,20 @@
/*
* Too bad WriteFileGather() is not supported on 9598 (or NT prior to SP2)
*/
-ap_status_t ap_writev(struct file_t *thefile, const struct iovec_t *vec,
ap_ssize_t *iocnt)
+ap_status_t ap_writev(struct file_t *thefile, const ap_iovec_t *vec,
ap_size_t nvec,
+ ap_ssize_t *nbytes)
{
int i;
DWORD bwrote = 0;
-int numvec = *iocnt;
-*iocnt = 0;
+struct iovec *iov = vec-theiov;
-for (i = 0; i numvec; i++) {
+*nbytes = 0;
+for (i = 0; i nvec; i++) {
if (!WriteFile(thefile-filehand,
- vec-iov[i].iov_base, vec-iov[i].iov_len, bwrote,
NULL)) {
+ iov[i].iov_base, iov[i].iov_len, bwrote, NULL)) {
return GetLastError();
}
-*iocnt += bwrote;
+*nbytes += bwrote;
}
return APR_SUCCESS;
}
1.29 +1 -1 apache-2.0/src/lib/apr/include/apr_file_io.h
Index: apr_file_io.h
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_file_io.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- apr_file_io.h 2000/01/10 15:35:48 1.28
+++ apr_file_io.h 2000/02/18 02:53:11 1.29
@@ -136,7 +136,7 @@
ap_status_t ap_read(ap_file_t *, void *, ap_ssize_t *);
ap_status_t ap_write(ap_file_t *, void *, ap_ssize_t *);
-ap_status_t ap_writev(ap_file_t *, const ap_iovec_t *, ap_ssize_t *);
+ap_status_t ap_writev(ap_file_t *, const ap_iovec_t *vec, ap_size_t nvec,
ap_ssize_t *nbytes);
ap_status_t ap_putc(char, ap_file_t *);
ap_status_t ap_getc(char *, ap_file_t *);
ap_status_t ap_ungetc(char, ap_file_t *);
1.8 +15 -85apache-2.0/src/main/iol_file.c
Index: iol_file.c
===
RCS file: /home/cvs/apache-2.0/src/main/iol_file.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- iol_file.c2000/01/28 18:01:26 1.7
+++ iol_file.c2000/02/18 02:53:12 1.8
@@ -60,92 +60,9 @@
#include ap_iol.h
#include malloc.h
-#if 0
-/* This is the non-APRed iol_file */
-#include sys/uio.h
typedef struct {
ap_iol iol;
-int fd;
-} iol_file;
-
-#define method(syscall, args)\
-static ap_status_t file_##syscall args \
-{ \
- iol_file *iol = (iol_file *)viol; \
- int rv; \
- /* try writing, ignoring EINTR, the upper layer has to handle \
- partial read/writes anyhow, so we can return early */ \
- do { \
- rv = syscall(iol-fd, arg1, arg2); \
- } while (rv == -1 errno == EINTR); \
-if (rv = 0) { \
-*nbytes = rv;
-return APR_SUCCESS; \
-} \
-*nbytes = 0;
- return errno; \
-}
-
-method(write, (ap_iol *viol, const char *arg1, ap_size_t arg2,
- ap_ssize_t *nbytes))
-method(writev, (ap_iol *viol, const struct iovec *arg1, int arg2, ap_ssize_t
*nbytes))
-method(read, (ap_iol *viol, char *arg1, ap_size_t arg2, ap_ssize_t *nbytes))
-
-
-static ap_status_t file_close(ap_iol *viol)
-{
-iol_file *iol = (iol_file *)viol;
-int rv;
-int saved_errno;
-
-
cvs commit: apache-2.0/src/main http_log.c
stoddard00/02/18 06:18:11
Modified:src/main http_log.c
Log:
Ahh, found ap_flush()!
Revision ChangesPath
1.31 +1 -8 apache-2.0/src/main/http_log.c
Index: http_log.c
===
RCS file: /home/cvs/apache-2.0/src/main/http_log.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- http_log.c2000/02/17 19:03:52 1.30
+++ http_log.c2000/02/18 14:18:11 1.31
@@ -265,14 +265,7 @@
replace_stderr = 1;
if (s_main-error_log) {
/* replace stderr with this new log */
-#ifdef WIN32
-/* ToDo: Create ap_fflush() */
-HANDLE hFile;
-ap_get_os_file(hFile, s_main-error_log);
-FlushFileBuffers(hFile);
-#else
-fflush(stderr);
-#endif
+ap_flush(s_main-error_log);
ap_open_stderr(errfile, p);
if ((rc = ap_dupfile(errfile, s_main-error_log)) != APR_SUCCESS) {
ap_log_error(APLOG_MARK, APLOG_CRIT, rc, s_main,
cvs commit: apache-1.3/src/support htpasswd.1
coar00/02/18 08:12:42 Modified:src/support htpasswd.1 Log: Fix some typos and make the portability of the MD5 algorithm a little more clear. Revision ChangesPath 1.13 +17 -5 apache-1.3/src/support/htpasswd.1 Index: htpasswd.1 === RCS file: /home/cvs/apache-1.3/src/support/htpasswd.1,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- htpasswd.11999/08/02 10:13:48 1.12 +++ htpasswd.12000/02/18 16:12:41 1.13 @@ -1,5 +1,5 @@ -.TH htpasswd 1 February 1997 -.\ Copyright (c) 1997-1999 The Apache Group. All rights reserved. +.TH htpasswd 1 February 2000 +.\ Copyright (c) 1997-2000 The Apache Group. All rights reserved. .\ .\ Redistribution and use in source and binary forms, with or without .\ modification, are permitted provided that the following conditions @@ -61,6 +61,12 @@ ] [ .B \-m +| +.B \-d +| +.B \-s +| +.B \-p ] .I passwdfile .I username @@ -72,9 +78,12 @@ ] [ .B \-m +| .B \-d -.B \-p +| .B \-s +| +.B \-p ] .I passwdfile .I username @@ -123,7 +132,10 @@ Create the \fIpasswdfile\fP. If \fIpasswdfile\fP already exists, it is rewritten and truncated. .IP \-m -Use MD5 encryption for passwords. On Windows and TPF, this is the default. +Use Apache's modified MD5 algorithm for passwords. Passwords encrypted +with this algorithm are transportable to any platform (Windows, Unix, +BeOS, et cetera) running Apache 1.3.9 or later. On Windows and TPF, +this flag is the default. .IP \-d Use crypt() encryption for passwords. The default on all platforms but Windows and TPF. Though possibly supported by @@ -137,7 +149,7 @@ .IP \-p Use plaintext passwords. Though .B htpasswd -will support creation on all platofrms, the +will support creation on all platforms, the .B httpd deamon will only accept plain text passwords on Windows and TPF. .IP \fB\fIpasswdfile\fP
cvs commit: apache-2.0/src/main buff.c
stoddard00/02/18 10:05:19
Modified:src/include ap_iol.h
src/lib/apr aprlib.def
src/lib/apr/file_io/win32 readwrite.c
src/lib/apr/include apr_file_io.h
src/main buff.c
Log:
Pass ap_iovec_t on writev calls.
Revision ChangesPath
1.10 +1 -1 apache-2.0/src/include/ap_iol.h
Index: ap_iol.h
===
RCS file: /home/cvs/apache-2.0/src/include/ap_iol.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ap_iol.h 2000/01/26 05:56:33 1.9
+++ ap_iol.h 2000/02/18 18:05:15 1.10
@@ -106,7 +106,7 @@
ap_status_t (*close)(ap_iol *fd);
ap_status_t (*write)(ap_iol *fd, const char *buf, ap_size_t len,
ap_ssize_t *nbytes);
-ap_status_t (*writev)(ap_iol *fd, const struct iovec *vec, int nvec,
+ap_status_t (*writev)(ap_iol *fd, const ap_iovec_t *vec, int nvec,
ap_ssize_t *nbytes);
ap_status_t (*read)(ap_iol *fd, char *buf, ap_size_t len,
ap_ssize_t *nbytes);
1.10 +1 -1 apache-2.0/src/lib/apr/aprlib.def
Index: aprlib.def
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/aprlib.def,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- aprlib.def2000/01/26 05:56:36 1.9
+++ aprlib.def2000/02/18 18:05:16 1.10
@@ -20,7 +20,7 @@
;ap_get_filesize @12
;ap_get_fileatime @13
;ap_get_filectime @14
-;ap_get_filemtime @15
+ ap_make_iov @15
ap_dupfile @16
ap_getfileinfo @17
ap_open @18
1.12 +11 -0 apache-2.0/src/lib/apr/file_io/win32/readwrite.c
Index: readwrite.c
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/readwrite.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- readwrite.c 2000/02/18 02:53:11 1.11
+++ readwrite.c 2000/02/18 18:05:17 1.12
@@ -63,6 +63,17 @@
#define GetFilePointer(hfile) SetFilePointer(hfile,0,NULL, FILE_CURRENT)
+ap_status_t ap_make_iov(struct iovec_t **new, const struct iovec *iova,
ap_context_t *cntxt)
+{
+(*new) = ap_palloc(cntxt, sizeof(struct iovec_t));
+if ((*new) == NULL) {
+return APR_ENOMEM;
+}
+(*new)-cntxt = cntxt;
+(*new)-theiov = iova;
+return APR_SUCCESS;
+}
+
ap_status_t ap_read(struct file_t *thefile, void *buf, ap_ssize_t *nbytes)
{
DWORD bread;
1.30 +1 -1 apache-2.0/src/lib/apr/include/apr_file_io.h
Index: apr_file_io.h
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_file_io.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- apr_file_io.h 2000/02/18 02:53:11 1.29
+++ apr_file_io.h 2000/02/18 18:05:18 1.30
@@ -146,7 +146,7 @@
API_EXPORT(int) ap_fprintf(ap_file_t *fptr, const char *format, ...)
__attribute__((format(printf,2,3)));
-ap_status_t ap_make_iov(ap_iovec_t **, struct iovec *, ap_context_t *);
+ap_status_t ap_make_iov(ap_iovec_t **, const struct iovec *, ap_context_t *);
ap_status_t ap_dupfile(ap_file_t **, ap_file_t *);
ap_status_t ap_getfileinfo(ap_finfo_t *finfo, ap_file_t *thefile);
ap_status_t ap_stat(ap_finfo_t *finfo, const char *fname, ap_context_t
*cont);
1.30 +3 -2 apache-2.0/src/main/buff.c
Index: buff.c
===
RCS file: /home/cvs/apache-2.0/src/main/buff.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- buff.c2000/01/28 18:00:58 1.29
+++ buff.c2000/02/18 18:05:19 1.30
@@ -555,8 +555,9 @@
int nvec, ap_ssize_t *bytes_written)
{
ap_status_t rv;
-
-rv = iol_writev(fb-iol, vec, nvec, bytes_written);
+ap_iovec_t *iov;
+ap_make_iov(iov, vec, fb-pool);
+rv = iol_writev(fb-iol, iov, nvec, bytes_written);
if (rv != APR_SUCCESS) {
fb-saved_errno = rv;
if (rv != APR_EAGAIN) {
cvs commit: apache-1.3/src/main http_core.c
jim 00/02/18 12:41:47
Modified:src/main http_core.c
Log:
Stupid logic error... should fix PR#5766
Revision ChangesPath
1.281 +4 -4 apache-1.3/src/main/http_core.c
Index: http_core.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -r1.280 -r1.281
--- http_core.c 2000/02/05 00:33:21 1.280
+++ http_core.c 2000/02/18 20:41:47 1.281
@@ -1054,14 +1054,14 @@
return err;
}
if (!strcasecmp(arg, Off)) {
- d-add_default_charset = 0;
+ d-add_default_charset = ADD_DEFAULT_CHARSET_OFF;
}
else if (!strcasecmp(arg, On)) {
- d-add_default_charset = 1;
+ d-add_default_charset = ADD_DEFAULT_CHARSET_ON;
d-add_default_charset_name = DEFAULT_ADD_DEFAULT_CHARSET_NAME;
}
else {
- d-add_default_charset = 1;
+ d-add_default_charset = ADD_DEFAULT_CHARSET_ON;
d-add_default_charset_name = arg;
}
return NULL;
@@ -2819,7 +2819,7 @@
Directory to plop gmon.out files },
#endif
{ AddDefaultCharset, set_add_default_charset, NULL, OR_FILEINFO,
- TAKE1, The name of the default charset to add to any Content-Type without
one or 'None' to disable },
+ TAKE1, The name of the default charset to add to any Content-Type without
one or 'Off' to disable },
/* Old resource config file commands */
cvs commit: apache-site/contributors index.html
manoj 00/02/18 14:52:26 Modified:contributors index.html Log: New job. Revision ChangesPath 1.87 +3 -3 apache-site/contributors/index.html Index: index.html === RCS file: /home/cvs/apache-site/contributors/index.html,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- index.html2000/01/20 15:23:33 1.86 +++ index.html2000/02/18 22:52:26 1.87 @@ -372,9 +372,9 @@ STRONGName:/STRONG A NAME=kasichainulaManoj Kasichainula/ABR STRONGEmail:/STRONG A HREF=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/ABR STRONGURL:/STRONG A HREF=http://www.io.com/~manojk/;http://www.io.com/~manojk//ABR -STRONGOrganization:/STRONG IBM CorporationBR -STRONGOccupation:/STRONG Software EngineerBR -STRONGLocation:/STRONG Raleigh, NC, USABR +STRONGOrganization:/STRONG Collab.NetBR +STRONGOccupation:/STRONG Senior Software DeveloperBR +STRONGLocation:/STRONG San Francisco, CA, USABR STRONGOS Expertise:/STRONG Linux, various UnixesBR STRONGContributions:/STRONG Initial pthread hybrid server work, Dexter MPM, 2.0 status API, other 2.0 stuff, arguing with RyanBR
cvs commit: apache-site/contributors index.html
manoj 00/02/18 14:57:43 Modified:contributors index.html Log: hehe. Brian's new job. Revision ChangesPath 1.88 +2 -2 apache-site/contributors/index.html Index: index.html === RCS file: /home/cvs/apache-site/contributors/index.html,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- index.html2000/02/18 22:52:26 1.87 +++ index.html2000/02/18 22:57:43 1.88 @@ -178,8 +178,8 @@ STRONGName:/STRONG A NAME=behlendorfBrian Behlendorf/ABR STRONGEmail:/STRONG A HREF=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/ABR STRONGURL:/STRONG A HREF=http://www.behlendorf.com/;http://www.behlendorf.com/ABR -STRONGOrganization:/STRONG A HREF=http://www.oreilly.com;O'Reilly and Associates/ABR -STRONGOccupation:/STRONG CTO, New VenturesBR +STRONGOrganization:/STRONG A HREF=http://www.collab.net/;Collab.Net/ABR +STRONGOccupation:/STRONG CTOBR STRONGLocation:/STRONG San Francisco, CA, USABR STRONGComments:/STRONG Infrastructure, baby!BR STRONGOS Expertise:/STRONG FreeBSDBR
