cvs commit: apache-site/contributors index.html
cliff 99/03/14 22:31:59 Modified:contributors index.html Log: Updated my log outdated info. Revision ChangesPath 1.67 +6 -6 apache-site/contributors/index.html Index: index.html === RCS file: /home/cvs/apache-site/contributors/index.html,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- index.html1999/02/14 02:33:04 1.66 +++ index.html1999/03/15 06:31:58 1.67 @@ -426,14 +426,14 @@ P STRONGName:/STRONG A NAME=skolnickCliff Skolnick/ABR -STRONGemail:/STRONG A HREF=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/ABR -STRONGURL:/STRONG A HREF=http://www.organic.com/Staff/cliff;http://www.organic.com -/Staff/cliff/ABR -STRONGOrganization:/STRONG Organic OnlineBR -STRONGOccupation:/STRONG Networking and System CzarBR +STRONGemail:/STRONG A HREF=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/ABR +STRONGURL:/STRONG A HREF=http://www.steam.com/~cliff/;http://www.steam.com +/~cliff//ABR +STRONGOrganization:/STRONG steam.comBR +STRONGOccupation:/STRONG Network/Unix ConsultantBR STRONGLocation:/STRONG San Francisco, CA, USABR STRONGComments:/STRONG BR -STRONGOS Expertise:/STRONG Solaris 2.3, 2.4, 2.5BR +STRONGOS Expertise:/STRONG Solaris, *BSDBR P
cvs commit: apache-apr/pthreads/src/modules/standard mod_cgi.c mod_mime_magic.c
rbb 99/03/15 06:26:56
Modified:pthreads/src/include buff.h httpd.h
pthreads/src/main buff.c http_core.c http_protocol.c
util_script.c
pthreads/src/modules/proxy proxy_cache.c proxy_ftp.c
proxy_http.c proxy_util.c
pthreads/src/modules/standard mod_cgi.c mod_mime_magic.c
Log:
Changing the timeout logic a bit. Moved the timeouts into recvwithtimeout
and sendwithtimeout. Which I implemented on UNIX platforms. This brings
us a bit more in line with the Win32 code. This also removes that ugliness
with errno in the last timing patch.
Revision ChangesPath
1.3 +4 -3 apache-apr/pthreads/src/include/buff.h
Index: buff.h
===
RCS file: /home/cvs/apache-apr/pthreads/src/include/buff.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- buff.h1999/02/07 06:29:21 1.2
+++ buff.h1999/03/15 14:26:48 1.3
@@ -161,10 +161,10 @@
/* I/O */
API_EXPORT(int) ap_bread(BUFF *fb, void *buf, int nbyte);
-API_EXPORT(int) ap_bgets(char *s, int n, BUFF *fb);
+API_EXPORT(int) ap_bgets(char *s, int n, BUFF *fb, time_t sec);
API_EXPORT(int) ap_blookc(char *buff, BUFF *fb);
API_EXPORT(int) ap_bskiplf(BUFF *fb);
-API_EXPORT(int) ap_bwrite(BUFF *fb, const void *buf, int nbyte);
+API_EXPORT(int) ap_bwrite(BUFF *fb, const void *buf, int nbyte, time_t sec);
API_EXPORT(int) ap_bflush(BUFF *fb);
API_EXPORT(int) ap_bputs(const char *x, BUFF *fb);
API_EXPORT(int) ap_bvputs(BUFF *fb,...);
@@ -222,7 +222,8 @@
BUFF **pipe_err);
/* enable non-blocking operations */
-API_EXPORT(int) ap_bnonblock(BUFF *fb, int direction);
+API_EXPORT(int) ap_bnonblock(int fd);
+API_EXPORT(int) ap_bblock(int fd);
/* and get an fd to select() on */
API_EXPORT(int) ap_bfileno(BUFF *fb, int direction);
1.11 +1 -1 apache-apr/pthreads/src/include/httpd.h
Index: httpd.h
===
RCS file: /home/cvs/apache-apr/pthreads/src/include/httpd.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- httpd.h 1999/03/07 00:47:44 1.10
+++ httpd.h 1999/03/15 14:26:48 1.11
@@ -263,7 +263,7 @@
/* The timeout for waiting for keepalive timeout until next request */
#ifndef DEFAULT_KEEPALIVE_TIMEOUT
-#define DEFAULT_KEEPALIVE_TIMEOUT 15000
+#define DEFAULT_KEEPALIVE_TIMEOUT 300
#endif
/* The number of requests to entertain per connection */
1.4 +113 -45 apache-apr/pthreads/src/main/buff.c
Index: buff.c
===
RCS file: /home/cvs/apache-apr/pthreads/src/main/buff.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- buff.c1999/02/24 20:30:16 1.3
+++ buff.c1999/03/15 14:26:49 1.4
@@ -125,7 +125,7 @@
select() sometimes returns 1 even though the write will block. We must
work around this.
*/
-int sendwithtimeout(int sock, const char *buf, int len, int flags)
+int sendwithtimeout(int sock, const char *buf, int len, int flags, int sec)
{
int iostate = 1;
fd_set fdset;
@@ -184,7 +184,7 @@
}
-int recvwithtimeout(int sock, char *buf, int len, int flags)
+int recvwithtimeout(int sock, char *buf, int len, int flags, int sec)
{
int iostate = 1;
fd_set fdset;
@@ -227,6 +227,78 @@
return (rv);
}
+#else
+
+int sendwithtimeout(int sock, const char *buf, int len, int flags, time_t
sec)
+{
+fd_set fdset;
+struct timeval tv;
+int err = EAGAIN;
+int rv;
+
+tv.tv_sec = sec;
+if (tv.tv_sec == 0) {
+return (send(sock, buf, len, flags));
+}
+ap_bnonblock(sock);
+rv = send(sock, buf, len, flags);
+if (rv == -1) {
+err = errno;
+ if (err == EAGAIN || errno == EINTR) {
+ FD_ZERO(fdset);
+ FD_SET(sock, fdset);
+ tv.tv_usec = 0;
+do {
+ rv = select(FD_SETSIZE, NULL, fdset, NULL, tv);
+ } while (rv == -1 errno == EINTR);
+if (rv == -1 || rv == 0) {
+ err = errno;
+ }
+ else {
+ rv = send(sock, buf, len, flags);
+ }
+ }
+}
+ap_bblock(sock);
+return (rv);
+}
+
+int recvwithtimeout(int sock, char *buf, int len, int flags, time_t sec)
+{
+fd_set fdset;
+struct timeval tv;
+int err = EAGAIN;
+int rv;
+
+tv.tv_sec = sec;
+if (tv.tv_sec == 0) {
+ return (recv(sock, buf, len, flags));
+}
+ap_bnonblock(sock);
+rv = recv(sock, buf, len, flags);
+if (rv == -1) {
+
cvs commit: apache-apr/pthreads/src/main http_core.c http_main.c
rbb 99/03/15 07:34:52
Modified:pthreads/src/include http_conf_globals.h
pthreads/src/main http_core.c http_main.c
Log:
Remove the overflow logic. This code made the server harder to configure
properly, and the code was ugly. It also didn't add the performance
benefits we thought it would, so it is going away now.
Revision ChangesPath
1.8 +0 -1 apache-apr/pthreads/src/include/http_conf_globals.h
Index: http_conf_globals.h
===
RCS file: /home/cvs/apache-apr/pthreads/src/include/http_conf_globals.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- http_conf_globals.h 1999/02/23 19:11:19 1.7
+++ http_conf_globals.h 1999/03/15 15:34:49 1.8
@@ -75,7 +75,6 @@
#endif
extern int ap_threads_per_child;
extern int ap_acceptors_per_child;
-extern int ap_overflow;
extern int ap_idle_thread_threshold;
extern int ap_busy_thread_threshold;
extern int ap_max_requests_per_child;
1.10 +0 -13 apache-apr/pthreads/src/main/http_core.c
Index: http_core.c
===
RCS file: /home/cvs/apache-apr/pthreads/src/main/http_core.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- http_core.c 1999/03/15 14:26:49 1.9
+++ http_core.c 1999/03/15 15:34:50 1.10
@@ -2205,17 +2205,6 @@
return NULL;
}
-static const char *set_overflow(cmd_parms *cmd, void * dummy, char *arg)
-{
-const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
-if (err != NULL) {
-return err;
-}
-ap_overflow = atoi(arg);
-
-return NULL;
-}
-
static const char *set_max_requests(cmd_parms *cmd, void *dummy, char *arg)
{
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
@@ -2849,8 +2838,6 @@
Maximum number of idle children },
{ MaxServers, set_max_free_servers, NULL, RSRC_CONF, TAKE1,
Deprecated equivalent to MaxSpareServers },
-{ ExcessWorkers, set_overflow, NULL, RSRC_CONF, TAKE1,
- Number of connections to accept beyond the number of threads per child.},
{ IdleThreadThreshold, set_idle_threshold, NULL, RSRC_CONF, TAKE1,
Minimum number of idle threads, below which process is considered ready
for reaping. },
{ BusyThreadThreshold, set_busy_threshold, NULL, RSRC_CONF, TAKE1,
1.58 +1 -9 apache-apr/pthreads/src/main/http_main.c
Index: http_main.c
===
RCS file: /home/cvs/apache-apr/pthreads/src/main/http_main.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- http_main.c 1999/03/05 16:45:55 1.57
+++ http_main.c 1999/03/15 15:34:50 1.58
@@ -159,7 +159,6 @@
#endif
int ap_threads_per_child;
int ap_acceptors_per_child;
-int ap_overflow = 0;
int ap_max_requests_per_child;
int ap_idle_thread_threshold;
int ap_busy_thread_threshold;
@@ -2092,14 +2091,7 @@
ap_log_error(APLOG_MARK, APLOG_ALERT, server_conf,
pthread_sigmask);
}
-if (ap_overflow ap_acceptors_per_child)
-ap_overflow = ap_acceptors_per_child;
-else if (ap_overflow ap_acceptors_per_child) {
-temp = ap_overflow - ap_acceptors_per_child;
-ap_overflow -= ap_acceptors_per_child;
-}
-
-queue_init(csd_queue, ap_threads_per_child + temp, ap_overflow, pchild);
+queue_init(csd_queue, ap_threads_per_child, ap_acceptors_per_child,
pchild);
if (pthread_create(thread, NULL, thread_starter_thread,
child_num_arg)) {
ap_log_error(APLOG_MARK, APLOG_ALERT, server_conf,
cvs commit: apache-1.3 STATUS
jim 99/03/15 08:05:13 Modified:.STATUS Log: Add another patch... I will commit Ryan's and Fred's patches later today unless there are vetos Revision ChangesPath 1.646 +6 -1 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.645 retrieving revision 1.646 diff -u -r1.645 -r1.646 --- STATUS1999/03/14 21:59:19 1.645 +++ STATUS1999/03/15 16:05:11 1.646 @@ -1,5 +1,5 @@ 1.3 STATUS: - Last modified at [$Date: 1999/03/14 21:59:19 $] + Last modified at [$Date: 1999/03/15 16:05:11 $] Release: @@ -47,6 +47,11 @@ TCN additions and when the RVSA algorithm is used. Available Patches: + +* Ryan Bloom's [PATCH: AIX compiling bugs.] to remove SHARED_CORE + for AIX +Message-ID: [EMAIL PROTECTED] + Status: Jim +1 * Fred's [PATCH: srm.conf and access.conf refer to httpd.conf Message-ID: [EMAIL PROTECTED]
cvs commit: apache-apr/pthreads/src/main buff.c
rbb 99/03/15 10:22:33
Modified:pthreads/src/main buff.c
Log:
Fix recv and send withtimeout. I used recv and send instead or read and
write.
Revision ChangesPath
1.5 +7 -6 apache-apr/pthreads/src/main/buff.c
Index: buff.c
===
RCS file: /home/cvs/apache-apr/pthreads/src/main/buff.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- buff.c1999/03/15 14:26:49 1.4
+++ buff.c1999/03/15 18:22:31 1.5
@@ -238,10 +238,11 @@
tv.tv_sec = sec;
if (tv.tv_sec == 0) {
-return (send(sock, buf, len, flags));
+return (write(sock, buf, len));
}
ap_bnonblock(sock);
-rv = send(sock, buf, len, flags);
+rv = write(sock, buf, len);
+
if (rv == -1) {
err = errno;
if (err == EAGAIN || errno == EINTR) {
@@ -255,7 +256,7 @@
err = errno;
}
else {
- rv = send(sock, buf, len, flags);
+ rv = write(sock, buf, len);
}
}
}
@@ -272,10 +273,10 @@
tv.tv_sec = sec;
if (tv.tv_sec == 0) {
- return (recv(sock, buf, len, flags));
+ return (read(sock, buf, len));
}
ap_bnonblock(sock);
-rv = recv(sock, buf, len, flags);
+rv = read(sock, buf, len);
if (rv == -1) {
err = errno;
if (err == EAGAIN || errno == EINTR) {
@@ -289,7 +290,7 @@
err = errno;
}
else {
- rv = recv(sock, buf, len, flags);
+ rv = read(sock, buf, len);
if (rv == -1)
err = errno;
}
cvs commit: apache-1.3/htdocs/manual/mod mod_alias.html
lars99/03/15 14:14:41 Modified:htdocs/manual/mod mod_alias.html Log: Typo. PR: 4060 Submitted by: Axel Beckert [EMAIL PROTECTED] Reviewed by: Lars Revision ChangesPath 1.23 +1 -1 apache-1.3/htdocs/manual/mod/mod_alias.html Index: mod_alias.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/mod_alias.html,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- mod_alias.html1998/11/20 17:07:38 1.22 +++ mod_alias.html1999/03/15 22:14:39 1.23 @@ -286,7 +286,7 @@ P This directive makes the client know that the Redirect is only temporary (status 302). Exactly equivalent to CODERedirect -temporary/CODE. +temp/CODE. /P HR
cvs commit: apache-1.3/src/support apxs.pl
lars99/03/15 14:47:37
Modified:src/support apxs.pl
Log:
fix double quote bug.
PR: 4058
Submitted by: James Cloos [EMAIL PROTECTED]
Reviewed by: Ralf, Lars
Revision ChangesPath
1.20 +1 -1 apache-1.3/src/support/apxs.pl
Index: apxs.pl
===
RCS file: /export/home/cvs/apache-1.3/src/support/apxs.pl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- apxs.pl 1999/03/14 03:53:03 1.19
+++ apxs.pl 1999/03/15 22:47:36 1.20
@@ -91,7 +91,7 @@
##
## Initial shared object support check
##
-if (not -x `$CFG_SBINDIR/$CFG_TARGET`) {
+if (not -x $CFG_SBINDIR/$CFG_TARGET) {
print STDERR apxs:Error: $CFG_SBINDIR/$CFG_TARGET not found or not
executable\n;
exit(1);
}
