cvs commit: apache-2.0/src/modules/standard mod_autoindex.c
stoddard99/11/08 19:41:15
Modified:src/modules/standard mod_autoindex.c
Log:
mod_autoindex has a small bug when calling ap_readdir. This was
causing empty indexes to be created. The following patch fixes
this problem
Submitted by: Paul Reder
Reviewed by: Bill Stoddard
Revision ChangesPath
1.13 +1 -1 apache-2.0/src/modules/standard/mod_autoindex.c
Index: mod_autoindex.c
===
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_autoindex.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mod_autoindex.c 1999/10/24 19:24:06 1.12
+++ mod_autoindex.c 1999/11/09 03:41:11 1.13
@@ -1579,7 +1579,7 @@
* linked list and then arrayificate them so qsort can use them.
*/
head = NULL;
-while (ap_readdir(d)) {
+while (ap_readdir(d) == APR_SUCCESS) {
char *d_name;
ap_get_dir_filename(d_name, d);
p = make_autoindex_entry(d_name, autoindex_opts,
cvs commit: apache-2.0/src/lib/apr/include apr_general.h
ben 99/11/09 00:53:53 Modified:src/lib/apr/include apr_general.h Log: configure makes sure ssize_t always exists. Revision ChangesPath 1.8 +0 -4 apache-2.0/src/lib/apr/include/apr_general.h Index: apr_general.h === RCS file: /export/home/cvs/apache-2.0/src/lib/apr/include/apr_general.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- apr_general.h 1999/10/11 01:39:21 1.7 +++ apr_general.h 1999/11/09 08:53:53 1.8 @@ -114,11 +114,7 @@ #endif typedef size_t ap_size_t; -#ifdef ssize_t typedef ssize_tap_ssize_t; -#else -typedef intap_ssize_t; -#endif typedef off_t ap_off_t; typedef struct context_t ap_context_t;
cvs commit: apache-2.0/src/main util_script.c
ben 99/11/09 01:01:18
Modified:src/lib/apr configure.in
src/lib/apr/include apr_general.h
src/main util_script.c
Log:
Add printf format for ssize_t.
Revision ChangesPath
1.23 +9 -8 apache-2.0/src/lib/apr/configure.in
Index: configure.in
===
RCS file: /export/home/cvs/apache-2.0/src/lib/apr/configure.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- configure.in 1999/10/21 21:13:15 1.22
+++ configure.in 1999/11/09 09:01:10 1.23
@@ -41,14 +41,6 @@
# This macro needs to be here in case we are on an AIX box.
AC_AIX
-dnl Checks for integer size
-AC_CHECK_SIZEOF(char, 1)
-AC_CHECK_SIZEOF(int, 4)
-AC_CHECK_SIZEOF(long, 4)
-AC_CHECK_SIZEOF(short, 2)
-AC_CHECK_SIZEOF(long double, 12)
-AC_CHECK_SIZEOF(long long, 8)
-
dnl Checks for standard typedefs
AC_TYPE_OFF_T
AC_TYPE_PID_T
@@ -56,6 +48,15 @@
AC_TYPE_UID_T
AC_CHECK_TYPE(ssize_t, int)
AC_C_INLINE
+
+dnl Checks for integer size
+AC_CHECK_SIZEOF(char, 1)
+AC_CHECK_SIZEOF(int, 4)
+AC_CHECK_SIZEOF(long, 4)
+AC_CHECK_SIZEOF(short, 2)
+AC_CHECK_SIZEOF(long double, 12)
+AC_CHECK_SIZEOF(long long, 8)
+AC_CHECK_SIZEOF(ssize_t, 4)
# Use /bin/sh if it exists, otherwise go looking for sh in the path
if test .$SH = . -a -f /bin/sh; then
1.9 +8 -0 apache-2.0/src/lib/apr/include/apr_general.h
Index: apr_general.h
===
RCS file: /export/home/cvs/apache-2.0/src/lib/apr/include/apr_general.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- apr_general.h 1999/11/09 08:53:53 1.8
+++ apr_general.h 1999/11/09 09:01:14 1.9
@@ -117,6 +117,14 @@
typedef ssize_tap_ssize_t;
typedef off_t ap_off_t;
+#if SIZEOF_SSIZE_T == SIZEOF_INT
+# define APR_SSIZE_T_FMT d
+#elif SIZEOF_SSIZE_T == SIZEOF_LONG
+# define APR_SSIZE_T_FMT ld
+#else
+# error Don't know ssize_t printf format
+#endif
+
typedef struct context_t ap_context_t;
typedef int ap_signum_t;
1.18 +2 -2 apache-2.0/src/main/util_script.c
Index: util_script.c
===
RCS file: /export/home/cvs/apache-2.0/src/main/util_script.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- util_script.c 1999/10/31 09:26:03 1.17
+++ util_script.c 1999/11/09 09:01:15 1.18
@@ -639,13 +639,13 @@
ap_rputs( 1k, r);
}
else if (size 1048576) {
- ap_rprintf(r, %4ldk, (size + 512) / 1024);
+ ap_rprintf(r, %4 APR_SSIZE_T_FMT k, (size + 512) / 1024);
}
else if (size 103809024) {
ap_rprintf(r, %4.1fM, size / 1048576.0);
}
else {
- ap_rprintf(r, %4ldM, (size + 524288) / 1048576);
+ ap_rprintf(r, %4 APR_SSIZE_T_FMT M, (size + 524288) / 1048576);
}
}
cvs commit: apache-2.0/src/modules/mpm/prefork prefork.c
ben 99/11/09 01:33:56
Modified:src/modules/mpm/prefork prefork.c
Log:
Fix error logging calls (kinda).
Revision ChangesPath
1.50 +11 -9 apache-2.0/src/modules/mpm/prefork/prefork.c
Index: prefork.c
===
RCS file: /export/home/cvs/apache-2.0/src/modules/mpm/prefork/prefork.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- prefork.c 1999/10/24 13:08:29 1.49
+++ prefork.c 1999/11/09 09:33:52 1.50
@@ -202,7 +202,7 @@
}
dir = ap_server_root_relative(pconf, buf[0] ? buf : dir);
if(mkdir(dir, 0755) 0 errno != EEXIST) {
- ap_log_error(APLOG_MARK, APLOG_ERR, server_conf,
+ ap_log_error(APLOG_MARK, APLOG_ERR, errno, server_conf,
gprof: error creating directory %s, dir);
}
}
@@ -603,10 +603,11 @@
static void accept_mutex_child_init(ap_context_t *p)
{
ap_file_t *tempfile;
+ap_status_t ret;
-ap_open(tempfile, ap_lock_fname, APR_WRITE, APR_UREAD|APR_UWRITE, p);
-if (!tempfile) {
- ap_log_error(APLOG_MARK, APLOG_EMERG, server_conf,
+ret=ap_open(tempfile, ap_lock_fname, APR_WRITE, APR_UREAD|APR_UWRITE,
p);
+if (ret != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_EMERG, ret, server_conf,
Child cannot open lock file: %s, ap_lock_fname);
clean_child_exit(APEXIT_CHILDINIT);
}
@@ -620,13 +621,14 @@
static void accept_mutex_init(ap_context_t *p)
{
ap_file_t *tempfile;
+ap_status_t ret;
expand_lock_fname(p);
unlink(ap_lock_fname);
-ap_open(tempfile, ap_lock_fname, APR_CREATE|APR_WRITE|APR_EXCL,
+ret=ap_open(tempfile, ap_lock_fname, APR_CREATE|APR_WRITE|APR_EXCL,
APR_UREAD|APR_UWRITE, p);
-if (!tempfile) {
- ap_log_error(APLOG_MARK, APLOG_EMERG, server_conf,
+if (ret != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_EMERG, ret, server_conf,
Parent cannot open lock file: %s, ap_lock_fname);
exit(APEXIT_INIT);
}
@@ -642,7 +644,7 @@
continue;
if (ret 0) {
- ap_log_error(APLOG_MARK, APLOG_EMERG, server_conf,
+ ap_log_error(APLOG_MARK, APLOG_EMERG, errno, server_conf,
flock: LOCK_EX: Error getting accept lock. Exiting!);
clean_child_exit(APEXIT_CHILDFATAL);
}
@@ -651,7 +653,7 @@
static void accept_mutex_off(void)
{
if (flock(lock_fd, LOCK_UN) 0) {
- ap_log_error(APLOG_MARK, APLOG_EMERG, server_conf,
+ ap_log_error(APLOG_MARK, APLOG_EMERG, errno, server_conf,
flock: LOCK_UN: Error freeing accept lock. Exiting!);
clean_child_exit(APEXIT_CHILDFATAL);
}
cvs commit: apache-site index.html
brian 99/11/09 01:50:48 Modified:.index.html Log: Again, link to the XML project. Revision ChangesPath 1.7 +1 -0 apache-site/index.html Index: index.html === RCS file: /home/cvs/apache-site/index.html,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- index.html1999/10/22 15:54:31 1.6 +++ index.html1999/11/09 09:50:48 1.7 @@ -31,6 +31,7 @@ hr width=50% size=4 a href=foundation/projects.htmlfont size=-1ASF Projects:/font/abr b a href=httpd.htmlApache Server/abr + a href=http://xml.apache.org/;XML-Apache/abr a href=http://jakarta.apache.org/;Jakarta/abr a href=http://java.apache.org/;Java-Apache/abr a href=http://perl.apache.org/;mod_perl/abr
cvs commit: apache-1.3/src/main http_request.c
ben 99/11/09 10:02:24
Modified:src/main http_request.c
Log:
Make sure that an error document that needs auth but hasn't got an auth type
still reports a cascaded error.
Revision ChangesPath
1.151 +1 -1 apache-1.3/src/main/http_request.c
Index: http_request.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/http_request.c,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- http_request.c1999/10/21 20:44:43 1.150
+++ http_request.c1999/11/09 18:02:19 1.151
@@ -1176,7 +1176,7 @@
case SATISFY_ANY:
if (((access_status = ap_check_access(r)) != 0) || !ap_auth_type(r))
{
if (!ap_some_auth_required(r)) {
-decl_die(access_status, ap_auth_type(r)
+decl_die(access_status ? access_status :
HTTP_INTERNAL_SERVER_ERROR, ap_auth_type(r)
? check access
: perform authentication. AuthType not set!, r);
return;
