martin 99/07/07 08:32:00
Modified: mpm/src/main http_connection.c http_log.c http_protocol.c
http_request.c
Log:
Sorry, but using C comments in place of C++ comments
makes life for me and my compiler much easier.
Revision Changes Path
1.9 +3 -3 apache-2.0/mpm/src/main/http_connection.c
Index: http_connection.c
===================================================================
RCS file: /home/cvs/apache-2.0/mpm/src/main/http_connection.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- http_connection.c 1999/07/06 21:32:10 1.8
+++ http_connection.c 1999/07/07 15:31:58 1.9
@@ -100,14 +100,14 @@
#ifdef USE_SO_LINGER
#define NO_LINGCLOSE /* The two lingering options are exclusive */
-static void sock_enable_linger(int s) // ZZZZZ abstract the socket, s
+static void sock_enable_linger(int s) /* // ZZZZZ abstract the socket, s */
{
- struct linger li; // ZZZZZ SocketOptions...
+ struct linger li; /* // ZZZZZ SocketOptions... */
li.l_onoff = 1;
li.l_linger = MAX_SECS_TO_LINGER;
- if (setsockopt(s, SOL_SOCKET, SO_LINGER, // ZZZZZ abstract, return
SUCCESS or not
+ if (setsockopt(s, SOL_SOCKET, SO_LINGER, /* // ZZZZZ abstract, return
SUCCESS or not */
(char *) &li, sizeof(struct linger)) < 0) {
ap_log_error(APLOG_MARK, APLOG_WARNING, server_conf,
"setsockopt: (SO_LINGER)");
1.2 +1 -1 apache-2.0/mpm/src/main/http_log.c
Index: http_log.c
===================================================================
RCS file: /home/cvs/apache-2.0/mpm/src/main/http_log.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- http_log.c 1999/06/18 18:39:30 1.1
+++ http_log.c 1999/07/07 15:31:58 1.2
@@ -409,7 +409,7 @@
FORMAT_MESSAGE_FROM_SYSTEM,
NULL,
nErrorCode,
- MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
+ MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* // Default language */
(LPTSTR) errstr + len,
sizeof(errstr) - len,
NULL
1.9 +3 -3 apache-2.0/mpm/src/main/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /home/cvs/apache-2.0/mpm/src/main/http_protocol.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- http_protocol.c 1999/07/06 21:32:10 1.8
+++ http_protocol.c 1999/07/07 15:31:58 1.9
@@ -800,11 +800,11 @@
* have to block during a read.
*/
/* TODO: re-implement SAFEREAD external to BUFF using a layer */
- //ap_bsetflag(conn->client, B_SAFEREAD, 1);
+ /* //ap_bsetflag(conn->client, B_SAFEREAD, 1); */
ap_bflush(conn->client);
while ((len = getline(l, sizeof(l), conn->client, 0)) <= 0) {
if ((len < 0) || ap_bgetflag(conn->client, B_EOF)) {
- //ap_bsetflag(conn->client, B_SAFEREAD, 0);
+ /* //ap_bsetflag(conn->client, B_SAFEREAD, 0); */
/* this is a hack to make sure that request time is set,
* it's not perfect, but it's better than nothing
*/
@@ -825,7 +825,7 @@
#endif
*/
- //ap_bsetflag(conn->client, B_SAFEREAD, 0);
+ /* //ap_bsetflag(conn->client, B_SAFEREAD, 0); */
r->request_time = time(NULL);
r->the_request = ap_pstrdup(r->pool, l);
1.7 +1 -1 apache-2.0/mpm/src/main/http_request.c
Index: http_request.c
===================================================================
RCS file: /home/cvs/apache-2.0/mpm/src/main/http_request.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- http_request.c 1999/07/06 21:32:11 1.6
+++ http_request.c 1999/07/07 15:31:59 1.7
@@ -1243,7 +1243,7 @@
* it's the application that's stalled.
*/
/* TODO: re-implement ap_bhalfduplex... not sure how yet */
- //ap_bhalfduplex(r->connection->client);
+ /* //ap_bhalfduplex(r->connection->client); */
ap_log_transaction(r);
}
