cvs commit: apache-1.3/src/support dbmmanage
rse 98/05/18 04:24:22
Modified:src CHANGES
src/support dbmmanage
Log:
Fix support script `dbmmanage': It was unable to handle some sort
of passwords, especially passwords with 0 chars.
PR: 2242
Revision ChangesPath
1.851 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.850
retrieving revision 1.851
diff -u -r1.850 -r1.851
--- CHANGES 1998/05/16 21:11:15 1.850
+++ CHANGES 1998/05/18 11:24:19 1.851
@@ -1,5 +1,9 @@
Changes with Apache 1.3b7
+ *) Fix support script `dbmmanage': It was unable to handle some sort
+ of passwords, especially passwords with 0 chars.
+ [Ralf S. Engelschall] PR#2242
+
*) WIN32: Clicking on Last Modified in a fancy index caused a crash.
Fixed.
[Ben Laurie] PR#2238
1.11 +1 -1 apache-1.3/src/support/dbmmanage
Index: dbmmanage
===
RCS file: /export/home/cvs/apache-1.3/src/support/dbmmanage,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- dbmmanage 1998/03/31 12:53:47 1.10
+++ dbmmanage 1998/05/18 11:24:21 1.11
@@ -134,7 +134,7 @@
my($c,$pwd);
print STDERR $prompt;
-while ($c = getc(STDIN) and $c ne \n and $c ne \r) {
+while (($c = getc(STDIN)) ne '' and $c ne \n and $c ne \r) {
$pwd .= $c;
}
cvs commit: apache-1.2/src CHANGES rfc1413.c
brian 98/05/18 14:49:28
Modified:src CHANGES rfc1413.c
Log:
See Message-ID: [EMAIL PROTECTED]
Revision ChangesPath
1.309 +2 -0 apache-1.2/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.2/src/CHANGES,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -r1.308 -r1.309
--- CHANGES 1998/05/11 19:56:04 1.308
+++ CHANGES 1998/05/18 21:49:26 1.309
@@ -1,5 +1,7 @@
Changes with Apache 1.2.7
+ *) Improve RFC1413 support. [Bob Beck [EMAIL PROTECTED]]
+
*) Support for NCR MP/RAS 3.0 [John Withers [EMAIL PROTECTED]]
*) Correct a protocol issue - always send the Accept-ranges: bytes
1.13 +31 -17apache-1.2/src/rfc1413.c
Index: rfc1413.c
===
RCS file: /export/home/cvs/apache-1.2/src/rfc1413.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rfc1413.c 1998/04/13 11:45:48 1.12
+++ rfc1413.c 1998/05/18 21:49:27 1.13
@@ -108,7 +108,8 @@
static int
get_rfc1413(int sock, const struct sockaddr_in *our_sin,
- const struct sockaddr_in *rmt_sin, char user[256], server_rec *srv)
+ const struct sockaddr_in *rmt_sin, char user[RFC1413_USERLEN+1],
+ server_rec *srv)
{
struct sockaddr_in rmt_query_sin, our_query_sin;
unsigned int rmt_port, our_port;
@@ -148,29 +149,42 @@
/* send the data */
ap_snprintf(buffer, sizeof(buffer), %u,%u\r\n,
ntohs(rmt_sin-sin_port),
ntohs(our_sin-sin_port));
-do i = write(sock, buffer, strlen(buffer));
-while (i == -1 errno == EINTR);
-if (i == -1)
-{
- log_unixerr(write, NULL, rfc1413: error sending request, srv);
- return -1;
+
+/* send query to server. Handle short write. */
+i = 0;
+while(i strlen(buffer)) {
+int j;
+j = write(sock, buffer+i, (strlen(buffer+i)));
+if (j 0 errno != EINTR) {
+ log_unixerr(write, NULL, rfc1413: error sending request, srv);
+ return -1;
+ }
+ else if (j 0) {
+ i+=j;
+ }
}
/*
- * Read response from server. We assume that all the data
- * comes in a single packet.
+ * Read response from server. - the response should be newline
+ * terminated according to rfc - make sure it doesn't stomp it's
+ * way out of the buffer.
*/
-do i = read(sock, buffer, RFC1413_MAXDATA);
-while (i == -1 errno == EINTR);
-if (i == -1)
-{
- log_unixerr(read, NULL, rfc1413: error reading response, srv);
- return -1;
+i = 0;
+memset(buffer, 0, sizeof(buffer));
+while((cp = strchr(buffer, '\n')) == NULL i sizeof(buffer) - 1) {
+int j;
+ j = read(sock, buffer+i, (sizeof(buffer) - 1) - i);
+ if (j 0 errno != EINTR) {
+ log_unixerr(read, NULL, rfc1413: error reading response, srv);
+ return -1;
+ }
+ else if (j 0) {
+ i+=j;
+ }
}
-buffer[i] = '\0';
-/* RFC1413_USERLEN = 512 */
+/* RFC1413_USERLEN = 512 */
if (sscanf(buffer, %u , %u : USERID :%*[^:]:%512s, rmt_port,
our_port,
user) != 3 || ntohs(rmt_sin-sin_port) != rmt_port
|| ntohs(our_sin-sin_port) != our_port) return -1;
cvs commit: apache-1.3/src/main rfc1413.c
brian 98/05/18 14:56:12
Modified:src CHANGES
src/main rfc1413.c
Log:
Improve RFC1413 support.
See Message-ID: [EMAIL PROTECTED]
Revision ChangesPath
1.852 +2 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.851
retrieving revision 1.852
diff -u -r1.851 -r1.852
--- CHANGES 1998/05/18 11:24:19 1.851
+++ CHANGES 1998/05/18 21:56:06 1.852
@@ -1,5 +1,7 @@
Changes with Apache 1.3b7
+ *) Improve RFC1413 support. [Bob Beck [EMAIL PROTECTED]]
+
*) Fix support script `dbmmanage': It was unable to handle some sort
of passwords, especially passwords with 0 chars.
[Ralf S. Engelschall] PR#2242
1.24 +32 -18apache-1.3/src/main/rfc1413.c
Index: rfc1413.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/rfc1413.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- rfc1413.c 1998/04/11 12:00:31 1.23
+++ rfc1413.c 1998/05/18 21:56:11 1.24
@@ -103,7 +103,8 @@
/* bind_connect - bind both ends of a socket */
/* Ambarish fix this. Very broken */
static int get_rfc1413(int sock, const struct sockaddr_in *our_sin,
- const struct sockaddr_in *rmt_sin, char user[256], server_rec *srv)
+const struct sockaddr_in *rmt_sin,
+char user[RFC1413_USERLEN+1], server_rec *srv)
{
struct sockaddr_in rmt_query_sin, our_query_sin;
unsigned int rmt_port, our_port;
@@ -144,30 +145,43 @@
/* send the data */
buflen = ap_snprintf(buffer, sizeof(buffer), %u,%u\r\n,
ntohs(rmt_sin-sin_port),
ntohs(our_sin-sin_port));
-do
- i = write(sock, buffer, buflen);
-while (i == -1 errno == EINTR);
-if (i == -1) {
- ap_log_error(APLOG_MARK, APLOG_CRIT, srv,
- write: rfc1413: error sending request);
- return -1;
+
+/* send query to server. Handle short write. */
+i = 0;
+while(i strlen(buffer)) {
+int j;
+ j = write(sock, buffer+i, (strlen(buffer+i)));
+ if (j 0 errno != EINTR) {
+ ap_log_error(APLOG_MARK, APLOG_CRIT, srv,
+write: rfc1413: error sending request);
+ return -1;
+ }
+ else if (j 0) {
+ i+=j;
+ }
}
/*
- * Read response from server. We assume that all the data
- * comes in a single packet.
+ * Read response from server. - the response should be newline
+ * terminated according to rfc - make sure it doesn't stomp it's
+ * way out of the buffer.
*/
-do
- i = read(sock, buffer, RFC1413_MAXDATA);
-while (i == -1 errno == EINTR);
-if (i == -1) {
- ap_log_error(APLOG_MARK, APLOG_CRIT, srv,
- read: rfc1413: error reading response);
- return -1;
+i = 0;
+memset(buffer, 0, sizeof(buffer));
+while((cp = strchr(buffer, '\n')) == NULL i sizeof(buffer) - 1) {
+int j;
+ j = read(sock, buffer+i, (sizeof(buffer) - 1) - i);
+ if (j 0 errno != EINTR) {
+ap_log_error(APLOG_MARK, APLOG_CRIT, srv,
+ read: rfc1413: error reading response);
+return -1;
+ }
+ else if (j 0) {
+ i+=j;
+ }
}
-buffer[i] = '\0';
/* RFC1413_USERLEN = 512 */
if (sscanf(buffer, %u , %u : USERID :%*[^:]:%512s, rmt_port,
our_port,
user) != 3 || ntohs(rmt_sin-sin_port) != rmt_port
cvs commit: apache-1.3/htdocs/manual/mod core.html
brian 98/05/18 15:01:09 Modified:htdocs/manual/mod core.html Log: Fix broken link, add note about maxclients. Revision ChangesPath 1.117 +3 -2 apache-1.3/htdocs/manual/mod/core.html Index: core.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/core.html,v retrieving revision 1.116 retrieving revision 1.117 diff -u -r1.116 -r1.117 --- core.html 1998/05/11 20:08:04 1.116 +++ core.html 1998/05/18 22:01:08 1.117 @@ -1303,7 +1303,7 @@ STRONGSee Also:/STRONG A HREF=../bind.htmlSetting which addresses and ports Apache uses/ABR STRONGSee Also:/STRONG -A HREF=../misc/known_bugs.html#listenbugKnown Bugs/A/P +A HREF=http//www.apache.org/info/known_bugs.html#listenbugKnown Bugs/A/P HR H2A NAME=listenbacklogListenBacklog directive/A/H2 @@ -1590,7 +1590,8 @@ The MaxClients directive sets the limit on the number of simultaneous requests that can be supported; not more than this number of child server -processes will be created.PHR +processes will be created. To configure more than 256 clients, you must +edit the HARD_SERVER_LIMIT entry in httpd.h and recompile.PHR H2A name=maxkeepaliverequestsMaxKeepAliveRequests directive/A/H2 A
