cvs commit: apache-2.0/src/main rfc1413.c
manoj 99/11/30 16:25:20
Modified:src/main rfc1413.c
Log:
Remove a vestige of the old timeout system. ident lookups need timeouts,
though.
Revision ChangesPath
1.9 +4 -11 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.8
retrieving revision 1.9
diff -u -d -u -r1.8 -r1.9
--- rfc1413.c 1999/10/24 19:24:00 1.8
+++ rfc1413.c 1999/12/01 00:25:18 1.9
@@ -55,6 +55,7 @@
*
*/
+/* TODO - put timeouts back in */
/*
* rfc1413() speaks a common subset of the RFC 1413, AUTH, TAP and IDENT
* protocols. The code queries an RFC 1413 etc. compatible daemon on a remote
@@ -77,7 +78,7 @@
/* Rewritten by David Robinson */
-#include httpd.h /* for server_rec, conn_rec, ap_longjmp, etc. */
+#include httpd.h /* for server_rec, conn_rec, etc. */
#include http_log.h/* for aplog_error */
#include rfc1413.h
#include http_main.h /* set_callback_and_alarm */
@@ -99,8 +100,6 @@
int ap_rfc1413_timeout = RFC1413_TIMEOUT;/* Global so it can be changed
*/
-static JMP_BUF timebuf;
-
/* bind_connect - bind both ends of a socket */
/* Ambarish fix this. Very broken */
static int get_rfc1413(ap_socket_t *sock, const char *local_ip,
@@ -230,14 +229,8 @@
conn-remote_logname = result;
}
-/*
- * Set up a timer so we won't get stuck while waiting for the server.
- */
-if (ap_setjmp(timebuf) == 0) {
-
- if (get_rfc1413(sock, conn-local_ip, conn-remote_ip, user, srv) = 0)
- result = user;
-}
+if (get_rfc1413(sock, conn-local_ip, conn-remote_ip, user, srv) = 0)
+result = user;
ap_close_socket(sock);
conn-remote_logname = result;
cvs commit: apache-2.0/src/modules/mpm/spmt_os2 spmt_os2.c
manoj 99/11/30 16:45:08
Modified:src/modules/mpm/dexter dexter.c
src/modules/mpm/mpmt_beos mpmt_beos.c
src/modules/mpm/mpmt_pthread mpmt_pthread.c
src/modules/mpm/prefork prefork.c
src/modules/mpm/spmt_os2 spmt_os2.c
Log:
Get rid of ap_check_signals() in all but the prefork MPM, and #define it
away there. It's a TPF-specific piece that will likely go into a TPF
MPM.
Revision ChangesPath
1.60 +0 -2 apache-2.0/src/modules/mpm/dexter/dexter.c
Index: dexter.c
===
RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/dexter.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -u -r1.59 -r1.60
--- dexter.c 1999/11/29 23:32:41 1.59
+++ dexter.c 1999/12/01 00:44:53 1.60
@@ -1182,8 +1182,6 @@
/* initialize the free_list */
free_length = 0;
-ap_check_signals();
-
for (i = 0; i num_daemons; ++i) {
if (child_table[i].status == SERVER_DEAD) {
if (free_length spawn_rate) {
1.13 +0 -2 apache-2.0/src/modules/mpm/mpmt_beos/mpmt_beos.c
Index: mpmt_beos.c
===
RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_beos/mpmt_beos.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -u -r1.12 -r1.13
--- mpmt_beos.c 1999/11/29 23:32:50 1.12
+++ mpmt_beos.c 1999/12/01 00:44:55 1.13
@@ -948,8 +948,6 @@
/* initialize the free_list */
free_length = 0;
-ap_check_signals();
-
for (i = 0; i ap_daemons_limit; ++i) {
if (child_table[i].status == SERVER_DEAD) {
if (free_length spawn_rate) {
1.50 +0 -2 apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c
Index: mpmt_pthread.c
===
RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -u -r1.49 -r1.50
--- mpmt_pthread.c1999/11/29 23:32:53 1.49
+++ mpmt_pthread.c1999/12/01 00:44:56 1.50
@@ -1152,8 +1152,6 @@
last_non_dead = -1;
total_non_dead = 0;
-ap_check_signals();
-
ap_sync_scoreboard_image();
for (i = 0; i ap_daemons_limit; ++i) {
/* Initialization to satisfy the compiler. It doesn't know
1.57 +4 -0 apache-2.0/src/modules/mpm/prefork/prefork.c
Index: prefork.c
===
RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/prefork.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -u -r1.56 -r1.57
--- prefork.c 1999/11/30 03:52:46 1.56
+++ prefork.c 1999/12/01 00:45:00 1.57
@@ -216,6 +216,10 @@
#define chdir_for_gprof()
#endif
+/* XXX - I don't know if TPF will ever use this module or not, so leave
+ * the ap_check_signals calls in but disable them - manoj */
+#define ap_check_signals()
+
/* a clean exit from a child with proper cleanup */
static void clean_child_exit(int code) __attribute__ ((noreturn));
static void clean_child_exit(int code)
1.27 +0 -2 apache-2.0/src/modules/mpm/spmt_os2/spmt_os2.c
Index: spmt_os2.c
===
RCS file: /home/cvs/apache-2.0/src/modules/mpm/spmt_os2/spmt_os2.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -u -r1.26 -r1.27
--- spmt_os2.c1999/11/30 03:52:51 1.26
+++ spmt_os2.c1999/12/01 00:45:02 1.27
@@ -378,8 +378,6 @@
if (child_num 0)
return -1;
-ap_check_signals();
-
ss = ap_scoreboard_image-servers[child_num];
old_status = ss-status;
ss-status = status;
cvs commit: apache-2.0/src/regex config.h.stub config.m4
manoj 99/11/30 17:16:37
Modified:src acconfig.h.in acinclude.m4 configure.in
src/include ap_config.h http_log.h
src/main config.h.stub config.m4 http_log.c http_main.c
src/os/unix config.m4
src/regex config.m4
Added: src/include ap_ac_config.h
src/regex config.h.stub
Log:
Eliminate ap_config.h's checks when using autoconf. Now, ap_ac_config.h
is used instead, and autoconf's configure script will check for
everything else.
Revision ChangesPath
1.3 +6 -0 apache-2.0/src/acconfig.h.in
Index: acconfig.h.in
===
RCS file: /home/cvs/apache-2.0/src/acconfig.h.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -u -r1.2 -r1.3
--- acconfig.h.in 1999/11/30 07:54:07 1.2
+++ acconfig.h.in 1999/12/01 01:16:00 1.3
@@ -1,2 +1,8 @@
/* symbols defined by autoconf's configure script that aren't taken care
* of by autoheader */
+
+/* Define if EAGAIN is present on this system */
+#undef HAVE_EAGAIN
+
+/* Define if arguments to select() aren't what we expect */
+#undef SELECT_NEEDS_CAST
1.2 +33 -0 apache-2.0/src/acinclude.m4
Index: acinclude.m4
===
RCS file: /home/cvs/apache-2.0/src/acinclude.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -u -r1.1 -r1.2
--- acinclude.m4 1999/11/29 23:44:45 1.1
+++ acinclude.m4 1999/12/01 01:16:01 1.2
@@ -44,6 +44,39 @@
])
dnl
+dnl AC_CHECK_DEFINE(macro, headerfile)
+dnl
+dnl checks for the macro in the header file
+dnl
+AC_DEFUN(AC_CHECK_DEFINE,[
+ AC_CACHE_CHECK(for $1 in $2, ac_cv_define_$1,
+ AC_EGREP_CPP([YES_IS_DEFINED], [
+#include $2
+#ifdef $1
+YES_IS_DEFINED
+#endif
+ ], ac_cv_define_$1=yes, ac_cv_define_$1=no))
+ if test $ac_cv_define_$1 = yes ; then
+ AC_DEFINE(HAVE_$1)
+ fi
+])
+
+dnl
+dnl AC_TYPE_RLIM_T
+dnl
+dnl If rlim_t is not defined, define it to int
+dnl
+AC_DEFUN(AC_TYPE_RLIM_T, [
+ AC_CACHE_CHECK([for rlim_t], ac_cv_type_rlim_t, [
+AC_TRY_COMPILE([#include sys/resource.h], [rlim_t spoon;], [
+ ac_cv_type_rlim_t=yes
+],[ac_cv_type_rlim_t=no
+ AC_DEFINE(rlim_t, int)
+])
+ ])
+])
+
+dnl
dnl APACHE_ONCE(namespace, variable, code)
dnl
dnl execute code, if variable is not set in namespace
1.5 +33 -1 apache-2.0/src/configure.in
Index: configure.in
===
RCS file: /home/cvs/apache-2.0/src/configure.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -u -r1.4 -r1.5
--- configure.in 1999/11/30 03:52:36 1.4
+++ configure.in 1999/12/01 01:16:02 1.5
@@ -12,7 +12,8 @@
APACHE_VERSION=$VERSION
AC_SUBST(APACHE_VERSION)
-dnl XXX - doesn't actually work, because of the APACHE_OUTPUT_FILES error
+dnl XXX - make will sometimes die as annoyingly as automake with this option
+dnl just remake and continue
AM_MAINTAINER_MODE
dnl We want this one before the checks, so the checks can modify CFLAGS
@@ -43,14 +44,30 @@
dnl them at the base of the tree. If some are specific to a single
dnl directory, they should be moved (Comment #Spoon)
+AC_HEADER_STDC
AC_CHECK_HEADERS( \
unistd.h \
+sys/stat.h \
sys/time.h \
+sys/types.h \
+sys/socket.h \
+netinet/in.h \
+arpa/inet.h \
+netdb.h \
+pwd.h \
+grp.h \
)
+AC_HEADER_SYS_WAIT
+
+dnl ## Check for C preprocessor symbols
+
+AC_CHECK_DEFINE(EAGAIN, errno.h)
dnl ## Check for typedefs, structures, and compiler characteristics.
+AC_C_CONST
AC_C_INLINE
+AC_TYPE_PID_T
dnl ## Check for library functions
@@ -67,7 +84,22 @@
difftime \
gettimeofday \
memmove \
+bzero \
)
+
+AC_CHECK_FUNCS(inet_addr inet_network, break, [
+ AC_MSG_ERROR(inet_addr function not found)
+])
+
+AC_FUNC_SELECT_ARGTYPES
+
+dnl Check if we'll actually need to cast select args all the time
+if test $ac_cv_func_select_arg1 != int \
+-o $ac_cv_func_select_arg234 != fd_set * \
+-o $ac_cv_func_select_arg5 != struct timeval * ; then
+
+AC_DEFINE(SELECT_NEEDS_CAST)
+fi
AM_PROG_LIBTOOL
1.12 +10 -0 apache-2.0/src/include/ap_config.h
Index: ap_config.h
===
RCS file: /home/cvs/apache-2.0/src/include/ap_config.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -u -r1.11 -r1.12
--- ap_config.h 1999/11/30 03:52:39 1.11
+++ ap_config.h 1999/12/01 01:16:05 1.12
@@ -62,6 +62,11 @@
extern C {
#endif
+#ifdef HAVE_CONFIG_H
cvs commit: apache-2.0/src acinclude.m4
manoj 99/11/30 17:21:38 Modified:src acinclude.m4 Log: Fix what I think is a bug where rlim_t won't be #defined on systems that need it if the autoconf check for it was cached. Revision ChangesPath 1.3 +3 -1 apache-2.0/src/acinclude.m4 Index: acinclude.m4 === RCS file: /home/cvs/apache-2.0/src/acinclude.m4,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -u -r1.2 -r1.3 --- acinclude.m4 1999/12/01 01:16:01 1.2 +++ acinclude.m4 1999/12/01 01:21:38 1.3 @@ -71,9 +71,11 @@ AC_TRY_COMPILE([#include sys/resource.h], [rlim_t spoon;], [ ac_cv_type_rlim_t=yes ],[ac_cv_type_rlim_t=no - AC_DEFINE(rlim_t, int) ]) ]) + if test $ac_ac_type_rlim_t = no ; then + AC_DEFINE(rlim_t, int) + fi ]) dnl
cvs commit: apache-2.0/src configure.in
manoj 99/11/30 20:25:05 Modified:src configure.in Log: Place ap_config_auto.h in src/include. It didn't seem to work earlier, but it does now. *shrug* Revision ChangesPath 1.6 +1 -1 apache-2.0/src/configure.in Index: configure.in === RCS file: /home/cvs/apache-2.0/src/configure.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -u -r1.5 -r1.6 --- configure.in 1999/12/01 01:16:02 1.5 +++ configure.in 1999/12/01 04:25:01 1.6 @@ -5,7 +5,7 @@ AM_INIT_AUTOMAKE(apache, 2.0-dev) dnl This would be in src/include, but I think I've found an autoheader bug -AM_CONFIG_HEADER(ap_config_auto.h) +AM_CONFIG_HEADER(include/ap_config_auto.h) dnl ## This is the central place where Apache's version should be kept.
cvs commit: apache-2.0/src configure.in
manoj 99/11/30 20:57:15 Modified:src configure.in Log: Fix a couple of comments Revision ChangesPath 1.7 +3 -4 apache-2.0/src/configure.in Index: configure.in === RCS file: /home/cvs/apache-2.0/src/configure.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -u -r1.6 -r1.7 --- configure.in 1999/12/01 04:25:01 1.6 +++ configure.in 1999/12/01 04:57:07 1.7 @@ -2,17 +2,16 @@ AC_PREREQ(2.13) AC_INIT(main/http_main.c) + +dnl ## This is the central place where Apache's version should be kept. AM_INIT_AUTOMAKE(apache, 2.0-dev) -dnl This would be in src/include, but I think I've found an autoheader bug AM_CONFIG_HEADER(include/ap_config_auto.h) -dnl ## This is the central place where Apache's version should be kept. - APACHE_VERSION=$VERSION AC_SUBST(APACHE_VERSION) -dnl XXX - make will sometimes die as annoyingly as automake with this option +dnl XXX - make will sometimes die as annoyingly as automake with this option. dnl just remake and continue AM_MAINTAINER_MODE
cvs commit: apache-2.0/src/include ap_ac_config.h
manoj 99/11/30 21:09:19 Modified:src/include ap_ac_config.h Log: Autoconf's configure script will tell us which types select is looking for; we might as well take advantage of it. Revision ChangesPath 1.2 +4 -3 apache-2.0/src/include/ap_ac_config.h Index: ap_ac_config.h === RCS file: /home/cvs/apache-2.0/src/include/ap_ac_config.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -u -r1.1 -r1.2 --- ap_ac_config.h1999/12/01 01:16:04 1.1 +++ ap_ac_config.h1999/12/01 05:09:17 1.2 @@ -149,10 +149,11 @@ /* XXX - This probably doesn't handle OS/2 */ #ifdef SELECT_NEEDS_CAST #define ap_select(_a, _b, _c, _d, _e) \ -select((_a), (int *)(_b), (int *)(_c), (int *)(_d), (_e)) +select((SELECT_TYPE_ARG1)(_a), (SELECT_TYPE_ARG234)(_b), \ + (SELECT_TYPE_ARG234)(_c), (SELECT_TYPE_ARG234)(_d), \ + (SELECT_TYPE_ARG5)(_e)) #else -#define ap_select(_a, _b, _c, _d, _e) \ - select(_a, _b, _c, _d, _e) +#define ap_select(_a, _b, _c, _d, _e) select(_a, _b, _c, _d, _e) #endif /* So that we can use inline on some critical functions, and use
cvs commit: apache-site index.html
coar99/12/01 07:32:21 Modified:.index.html Log: Add the ApacheCon 2000 banner-advert. Revision ChangesPath 1.8 +9 -0 apache-site/index.html Index: index.html === RCS file: /home/cvs/apache-site/index.html,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- index.html1999/11/09 09:50:48 1.7 +++ index.html1999/12/01 15:32:20 1.8 @@ -17,7 +17,16 @@ pba href=http://www.apache.org/dyn/closer.cgi;Mirroredbr Worldwide/b/p /td/tr +tr +td colspan=2 align=center + a href=http://ApacheCon.Com/; + img src=http://ApacheCon.Com/images/banners/banner2.gif; + alt=ApacheCon 2000 width=468 height=60 border=0/a + pnbsp; /p +/td +/tr /table + table width=100% border=0 trtd width=160 valign=top align=center
cvs commit: apache-2.0/src/lib/apr/network_io/unix networkio.h poll.c
rbb 99/12/01 10:39:45 Modified:src/lib/apr acconfig.h configure.in src/lib/apr/file_io/unix fileio.h readwrite.c src/lib/apr/include apr.h.in apr_errno.h apr_file_io.h apr_fnmatch.h apr_general.h apr_lib.h apr_md5.h apr_network_io.h apr_pools.h apr_portable.h apr_thread_proc.h src/lib/apr/lib apr_cpystrn.c apr_getpass.c apr_pools.c apr_signal.c apr_snprintf.c src/lib/apr/locks/unix locks.c src/lib/apr/network_io/unix networkio.h poll.c Log: The next step in removing the APR HAVE_*_H leak. This removes all of those checks from the public include files, and removes all unnecessary #include of system headers from public APR headers. The final step will add back in the checks once I can protect the namespace. Revision ChangesPath 1.14 +0 -3 apache-2.0/src/lib/apr/acconfig.h Index: acconfig.h === RCS file: /home/cvs/apache-2.0/src/lib/apr/acconfig.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- acconfig.h1999/11/17 18:09:55 1.13 +++ acconfig.h1999/12/01 18:38:55 1.14 @@ -48,9 +48,6 @@ #undef APR_HAS_THREADS @BOTTOM@ -#define API_EXPORT(type) type -#define API_EXPORT_NONSTD(type) type -#define API_VAR_IMPORT extern /* Make sure we have ssize_t defined to be somethine */ #undef ssize_t 1.29 +38 -5 apache-2.0/src/lib/apr/configure.in Index: configure.in === RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- configure.in 1999/11/30 18:45:50 1.28 +++ configure.in 1999/12/01 18:39:02 1.29 @@ -79,6 +79,26 @@ AC_SUBST(int_value) AC_SUBST(long_value) +if test $ac_cv_type_off_t = yes; then +off_t_value=off_t +else +off_t_value=ap_int32_t +fi +if test $ac_cv_type_size_t = yes; then +size_t_value=size_t +else +size_t_value=ap_int32_t +fi +if test $ac_cv_type_ssize_t = yes; then +ssize_t_value=ssize_t +else +ssize_t_value=ap_int32_t +fi + +AC_SUBST(off_t_value) +AC_SUBST(size_t_value) +AC_SUBST(ssize_t_value) + AC_CHECK_SIZEOF_EXTENDED([#include sys/types.h], ssize_t, 8) # Use /bin/sh if it exists, otherwise go looking for sh in the path @@ -216,6 +236,14 @@ AC_FUNC_MMAP AC_FUNC_SETPGRP +if test $ac_cv_func_mmap_fixed_mapped = yes; then +mmap=#define APR_HAS_MMAP 1 +AC_SUBST(mmap) +else +mmap=#define APR_HAS_MMAP 0 +AC_SUBST(mmap) +fi + AC_MSG_CHECKING(looking for union semun in sys/sem.h) AC_TRY_COMPILE([ #include sys/types.h @@ -243,13 +271,16 @@ [ --enable-threads Enable threading support in APR.], [ if test $enableval = no; then -AC_DEFINE(APR_HAS_THREADS, 0) +threads=#define APR_HAS_THREADS 0 +AC_SUBST(threads) AC_MSG_RESULT(no) else if test $enableval = pthread; then AC_CHECK_HEADERS(pthread.h, [ - AC_DEFINE(APR_HAS_THREADS, 1) ], [ - AC_DEFINE(APR_HAS_THREADS, 0) ] ) + threads=#define APR_HAS_THREADS 1 + AC_SUBST(threads) ], [ + threads=#define APR_HAS_THREADS 0 + AC_SUBST(threads) ] ) AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) @@ -258,8 +289,10 @@ ], [ AC_CHECK_HEADERS(pthread.h, [ - AC_DEFINE(APR_HAS_THREADS, 1) ], [ - AC_DEFINE(APR_HAS_THREADS, 0) ] ) + threads=#define APR_HAS_THREADS 1 + AC_SUBST(threads) ], [ + threads=#define APR_HAS_THREADS 0 + AC_SUBST(threads) ] ) ]) 1.5 +1 -0 apache-2.0/src/lib/apr/file_io/unix/fileio.h Index: fileio.h === RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/fileio.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fileio.h 1999/11/10 15:49:53 1.4 +++ fileio.h 1999/12/01 18:39:08 1.5 @@ -62,6 +62,7 @@ #include time.h #include dirent.h #include sys/uio.h +#include stdio.h #include apr_general.h #include apr_file_io.h #include apr_errno.h 1.17 +1 -0 apache-2.0/src/lib/apr/file_io/unix/readwrite.c Index: readwrite.c === RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/readwrite.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- readwrite.c 1999/11/10 15:49:53 1.16 +++ readwrite.c 1999/12/01 18:39:09
cvs commit: apache-1.3/src/main buff.c
martin 99/12/01 12:24:58 Modified:src CHANGES src/main buff.c Log: On BS2000, currently the send() call has slightly better performance than write(), and it doesn't have a maximum transfer size of 16kB. Revision ChangesPath 1.1464+4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1463 retrieving revision 1.1464 diff -u -r1.1463 -r1.1464 --- CHANGES 1999/11/30 15:51:59 1.1463 +++ CHANGES 1999/12/01 20:24:50 1.1464 @@ -1,5 +1,9 @@ Changes with Apache 1.3.10 + *) BS2000: Use send() instead of write() in the core buff routines + for better performance and fewer restrictions (max. transfer size) + [Martin Kraemer] + *) If the compiler sanity check fails, force the verbose output for TestCompile so people can have a clue what the problem is. [Jim Jagielski] 1.91 +11 -0 apache-1.3/src/main/buff.c Index: buff.c === RCS file: /export/home/cvs/apache-1.3/src/main/buff.c,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- buff.c1999/10/22 05:10:06 1.90 +++ buff.c1999/12/01 20:24:56 1.91 @@ -319,6 +319,17 @@ #if defined (B_SFIO) rv = sfwrite(fb-sf_out, buf, nbyte); #else +#ifdef _OSD_POSIX +/* Sorry, but this is a hack: On BS2000, currently the send() call + * has slightly better performance, and it doesn't have a maximum + * transfer size of 16kB per write. Both write() and writev() + * currently have such a limit and therefore don't work + * too well with MMAP files. + */ + if (fb-flags B_SOCKET) + rv = send(fb-fd, buf, nbyte, 0); + else +#endif rv = write(fb-fd, buf, nbyte); #endif
cvs commit: apache-1.3/src/modules/standard mod_autoindex.c
coar99/12/01 12:34:18
Modified:htdocs/manual/mod mod_autoindex.html
src CHANGES
src/modules/standard mod_autoindex.c
Log:
Add a FoldersFirst keyword to the IndexOptions directive, which
causes subdirectories to always appear first in FancyIndexed
listings.
Reviewed by: Ryan Bloom, Martin Kraemer, Jim Jagielski
Revision ChangesPath
1.32 +24 -8 apache-1.3/htdocs/manual/mod/mod_autoindex.html
Index: mod_autoindex.html
===
RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/mod_autoindex.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mod_autoindex.html1999/05/13 18:25:45 1.31
+++ mod_autoindex.html1999/12/01 20:33:48 1.32
@@ -545,7 +545,8 @@
REL=Help
STRONGCompatibility:/STRONG/A '+/-' syntax and merging of multiple
SAMPIndexOptions/SAMP directives is only available with
- Apache 1.3.3 and later
+ Apache 1.3.3 and later; the sampFoldersFirst/samp option is only
+ available with Apache 1.3.10 and later
P
The IndexOptions directive specifies the behavior of the directory indexing.
@@ -564,6 +565,21 @@
is combined with any SAMPIndexOptions/SAMP directive already
specified for the current scope./STRONG
/BLOCKQUOTE
+dta name=indexoptions:foldersfirstFoldersFirst
+ (iApache 1.3.10 and later/i)/a/dt
+dd
+If this option is enabled, subdirectories in a FancyIndexed listing
+will ialways/i appear first, followed by normal files in the
+directory. The listing is basically broken into two components,
+the files and the subdirectories, and each is sorted separately and
+then displayed subdirectories-first. For instance, if the sort order
+is descending by name, and sampFoldersFirst/samp is enabled,
+subdirectory sampZed/samp will be listed before subdirectory
+sampBeta/samp, which will be listed before normal files
+sampGamma/samp and sampAlpha/samp.
+bThis option only has an effect if
+a href=#indexoptions:fancyindexingsampFancyIndexing/samp/a
+is also enabled./b/dd
DTA NAME=indexoptions:iconheightIconHeight[=pixels] (EMApache 1.3
and later/EM)/A
DD
!--%plaintext lt;?INDEX {\tt IconHeight} index optiongt; --
@@ -648,14 +664,14 @@
The default is that no options are enabled. If multiple IndexOptions
could apply to a directory, then the most specific one is taken complete;
the options are not merged. For example:
-BLOCKQUOTECODE
-lt;Directory /web/docsgt; BR
-IndexOptions FancyIndexing BR
-lt;/Directorygt;BR
-lt;Directory /web/docs/specgt; BR
-IndexOptions ScanHTMLTitles BR
+BLOCKQUOTEpre
+lt;Directory /web/docsgt;
+IndexOptions FancyIndexing
lt;/Directorygt;
-/CODE/BLOCKQUOTE
+lt;Directory /web/docs/specgt;
+IndexOptions ScanHTMLTitles
+lt;/Directorygt;
+/pre/BLOCKQUOTE
then only CODEScanHTMLTitles/CODE will be set for the /web/docs/spec
directory.
/P
1.1465+4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1464
retrieving revision 1.1465
diff -u -r1.1464 -r1.1465
--- CHANGES 1999/12/01 20:24:50 1.1464
+++ CHANGES 1999/12/01 20:33:58 1.1465
@@ -1,5 +1,9 @@
Changes with Apache 1.3.10
+ *) Add IndexOptions FoldersFirst to allow fancy-indexed directory
+ listings to have the subdirectories always listed at the top.
+ [Ken Coar]
+
*) BS2000: Use send() instead of write() in the core buff routines
for better performance and fewer restrictions (max. transfer size)
[Martin Kraemer]
1.111 +24 -0 apache-1.3/src/modules/standard/mod_autoindex.c
Index: mod_autoindex.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_autoindex.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- mod_autoindex.c 1999/06/05 15:48:12 1.110
+++ mod_autoindex.c 1999/12/01 20:34:10 1.111
@@ -95,6 +95,7 @@
#define SUPPRESS_PREAMBLE 64
#define SUPPRESS_COLSORT 128
#define NO_OPTIONS 256
+#define FOLDERS_FIRST 512
#define K_PAD 1
#define K_NOPAD 0
@@ -400,6 +401,9 @@
else if (!strcasecmp(w, SuppressColumnSorting)) {
option = SUPPRESS_COLSORT;
}
+else if (!strcasecmp(w, FoldersFirst)) {
+option = FOLDERS_FIRST;
+ }
else if (!strcasecmp(w, None)) {
if (action != '\0') {
return Cannot combine '+' or '-' with 'None' keyword;
@@ -681,6 +685,8 @@
time_t lm;
struct ent *next;
int ascending;
+int isdir;
+int checkdir;
char key;
};
@@ -1147,6
cvs commit: apache-2.0/src/lib/apr/include apr.h.in apr_file_io.h apr_general.h apr_lib.h apr_network_io.h apr_pools.h apr_portable.h
rbb 99/12/01 12:35:56 Modified:src/lib/apr configure.in src/lib/apr/include apr.h.in apr_file_io.h apr_general.h apr_lib.h apr_network_io.h apr_pools.h apr_portable.h Log: This finishes cleaning up the APR macro leak. APR public headers no longer include apr_config.h, but there is a new header they do include. No other program must include this header. The apr.h header is everything an APR'ized program needs to run properly. There are some public APR headers which are including system headers. These will go away in time, but this should allow Apache to compile cleanly again. Revision ChangesPath 1.30 +27 -8 apache-2.0/src/lib/apr/configure.in Index: configure.in === RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- configure.in 1999/12/01 18:39:02 1.29 +++ configure.in 1999/12/01 20:35:16 1.30 @@ -177,10 +177,10 @@ AC_CHECK_HEADERS(crypt.h) AC_CHECK_HEADERS(ctype.h) AC_CHECK_HEADERS(dir.h) -AC_CHECK_HEADERS(dirent.h) -AC_CHECK_HEADERS(errno.h) +AC_CHECK_HEADERS(dirent.h, direnth=1, dirent=0) +AC_CHECK_HEADERS(errno.h, errnoh=1, errnoh=0) AC_CHECK_HEADERS(net/errno.h) -AC_CHECK_HEADERS(fcntl.h) +AC_CHECK_HEADERS(fcntl.h, fcntlh=1, fcntl=0) AC_CHECK_HEADERS(features.h) AC_CHECK_HEADERS(grp.h) AC_CHECK_HEADERS(io.h) @@ -194,9 +194,9 @@ AC_CHECK_HEADERS(pwd.h) AC_CHECK_HEADERS(setjmp.h) AC_CHECK_HEADERS(signal.h) -AC_CHECK_HEADERS(stdarg.h) +AC_CHECK_HEADERS(stdarg.h, stdargh=1, stdargh=0) AC_CHECK_HEADERS(stddef.h) -AC_CHECK_HEADERS(stdio.h) +AC_CHECK_HEADERS(stdio.h, stdioh=1, stdioh0) AC_CHECK_HEADERS(stdlib.h) AC_CHECK_HEADERS(string.h) AC_CHECK_HEADERS(sysapi.h) @@ -207,14 +207,14 @@ AC_CHECK_HEADERS(sys/times.h) AC_CHECK_HEADERS(tpfeq.h) AC_CHECK_HEADERS(tpfio.h) -AC_CHECK_HEADERS(sys/uio.h) +AC_CHECK_HEADERS(sys/uio.h, sys_uioh=1, sys_uioh=0) AC_CHECK_HEADERS(unistd.h) AC_CHECK_HEADERS(poll.h) AC_CHECK_HEADERS(unix.h) AC_CHECK_HEADERS(winsock.h) AC_CHECK_HEADERS(arpa/inet.h) -AC_CHECK_HEADERS(netinet/in.h) +AC_CHECK_HEADERS(netinet/in.h, netinet_inh=1, netinet_inh=0) AC_CHECK_HEADERS(sys/file.h) AC_CHECK_HEADERS(sys/ioctl.h) @@ -225,7 +225,7 @@ AC_CHECK_HEADERS(sys/signal.h) AC_CHECK_HEADERS(sys/socket.h) AC_CHECK_HEADERS(sys/stat.h) -AC_CHECK_HEADERS(sys/types.h) +AC_CHECK_HEADERS(sys/types.h, sys_typesh=1, sys_typesh=0) AC_CHECK_HEADERS(sys/wait.h) AC_CHECK_HEADERS(kernel/OS.h) @@ -272,14 +272,20 @@ [ if test $enableval = no; then threads=#define APR_HAS_THREADS 0 +pthreadh=0 AC_SUBST(threads) +AC_SUBST(pthreadh) AC_MSG_RESULT(no) else if test $enableval = pthread; then AC_CHECK_HEADERS(pthread.h, [ threads=#define APR_HAS_THREADS 1 + pthreadh=1 + AC_SUBST(pthreadh) AC_SUBST(threads) ], [ threads=#define APR_HAS_THREADS 0 + pthreadh=0 + AC_SUBST(pthreadh) AC_SUBST(threads) ] ) AC_MSG_RESULT(yes) else @@ -290,8 +296,12 @@ [ AC_CHECK_HEADERS(pthread.h, [ threads=#define APR_HAS_THREADS 1 + pthreadh=1 + AC_SUBST(pthreadh) AC_SUBST(threads) ], [ threads=#define APR_HAS_THREADS 0 + pthreadh=0 + AC_SUBST(pthreadh) AC_SUBST(threads) ] ) ]) @@ -306,6 +316,15 @@ AC_SUBST(DEFAULT_OSDIR) AC_SUBST(LIBPREFIX) AC_SUBST(EXEEXT) +AC_SUBST(errnoh) +AC_SUBST(direnth) +AC_SUBST(fcntlh) +AC_SUBST(netinet_inh) +AC_SUBST(stdargh) +AC_SUBST(stdioh) +AC_SUBST(sys_typesh) +AC_SUBST(sys_uioh) + MAKEFILE1=Makefile lib/Makefile SUBDIRS=lib 1.3 +13 -2 apache-2.0/src/lib/apr/include/apr.h.in Index: apr.h.in === RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr.h.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- apr.h.in 1999/12/01 18:39:11 1.2 +++ apr.h.in 1999/12/01 20:35:20 1.3 @@ -2,7 +2,19 @@ #ifndef APR_H #define APR_H +#define APR_HAVE_ERRNO_H@errnoh@ +#define APR_HAVE_DIRENT_H @direnth@ +#define APR_HAVE_FCNTL_H@fcntlh@ +#define APR_HAVE_NETINET_IN_H @netinet_inh@ +#define APR_HAVE_PTHREAD_H @pthreadh@ +#define APR_HAVE_STDARG_H @stdargh@ +#define APR_HAVE_STDIO_H@stdioh@ +#define APR_HAVE_SYS_TYPES_H@sys_typesh@ +#define APR_HAVE_SYS_UIO_H @sys_uioh@ + +#if APR_HAVE_SYS_TYPES_H #include sys/types.h +#endif /* APR Feature
cvs commit: apache-1.3/src/main http_protocol.c
martin 99/12/01 12:45:47
Modified:src CHANGES
src/main http_protocol.c
Log:
EBCDIC: Fix Byte Ranges for EBCDIC platforms. The necessary switch
between implied conversion for protocol parts and configured
conversion for document data was missing. The effect of this was that
PDF files could not be read by Acrobat Reader (which sends long
lists of byte ranges in each request) when the server was apache
on ebcdic machines.
Submitted by: Oliver Reh [EMAIL PROTECTED]
Reviewed by: Martin Kraemer
Revision ChangesPath
1.1466+9 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1465
retrieving revision 1.1466
diff -u -r1.1465 -r1.1466
--- CHANGES 1999/12/01 20:33:58 1.1465
+++ CHANGES 1999/12/01 20:45:29 1.1466
@@ -1,5 +1,14 @@
Changes with Apache 1.3.10
+ *) EBCDIC: Fix Byte Ranges for EBCDIC platforms. The necessary switch
+ between implied conversion for protocol parts and configured
+ conversion for document data was missing. The effect of this was that
+ PDF files could not be read by Acrobat Reader (which sends long
+ lists of byte ranges in each request) when the server was apache
+ on ebcdic machines.
+ [Noted by Oliver Reh [EMAIL PROTECTED], solved by
+ Martin Kraemer]
+
*) Add IndexOptions FoldersFirst to allow fancy-indexed directory
listings to have the subdirectories always listed at the top.
[Ken Coar]
1.281 +22 -1 apache-1.3/src/main/http_protocol.c
Index: http_protocol.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_protocol.c,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -r1.280 -r1.281
--- http_protocol.c 1999/11/05 15:41:03 1.280
+++ http_protocol.c 1999/12/01 20:45:41 1.281
@@ -212,6 +212,14 @@
{
long range_start, range_end;
char *range;
+#ifdef CHARSET_EBCDIC
+/* determine current setting of conversion flag,
+ * set to ON (protocol strings MUST be converted)
+ * and reset to original setting before returning
+ */
+int convert = ap_bgetflag(r-connection-client, B_EBCDIC2ASCII);
+ap_bsetflag(r-connection-client, B_EBCDIC2ASCII, 1);
+#endif /*CHARSET_EBCDIC*/
if (!**r_range) {
if (r-byterange 1) {
@@ -220,14 +228,23 @@
else
*tlength += 4 + strlen(r-boundary) + 4;
}
+#ifdef CHARSET_EBCDIC
+ if (!convert)
+ ap_bsetflag(r-connection-client, B_EBCDIC2ASCII, convert);
+#endif /*CHARSET_EBCDIC*/
return 0;
}
range = ap_getword(r-pool, r_range, ',');
-if (!parse_byterange(range, r-clength, range_start, range_end))
+if (!parse_byterange(range, r-clength, range_start, range_end)) {
+#ifdef CHARSET_EBCDIC
+ if (!convert)
+ ap_bsetflag(r-connection-client, B_EBCDIC2ASCII, convert);
+#endif /*CHARSET_EBCDIC*/
/* Skip this one */
return internal_byterange(realreq, tlength, r, r_range, offset,
length);
+}
if (r-byterange 1) {
const char *ct = r-content_type ? r-content_type :
ap_default_type(r);
@@ -251,6 +268,10 @@
else {
*tlength += range_end - range_start + 1;
}
+#ifdef CHARSET_EBCDIC
+if (!convert)
+ ap_bsetflag(r-connection-client, B_EBCDIC2ASCII, convert);
+#endif /*CHARSET_EBCDIC*/
return 1;
}
cvs commit: apache-2.0/src/lib/apr/mmap/unix common.c
rbb 99/12/01 12:50:03 Modified:src/lib/apr/locks/unix crossproc.c src/lib/apr/mmap/unix common.c Log: Fix a couple of files that need to include apr_config.h now. All of these are APR .c files. Revision ChangesPath 1.9 +1 -0 apache-2.0/src/lib/apr/locks/unix/crossproc.c Index: crossproc.c === RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/crossproc.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- crossproc.c 1999/11/12 23:51:10 1.8 +++ crossproc.c 1999/12/01 20:49:54 1.9 @@ -53,6 +53,7 @@ * */ +#include apr_config.h #include apr_lock.h #include apr_general.h #include apr_lib.h 1.5 +1 -0 apache-2.0/src/lib/apr/mmap/unix/common.c Index: common.c === RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/unix/common.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- common.c 1999/11/13 00:07:22 1.4 +++ common.c 1999/12/01 20:50:00 1.5 @@ -63,6 +63,7 @@ */ #include fileio.h +#include apr_config.h #include apr_mmap.h #include apr_general.h #include apr_portable.h
cvs commit: apache-1.3/src/main util.c
martin 99/12/01 12:55:08
Modified:src CHANGES
src/main util.c
Log:
EBCDIC: Escaped characters in c2x() were encoding the EBCDIC
representation of the special characters, not the latin1
representation. This would result in invalid URI references
for, e.g., filenames generated by mod_autoindex.c
(when they had special chars in them)
Revision ChangesPath
1.1467+5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1466
retrieving revision 1.1467
diff -u -r1.1466 -r1.1467
--- CHANGES 1999/12/01 20:45:29 1.1466
+++ CHANGES 1999/12/01 20:54:55 1.1467
@@ -1,5 +1,10 @@
Changes with Apache 1.3.10
+ *) EBCDIC: Escaped characters were encoding the ebcdic representation
+ of the special characters, not the latin1 representation. This
+ would result in invalid URI's for, e.g., filenames (with special chars)
+ in mod_autoindex.c [Martin Kraemer]
+
*) EBCDIC: Fix Byte Ranges for EBCDIC platforms. The necessary switch
between implied conversion for protocol parts and configured
conversion for document data was missing. The effect of this was that
1.175 +3 -0 apache-1.3/src/main/util.c
Index: util.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/util.c,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- util.c1999/11/26 20:21:18 1.174
+++ util.c1999/12/01 20:55:03 1.175
@@ -1481,6 +1481,9 @@
static ap_inline unsigned char *c2x(unsigned what, unsigned char *where)
{
+#ifdef CHARSET_EBCDIC
+what = os_toascii[what];
+#endif /*CHARSET_EBCDIC*/
*where++ = '%';
*where++ = c2x_table[what 4];
*where++ = c2x_table[what 0xf];
cvs commit: apache-1.3 Makefile.tmpl
martin 99/12/01 13:21:23 Modified:.Makefile.tmpl Log: Fix htdocs/ overwrite test in make install rule: it was still testing for the presence of index.html, while it's been renamed to index.html.en a couple of weeks ago. Also, didn't we want to move /usr/local/apache/htdocs/manual/ out of the user's htdocs/ tree to /usr/local/apache/manual/ and Alias /manual/ to /usr/local/apache/manual/ ? And perhaps note the presence of the i18n versions of the entry page in the CHANGES file? [none of these are done in this commit] Revision ChangesPath 1.92 +1 -1 apache-1.3/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- Makefile.tmpl 1999/11/18 09:54:36 1.91 +++ Makefile.tmpl 1999/12/01 21:21:21 1.92 @@ -441,7 +441,7 @@ # icons and distributed CGI scripts. install-data: @echo === [data: Installing initial data files] - [EMAIL PROTECTED] [ -f $(root)$(htdocsdir)/index.html ]; then \ + [EMAIL PROTECTED] [ -f $(root)$(htdocsdir)/index.html.en ]; then \ echo [PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]; \ else \ echo Copying tree $(TOP)/htdocs/ - $(root)$(htdocsdir)/; \
cvs commit: apache-1.3/src/modules/standard mod_autoindex.c
coar99/12/01 14:10:50
Modified:htdocs/manual/mod mod_autoindex.html
src CHANGES
src/modules/standard mod_autoindex.c
Log:
Add the long-awaited IndexOptions DescriptionWidth keyword.
It was waiting for a way to avoid breaking HTML tags, but
that's already been done as much as possible -- we can't
do anything about breaking HTML elements without putting
a full parser in.
PR: 2324
Revision ChangesPath
1.33 +22 -1 apache-1.3/htdocs/manual/mod/mod_autoindex.html
Index: mod_autoindex.html
===
RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/mod_autoindex.html,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- mod_autoindex.html1999/12/01 20:33:48 1.32
+++ mod_autoindex.html1999/12/01 22:10:32 1.33
@@ -215,6 +215,17 @@
CODEIndexOptionsnbsp;SuppressSize/CODE, and 19 bytes may be
added if CODEIndexOptionsnbsp;SuppressLastModified/CODE is
in effect. The widest this column can be is therefore 49 bytes.
+blockquote
+As of Apache 1.3.10, the
+a href=#indexoptions:descriptionwidthDescriptionWidth/a
+sampIndexOptions/samp keyword allows you to adjust this width
+to any arbitrary size.
+/blockquote
+bCaution:/b Descriptive text defined with sampAddDescription/samp
+may contain HTML markup, such as tags and character entities. If the
+width of the description column should happen to truncate a tagged
+element (such as cutting off the end of a bolded phrase), the results
+may affect the rest of the directory listing.
/P
HR
@@ -545,13 +556,23 @@
REL=Help
STRONGCompatibility:/STRONG/A '+/-' syntax and merging of multiple
SAMPIndexOptions/SAMP directives is only available with
- Apache 1.3.3 and later; the sampFoldersFirst/samp option is only
+ Apache 1.3.3 and later; the sampFoldersFirst/samp and
+ sampDescriptionWidth/samp options are only
available with Apache 1.3.10 and later
P
The IndexOptions directive specifies the behavior of the directory indexing.
EMOption/EM can be one of
DL
+dta name=indexoptions:descriptionwidthDescriptionWidth=[emn/em | *]
+ (emApache 1.3.10 and later/em)/a
+dd
+The sampDescriptionWidth/samp keyword allows you to specify the
+width of the description column in characters. If the keyword value
+is 'samp*/samp', then the column is automatically sized to the
+length of the longest filename in the display.
+bSee the section on a
href=#adddescriptionsampAddDescription/samp/a
+for dangers inherent in truncating descriptions./b/dd
DTA NAME=indexoptions:fancyindexingFancyIndexing/A
DD!--%plaintext lt;?INDEX {\tt FancyIndexing} index optiongt; --
This turns on fancy indexing of directories.
1.1468+5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1467
retrieving revision 1.1468
diff -u -r1.1467 -r1.1468
--- CHANGES 1999/12/01 20:54:55 1.1467
+++ CHANGES 1999/12/01 22:10:39 1.1468
@@ -1,5 +1,10 @@
Changes with Apache 1.3.10
+ *) Add IndexOptions DescriptionWidth so that the width of the
+ description field in fancy-indexed directory listings can
+ be specified.
+ [Ken Coar] PR#2324, plus lots that are closed unsatisfied
+
*) EBCDIC: Escaped characters were encoding the ebcdic representation
of the special characters, not the latin1 representation. This
would result in invalid URI's for, e.g., filenames (with special chars)
1.112 +80 -19apache-1.3/src/modules/standard/mod_autoindex.c
Index: mod_autoindex.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_autoindex.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- mod_autoindex.c 1999/12/01 20:34:10 1.111
+++ mod_autoindex.c 1999/12/01 22:10:45 1.112
@@ -125,6 +125,7 @@
* Other default dimensions.
*/
#define DEFAULT_NAME_WIDTH 23
+#define DEFAULT_DESC_WIDTH 23
struct item {
char *type;
@@ -141,13 +142,14 @@
} ai_desc_t;
typedef struct autoindex_config_struct {
-
char *default_icon;
int opts;
int incremented_opts;
int decremented_opts;
int name_width;
int name_adjust;
+int desc_width;
+int desc_adjust;
int icon_width;
int icon_height;
char *default_order;
@@ -465,6 +467,31 @@
d_cfg-name_adjust = K_NOADJUST;
}
}
+ else if (!strcasecmp(w, DescriptionWidth)) {
+ if (action != '-') {
+ return DescriptionWidth with no value may
cvs commit: apache-1.3/src/main http_main.c
stoddard99/12/01 14:41:35
Modified:src/main http_main.c
Log:
Maybe this will help eliminate some of the 'ws2_32.dll is missing' PRs.
Revision ChangesPath
1.482 +5 -10 apache-1.3/src/main/http_main.c
Index: http_main.c
===
RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.481
retrieving revision 1.482
diff -u -r1.481 -r1.482
--- http_main.c 1999/11/04 19:49:40 1.481
+++ http_main.c 1999/12/01 22:41:30 1.482
@@ -3575,28 +3575,23 @@
return (s_iInitCount);
/* s_iInitCount == 0. Do the initailization */
-#ifdef NETWARE
iVersionRequested = MAKEWORD(2, 0);
-#else
-iVersionRequested = MAKEWORD(1, 1);
-#endif
err = WSAStartup((WORD) iVersionRequested, wsaData);
if (err) {
+printf(WSAStartup failed with error %d\n, err);
s_iInitCount = -1;
return (s_iInitCount);
}
-#ifdef WIN32
-if (LOBYTE(wsaData.wVersion) != 1 ||
- HIBYTE(wsaData.wVersion) != 1) {
+
+if (LOBYTE(wsaData.wVersion) != 2 ||
+ HIBYTE(wsaData.wVersion) != 0) {
+printf(Apache requires Winsock 2. Please see the Apache FAQ for
more information.\n);
s_iInitCount = -2;
WSACleanup();
return (s_iInitCount);
}
-#endif
-
s_iInitCount++;
return (s_iInitCount);
-
}
Re: cvs commit: apache-2.0/src/include ap_ac_config.h
On 1 Dec 1999 [EMAIL PROTECTED] wrote: manoj 99/11/30 21:09:19 Modified:src/include ap_ac_config.h Log: Autoconf's configure script will tell us which types select is looking for; we might as well take advantage of it. We shouldn't be using select anymore in Apache. It should be using ap_poll, and ap_poll will figure out how to use select. So, this whole check shouldn't be necessary. Ryan ___ Ryan Bloom [EMAIL PROTECTED] 4205 S Miami Blvd RTP, NC 27709 It's a beautiful sight to see good dancers doing simple steps. It's a painful sight to see beginners doing complicated patterns.
