cvs commit: apache-1.3/src/support htpasswd.mcp.gz htdigest.mcp.gz
stoddard00/01/11 16:14:31 Removed: src ApacheNW.mcp.gz src/support htpasswd.mcp.gz htdigest.mcp.gz Log: Removing these so I can add them back as binary files. Doh!
cvs commit: apache-1.3/src ApacheNW.mcp.gz
stoddard00/01/11 16:52:15 Added: src ApacheNW.mcp.gz Log: Project file for the NetWare port. Obtained from: Mike Gardiner Revision ChangesPath 1.3 +250 -1apache-1.3/src/ApacheNW.mcp.gz Binary file
cvs commit: apache-1.3/src/support htpasswd.mcp.gz htdigest.mcp.gz
stoddard00/01/11 16:56:10 Added: src/support htpasswd.mcp.gz htdigest.mcp.gz Log: NetWare project files for htpasswd and htdigest Obtained from: Mike Gardiner Revision ChangesPath 1.3 +40 -1 apache-1.3/src/support/htpasswd.mcp.gz Binary file 1.3 +38 -1 apache-1.3/src/support/htdigest.mcp.gz Binary file
cvs commit: apache-1.3/src/modules/standard mod_status.c
fanf00/01/11 17:13:39
Modified:src/include ap_mmn.h scoreboard.h
src/main http_main.c
src/modules/standard mod_status.c
Log:
Revert to the 1.3.3 way of getting the server name from the scoreboard,
with a modification to make it respect the UseCanonicalName setting.
This makes things work better with mass vhosting setups.
Submitted by: Cliff Woolley [EMAIL PROTECTED]
Reviewed by: Tony Finch
Revision ChangesPath
1.42 +4 -2 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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ap_mmn.h 1999/08/14 08:53:48 1.41
+++ ap_mmn.h 2000/01/12 01:13:06 1.42
@@ -226,14 +226,16 @@
*ap_base64encode_len(), ap_base64decode(),
*ap_base64decode_binary(), ap_base64decode_len(),
*ap_pbase64decode(), ap_pbase64encode()
+ * (1.3.10-dev)
+ * 2112 - put the vhostname back into the scoreboard itself
*/
#define MODULE_MAGIC_COOKIE 0x41503133UL /* AP13 */
#ifndef MODULE_MAGIC_NUMBER_MAJOR
-#define MODULE_MAGIC_NUMBER_MAJOR 19990320
+#define MODULE_MAGIC_NUMBER_MAJOR 2112
#endif
-#define MODULE_MAGIC_NUMBER_MINOR 6 /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 0 /* 0...n */
#define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR/* backward
compat */
/* Useful for testing for features. */
1.49 +1 -0 apache-1.3/src/include/scoreboard.h
Index: scoreboard.h
===
RCS file: /home/cvs/apache-1.3/src/include/scoreboard.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- scoreboard.h 1999/10/21 20:44:23 1.48
+++ scoreboard.h 2000/01/12 01:13:09 1.49
@@ -160,6 +160,7 @@
char request[64];/* We just want an idea... */
server_rec *vhostrec;/* What virtual host is being accessed? */
/* SEE ABOVE FOR SAFE USAGE! */
+char vhostname[32]; /* more useful status with mass vhosting */
} short_score;
typedef struct {
1.487 +2 -0 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.486
retrieving revision 1.487
diff -u -r1.486 -r1.487
--- http_main.c 2000/01/01 17:07:34 1.486
+++ http_main.c 2000/01/12 01:13:23 1.487
@@ -2256,6 +2256,8 @@
sizeof(ss-request));
}
ss-vhostrec = r-server;
+ ap_cpystrn(ss-vhostname, ap_get_server_name(r),
+sizeof(ss-vhostname));
}
}
if (status == SERVER_STARTING r == NULL) {
1.109 +2 -2 apache-1.3/src/modules/standard/mod_status.c
Index: mod_status.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_status.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- mod_status.c 1999/10/21 20:45:42 1.108
+++ mod_status.c 2000/01/12 01:13:34 1.109
@@ -599,7 +599,7 @@
ap_rprintf(r, i%s {%s}/i b[%s]/bbr\n\n,
score_record.client,
ap_escape_html(r-pool, score_record.request),
- vhost ? vhost-server_hostname : (unavailable));
+ vhost ? score_record.vhostname : (unavailable));
}
else { /* !no_table_report */
if (score_record.status == SERVER_DEAD)
@@ -672,7 +672,7 @@
ap_rprintf(r,
td%std nowrap%std nowrap%s/tr\n\n,
score_record.client,
- vhost ? vhost-server_hostname : (unavailable),
+ vhost ? score_record.vhostname : (unavailable),
ap_escape_html(r-pool, score_record.request));
} /* no_table_report */
} /* !short_report */
cvs commit: apache-1.3/htdocs/manual/mod core.html
fanf00/01/11 17:18:09 Modified:htdocs/manual/mod core.html Log: Be more explicit about the performance of UseCanonicalName DNS after the scoreboard change. Revision ChangesPath 1.160 +3 -0 apache-1.3/htdocs/manual/mod/core.html Index: core.html === RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/core.html,v retrieving revision 1.159 retrieving revision 1.160 diff -u -r1.159 -r1.160 --- core.html 1999/12/21 07:52:51 1.159 +++ core.html 2000/01/12 01:18:07 1.160 @@ -3144,6 +3144,9 @@ ancient clients that do not provide a CODEHost:/CODE header. With this option Apache does a reverse DNS lookup on the server IP address that the client connected to in order to work out self-referential URLs. +This can have adverse performance implications, especially if you use +CODE%V/CODE in a A HREF=mod_log_config.html#customlogCustomLog/A +directive or have A HREF=mod_status.htmlExtendedStatus/A on. PSTRONGWarning:/STRONG if CGIs make assumptions about the values of CODESERVER_NAME/CODE they may be broken by this option. The client
cvs commit: apache-2.0/src/lib/apr/time/win32 time.dsp time.def
stoddard00/01/11 18:18:13 Removed: src/lib/apr/time/win32 time.dsp time.def Log: Move per directory Windows project files to the attic
cvs commit: apache-2.0/src/lib/apr/file_io/win32 file_io.def file_io.dsp
stoddard00/01/11 18:23:51 Removed: src/lib/apr/file_io/win32 file_io.def file_io.dsp Log: Move Windows project files to tha attic
cvs commit: apache-2.0/src/lib/apr/lib lib.dsp lib.def
stoddard00/01/11 18:25:39 Removed: src/lib/apr/lib lib.dsp lib.def Log: Move Windows project files to the attic
cvs commit: apache-2.0/src/lib/apr/locks/win32 locks.def locks.dsp
stoddard00/01/11 18:26:50 Removed: src/lib/apr/locks/win32 locks.def locks.dsp Log: Move Windows project files to the attic.
cvs commit: apache-2.0/src/lib/apr/misc/win32 misc.def misc.dsp
stoddard00/01/11 18:29:38 Removed: src/lib/apr/misc/win32 misc.def misc.dsp Log: Move Windows project files to the attic.
cvs commit: apache-2.0/src/lib/apr/network_io/win32 network_io.dsp network_io.def
stoddard00/01/11 18:31:40 Removed: src/lib/apr/network_io/win32 network_io.dsp network_io.def Log: Move Windows project files to the attic.
cvs commit: apache-1.3/src/main http_main.c
fielding00/01/11 19:38:25
Modified:src CHANGES
src/main http_main.c
Log:
this patch is intended to avoid a problem witnessed in apache
installations with certain third party libraries: if there are many
children, and then take sufficiently long to shut down, then apache's
reclaim child processes sends the remaining children SIGKILL. that's
alright with me -- shutdown shouldn't take so long -- but the current code
doesn't wait around for them to die; if they haven't all finished
terminating right away, it sleeps for approximately 16 seconds before
noticing that they're dead. thus, the total time required to shut down is
generally a bit more than twenty seconds ... the last 16 seconds of which
is quite unnecessary.
anyway, what this patch does is change things so that after SIGKILL has
been sent, the parent checks a couple of times (approx: 16ms, 84ms, 350ms,
1.4sec) and then decides that the SIGKILL failed. i could easily adjust
this so that the total time spent waiting for the SIGKILL to fail is what
it was -- 16 seconds, give or take -- but in writing this, i figured that
if they haven't died after 1.4 seconds, then the SIGKILL wasn't
sufficient; it's not instant, but it should never take that long.
Submitted by: Ed Korthof [EMAIL PROTECTED]
Reviewed by: Roy Fielding
Revision ChangesPath
1.1496+5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1495
retrieving revision 1.1496
diff -u -r1.1495 -r1.1496
--- CHANGES 2000/01/12 01:15:20 1.1495
+++ CHANGES 2000/01/12 03:38:14 1.1496
@@ -1,5 +1,10 @@
Changes with Apache 1.3.10
+ *) Reduce the time that a parent waits for its children to die
+ after SIGKILL has been sent, since there isn't much point in waiting
+ another 16 seconds beyond the initial SIGTERM waiting period.
+ [Ed Korthof]
+
*) Revert to the 1.3.3 way of getting the server name from the
scoreboard, with a modification to make it respect the
UseCanonicalName setting. This makes things work better with
1.488 +7 -2 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.487
retrieving revision 1.488
diff -u -r1.487 -r1.488
--- http_main.c 2000/01/12 01:13:23 1.487
+++ http_main.c 2000/01/12 03:38:19 1.488
@@ -2380,7 +2380,7 @@
ap_sync_scoreboard_image();
-for (tries = terminate ? 4 : 1; tries = 9; ++tries) {
+for (tries = terminate ? 4 : 1; tries = 12; ++tries) {
/* don't want to hold up progress any more than
* necessary, but we need to allow children a few moments to exit.
* Set delay with an exponential backoff.
@@ -2435,8 +2435,13 @@
child process %d still did not exit, sending a SIGKILL,
pid);
kill(pid, SIGKILL);
+ waittime = 1024 * 16; /* give them some time to die */
break;
- case 9: /* 14 sec */
+ case 9: /* 6 sec */
+ case 10:/* 6.1 sec */
+ case 11:/* 6.4 sec */
+ break;
+ case 12:/* 7.4 sec */
/* gave it our best shot, but alas... If this really
* is a child we are trying to kill and it really hasn't
* exited, we will likely fail to bind to the port
cvs commit: apache-1.3/src/modules/standard mod_digest.c mod_rewrite.c mod_speling.c
fanf00/01/12 07:23:29
Modified:src/modules/experimental mod_auth_digest.c
src/modules/standard mod_digest.c mod_rewrite.c
mod_speling.c
Log:
Don't convert auth to proxy auth when it shouldn't be.
Revision ChangesPath
1.13 +9 -8 apache-1.3/src/modules/experimental/mod_auth_digest.c
Index: mod_auth_digest.c
===
RCS file: /home/cvs/apache-1.3/src/modules/experimental/mod_auth_digest.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mod_auth_digest.c 1999/12/09 05:21:00 1.12
+++ mod_auth_digest.c 2000/01/12 15:23:23 1.13
@@ -826,14 +826,14 @@
/* Parse the Authorization header, if it exists */
static int get_digest_rec(request_rec *r, digest_header_rec *resp)
{
-const char *auth_line = ap_table_get(r-headers_in,
- r-proxyreq ? Proxy-Authorization
- : Authorization);
+const char *auth_line;
size_t l;
int vk = 0, vv = 0;
char *key, *value;
-
+auth_line = ap_table_get(r-headers_in,
+ r-proxyreq == STD_PROXY ? Proxy-Authorization
+ : Authorization);
if (!auth_line) {
resp-auth_hdr_sts = NO_HEADER;
return !OK;
@@ -1270,7 +1270,7 @@
* unneccessarily (it's usually 200 bytes!).
*/
-if (r-proxyreq)
+if (r-proxyreq != NOT_PROXY)
domain = NULL; /* don't send domain for proxy requests */
else if (conf-uri_list)
domain = conf-uri_list;
@@ -1285,7 +1285,8 @@
}
ap_table_mergen(r-err_headers_out,
- r-proxyreq ? Proxy-Authenticate : WWW-Authenticate,
+ r-proxyreq == STD_PROXY ? Proxy-Authenticate
+ : WWW-Authenticate,
ap_psprintf(r-pool, Digest realm=\%s\, nonce=\%s\,
algorithm=%s%s%s%s%s,
ap_auth_name(r), nonce, conf-algorithm,
@@ -1986,8 +1987,8 @@
if (ai ai[0])
ap_table_mergen(r-headers_out,
- r-proxyreq ? Proxy-Authentication-Info :
- Authentication-Info,
+ r-proxyreq == STD_PROXY ? Proxy-Authentication-Info
+ : Authentication-Info,
ai);
return OK;
}
1.43 +4 -3 apache-1.3/src/modules/standard/mod_digest.c
Index: mod_digest.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_digest.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- mod_digest.c 1999/10/21 20:45:24 1.42
+++ mod_digest.c 2000/01/12 15:23:24 1.43
@@ -136,9 +136,7 @@
static int get_digest_rec(request_rec *r, digest_header_rec * response)
{
-const char *auth_line = ap_table_get(r-headers_in,
-r-proxyreq ? Proxy-Authorization
-: Authorization);
+const char *auth_line;
int l;
int s, vk = 0, vv = 0;
const char *t;
@@ -154,6 +152,9 @@
return SERVER_ERROR;
}
+auth_line = ap_table_get(r-headers_in,
+ r-proxyreq == STD_PROXY ? Proxy-Authorization
+ : Authorization);
if (!auth_line) {
ap_note_digest_auth_failure(r);
return AUTH_REQUIRED;
1.154 +2 -2 apache-1.3/src/modules/standard/mod_rewrite.c
Index: mod_rewrite.c
===
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- mod_rewrite.c 1999/12/04 11:43:17 1.153
+++ mod_rewrite.c 2000/01/12 15:23:25 1.154
@@ -1123,7 +1123,7 @@
}
/* now make sure the request gets handled by the proxy handler */
-r-proxyreq = 1;
+r-proxyreq = STD_PROXY;
r-handler = proxy-server;
rewritelog(r, 1, go-ahead with proxy request %s [OK],
@@ -1387,7 +1387,7 @@
}
/* now make sure the request gets handled by the proxy handler */
-r-proxyreq = 1;
+r-proxyreq = STD_PROXY;
r-handler = proxy-server;
rewritelog(r, 1, [per-dir %s] go-ahead with proxy request
1.35 +1 -1 apache-1.3/src/modules/standard/mod_speling.c
Index: mod_speling.c
cvs commit: apache-1.3/src/modules/standard mod_status.c
fanf00/01/12 07:55:04
Modified:htdocs/manual/mod core.html
src CHANGES
src/include ap_mmn.h scoreboard.h
src/main http_main.c
src/modules/standard mod_status.c
Log:
Revert the scoreboard change because Jim doesn't like it.
Revision ChangesPath
1.161 +1 -1 apache-1.3/htdocs/manual/mod/core.html
Index: core.html
===
RCS file: /home/cvs/apache-1.3/htdocs/manual/mod/core.html,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- core.html 2000/01/12 01:18:07 1.160
+++ core.html 2000/01/12 15:54:46 1.161
@@ -3146,7 +3146,7 @@
that the client connected to in order to work out self-referential URLs.
This can have adverse performance implications, especially if you use
CODE%V/CODE in a A HREF=mod_log_config.html#customlogCustomLog/A
-directive or have A HREF=mod_status.htmlExtendedStatus/A on.
+directive.
PSTRONGWarning:/STRONG if CGIs make assumptions about the values of
CODESERVER_NAME/CODE they may be broken by this option. The client
1.1497+0 -5 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1496
retrieving revision 1.1497
diff -u -r1.1496 -r1.1497
--- CHANGES 2000/01/12 03:38:14 1.1496
+++ CHANGES 2000/01/12 15:54:51 1.1497
@@ -5,11 +5,6 @@
another 16 seconds beyond the initial SIGTERM waiting period.
[Ed Korthof]
- *) Revert to the 1.3.3 way of getting the server name from the
- scoreboard, with a modification to make it respect the
- UseCanonicalName setting. This makes things work better with
- mass vhosting setups. [Cliff Woolley [EMAIL PROTECTED]]
-
*) Add --suexec-umask option to configure, and severity levels
to suexec log messages. Also clarify a couple of those messages,
which were perhaps a bit too cryptic. [Ken Coar] PR#4178
1.43 +2 -4 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.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ap_mmn.h 2000/01/12 01:13:06 1.42
+++ ap_mmn.h 2000/01/12 15:54:56 1.43
@@ -226,16 +226,14 @@
*ap_base64encode_len(), ap_base64decode(),
*ap_base64decode_binary(), ap_base64decode_len(),
*ap_pbase64decode(), ap_pbase64encode()
- * (1.3.10-dev)
- * 2112 - put the vhostname back into the scoreboard itself
*/
#define MODULE_MAGIC_COOKIE 0x41503133UL /* AP13 */
#ifndef MODULE_MAGIC_NUMBER_MAJOR
-#define MODULE_MAGIC_NUMBER_MAJOR 2112
+#define MODULE_MAGIC_NUMBER_MAJOR 19990320
#endif
-#define MODULE_MAGIC_NUMBER_MINOR 0 /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 6 /* 0...n */
#define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR/* backward
compat */
/* Useful for testing for features. */
1.50 +0 -1 apache-1.3/src/include/scoreboard.h
Index: scoreboard.h
===
RCS file: /home/cvs/apache-1.3/src/include/scoreboard.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- scoreboard.h 2000/01/12 01:13:09 1.49
+++ scoreboard.h 2000/01/12 15:54:56 1.50
@@ -160,7 +160,6 @@
char request[64];/* We just want an idea... */
server_rec *vhostrec;/* What virtual host is being accessed? */
/* SEE ABOVE FOR SAFE USAGE! */
-char vhostname[32]; /* more useful status with mass vhosting */
} short_score;
typedef struct {
1.489 +0 -2 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.488
retrieving revision 1.489
diff -u -r1.488 -r1.489
--- http_main.c 2000/01/12 03:38:19 1.488
+++ http_main.c 2000/01/12 15:54:58 1.489
@@ -2256,8 +2256,6 @@
sizeof(ss-request));
}
ss-vhostrec = r-server;
- ap_cpystrn(ss-vhostname, ap_get_server_name(r),
-sizeof(ss-vhostname));
}
}
if (status == SERVER_STARTING r == NULL) {
1.110 +2 -2 apache-1.3/src/modules/standard/mod_status.c
Index: mod_status.c
cvs commit: apache-2.0/src/build build.mk
sascha 00/01/12 08:56:00 Modified:src/build build.mk Log: `-follow' is a GNU extension, remove it. Revision ChangesPath 1.2 +2 -2 apache-2.0/src/build/build.mk Index: build.mk === RCS file: /home/cvs/apache-2.0/src/build/build.mk,v retrieving revision 1.1 retrieving revision 1.2 diff -u -u -r1.1 -r1.2 --- build.mk 2000/01/11 13:10:58 1.1 +++ build.mk 2000/01/12 16:55:58 1.2 @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ## -# $Id: build.mk,v 1.1 2000/01/11 13:10:58 sascha Exp $ +# $Id: build.mk,v 1.2 2000/01/12 16:55:58 sascha Exp $ # # Makefile to generate build tools # @@ -55,7 +55,7 @@ bzip2 -t $$distname.tar.bz2 cvsclean: - @for i in `find . -follow -name .cvsignore`; do \ + @for i in `find . -name .cvsignore`; do \ (cd `dirname $$i` 2/dev/null rm -rf `cat .cvsignore` *.o *.a || true); \ done @rm -f $(SUBDIRS) 2/dev/null || true
cvs commit: apache-1.3 STATUS
jim 00/01/12 09:44:23 Modified:.STATUS Log: Push back the release... We need to fix these before we release Revision ChangesPath 1.788 +15 -12apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.787 retrieving revision 1.788 diff -u -r1.787 -r1.788 --- STATUS2000/01/11 19:47:35 1.787 +++ STATUS2000/01/12 17:44:12 1.788 @@ -1,15 +1,15 @@ 1.3 STATUS: - Last modified at [$Date: 2000/01/11 19:47:35 $] + Last modified at [$Date: 2000/01/12 17:44:12 $] Release: -1.3.10-dev: Current. We will try to release on 1/14/2000. As such, +1.3.10-dev: Current. We will try to release on 1/19/2000. As such, only bug-fixes and doc changes will be allowed. Timeline: -1/12/2000: Code freeze. No changes at all. -1/13/2000: tag and roll tarball -1/17/2000: Release and announce -1/19/2000: Re-open CVS (delay just in case) +1/15/2000: Code freeze. No changes at all. +1/16/2000: tag and roll tarball +1/19/2000: Release and announce +1/21/2000: Re-open CVS (delay just in case) 1.3.9: Tagged and rolled on Aug. 16. Released and announced on 19th. 1.3.8: Not released. 1.3.7: Not released. @@ -35,8 +35,10 @@ [EMAIL PROTECTED] UPDATE: Ryan suggested that SHLIB_SUFFIX_NAME=sl be backed out. Jim has done this. However, there is still debate - on the correct fix. ALL patches regarding this MUST - be verified on a HPUX machine. + on the correct fix. At present, this seems to fix the + symptom, but not the full problem, which is inherent + in how the shared functionality was coded. Other + suggested patches break other platforms. * HPUX build failure without -Ae provided to HPUX compiler as a CFLAG. The error message states this flag is required for long long types @@ -44,10 +46,11 @@ Ryan submitted a patch for this problem STATUS: Ryan +1, Jim, +1 -* There is a Netware patch which should be applied. We've let - Netware hang too long. Patch by Mike Gardiner [EMAIL PROTECTED] -Message-ID: [EMAIL PROTECTED] - STATUS: Bill +1, Ryan +1 +* DSO emulation for AIX 4.2 appears hosed. +Message-ID: [EMAIL PROTECTED] + STATUS: Ryan, Sascha and others are looking into + what is really going on. + RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
cvs commit: apache-2.0/src/main http_protocol.c http_request.c
rbb 00/01/12 10:20:45
Modified:src/main http_protocol.c http_request.c
Log:
Fix some remaining problems with SSI's and Windows. Basically, the
sendfile stuff doesn't work properly with chuncked data.
Submitted by: Allan Edwards
Reviewed by: Ryan Bloom
Revision ChangesPath
1.47 +14 -9 apache-2.0/src/main/http_protocol.c
Index: http_protocol.c
===
RCS file: /home/cvs/apache-2.0/src/main/http_protocol.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- http_protocol.c 2000/01/09 05:18:23 1.46
+++ http_protocol.c 2000/01/12 18:20:43 1.47
@@ -2016,16 +2016,21 @@
{
long len;
#ifdef HAVE_SENDFILE
-ap_bflush(r-connection-client);
-if (ap_get_filesize(len, fd) != APR_SUCCESS) {
-ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
- ap_send_fd: ap_get_filesize failed.);
-return 0;
+if (!r-chunked) {
+ap_bflush(r-connection-client);
+if (ap_get_filesize(len, fd) != APR_SUCCESS) {
+ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
+ ap_send_fd: ap_get_filesize failed.);
+return 0;
+}
+if (iol_sendfile(r-connection-client-iol, fd, len,
+ NULL, 0, 0) != APR_SUCCESS) {
+ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
+ ap_send_fd: iol_sendfile failed.);
+}
}
-if (iol_sendfile(r-connection-client-iol, fd, len,
- NULL, 0, 0) != APR_SUCCESS) {
-ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,
- ap_send_fd: iol_sendfile failed.);
+else {
+len = ap_send_fd_length(fd, r, -1);
}
#else
len = ap_send_fd_length(fd, r, -1);
1.16 +1 -0 apache-2.0/src/main/http_request.c
Index: http_request.c
===
RCS file: /home/cvs/apache-2.0/src/main/http_request.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- http_request.c2000/01/10 15:35:49 1.15
+++ http_request.c2000/01/12 18:20:43 1.16
@@ -845,6 +845,7 @@
rnew-server = r-server;
rnew-request_config = ap_create_request_config(rnew-pool);
rnew-htaccess = r-htaccess;
+rnew-chunked= r-chunked;
ap_set_sub_req_protocol(rnew, r);
fdir = ap_make_dirstr_parent(rnew-pool, r-filename);
cvs commit: apache-2.0/src acinclude.m4
sascha 00/01/12 12:41:59 Modified:src acinclude.m4 Log: gcc on AIX takes -mthreads. I wonder what they smoked during creating all those wonderful flags. Revision ChangesPath 1.15 +4 -1 apache-2.0/src/acinclude.m4 Index: acinclude.m4 === RCS file: /home/cvs/apache-2.0/src/acinclude.m4,v retrieving revision 1.14 retrieving revision 1.15 diff -u -u -r1.14 -r1.15 --- acinclude.m4 2000/01/11 13:10:56 1.14 +++ acinclude.m4 2000/01/12 20:41:57 1.15 @@ -197,7 +197,10 @@ ],[ APACHE_CHECK_GCC_ARG(-pthreads, [ CFLAGS=$CFLAGS -pthreads -])]) +],[ +APACHE_CHECK_GCC_ARG(-mthreads, [ +CFLAGS=$CFLAGS -mthreads +])])]) fi APACHE_THREAD_TEST
Re: cvs commit: apache-2.0/src acinclude.m4
On 12 Jan 2000 [EMAIL PROTECTED] wrote: sascha 00/01/12 12:41:59 Modified:src acinclude.m4 Log: gcc on AIX takes -mthreads. I wonder what they smoked during creating all those wonderful flags. Is this just on AIX or do we need to deal with this everywhere? Ryan ___ Ryan Bloom [EMAIL PROTECTED] 4205 S Miami Blvd RTP, NC 27709 Come to the first official Apache Software Foundation Conference! http://ApacheCon.Com/
cvs commit: apache-1.3/src/main util.c
marc00/01/12 12:58:00
Modified:src/main util.c
Log:
Fixup sizing of a string to be more intuitive and consistent. The
only functional change that this introduces is to bump down the
maximum hostname length by one, to what it should be.
Submitted by: Theo de Raadt [EMAIL PROTECTED]
Revision ChangesPath
1.176 +2 -2 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.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- util.c1999/12/01 20:55:03 1.175
+++ util.c2000/01/12 20:57:48 1.176
@@ -1937,7 +1937,7 @@
#ifndef MAXHOSTNAMELEN
#define MAXHOSTNAMELEN 256
#endif
-char str[MAXHOSTNAMELEN + 1];
+char str[MAXHOSTNAMELEN];
char *server_hostname;
struct hostent *p;
@@ -1949,7 +1949,7 @@
perror(Unable to gethostname);
exit(1);
}
-str[MAXHOSTNAMELEN] = '\0';
+str[sizeof(str) - 1] = '\0';
if ((!(p = gethostbyname(str))) || (!(server_hostname = find_fqdn(a,
p {
fprintf(stderr, %s: cannot determine local host name.\n,
ap_server_argv0);
