You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@hyperreal.org on 2000/01/19 03:09:09 UTC
cvs commit: apache-2.0/src/main http_core.c http_protocol.c
rbb 00/01/18 18:09:08
Modified: src/include ap_buf.h buff.h util_date.h
src/main http_core.c http_protocol.c
Log:
Cleanup a few things with the compile. There were also a few macro name
changes I missed earlier.
Revision Changes Path
1.3 +2 -0 apache-2.0/src/include/ap_buf.h
Index: ap_buf.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/ap_buf.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ap_buf.h 1999/06/20 19:34:28 1.2
+++ ap_buf.h 2000/01/19 02:08:56 1.3
@@ -58,7 +58,9 @@
#ifndef AP_BUF_H
#define AP_BUF_H
+#ifdef HAVE_SYS_UIO_H
#include <sys/uio.h> /* for struct iovec */
+#endif
typedef struct ap_bufel ap_bufel;
struct ap_bufel {
1.13 +2 -0 apache-2.0/src/include/buff.h
Index: buff.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/buff.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- buff.h 2000/01/19 01:14:27 1.12
+++ buff.h 2000/01/19 02:08:57 1.13
@@ -62,7 +62,9 @@
extern "C" {
#endif
+#ifdef HAVE_STDARG_H
#include <stdarg.h>
+#endif
#include "ap_iol.h"
#include "apr_lib.h"
#include "apr_general.h"
1.8 +1 -10 apache-2.0/src/include/util_date.h
Index: util_date.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/util_date.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- util_date.h 2000/01/19 01:14:31 1.7
+++ util_date.h 2000/01/19 02:08:57 1.8
@@ -67,17 +67,8 @@
*/
#include "apr_time.h"
-/* XXX - This section lists include files for OS-specific types that APR
- * should replace. Once they are replaced, this section should be
- * removed */
-#ifndef NO_MORE_OS_TYPES_IN_THIS_FILE
-#include "ap_config_auto.h"
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#endif /* NO_MORE_OS_TYPES_IN_THIS_FILE */
-#define BAD_DATE (time_t)0
+#define BAD_DATE (ap_time_t)0
API_EXPORT(int) ap_checkmask(const char *data, const char *mask);
API_EXPORT(ap_time_t) ap_parseHTTPdate(const char *date);
1.33 +2 -2 apache-2.0/src/main/http_core.c
Index: http_core.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_core.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- http_core.c 2000/01/19 01:15:04 1.32
+++ http_core.c 2000/01/19 02:09:01 1.33
@@ -2060,13 +2060,13 @@
ap_snprintf(sport, sizeof sport, "%u", (unsigned) ap_get_server_port(r));
if (conf->server_signature == srv_sig_withmail) {
- return ap_pstrcat(r->pool, prefix, "<ADDRESS>" SERVER_BASEVERSION
+ return ap_pstrcat(r->pool, prefix, "<ADDRESS>" AP_SERVER_BASEVERSION
" Server at <A HREF=\"mailto:",
r->server->server_admin, "\">",
ap_get_server_name(r), "</A> Port ", sport,
"</ADDRESS>\n", NULL);
}
- return ap_pstrcat(r->pool, prefix, "<ADDRESS>" SERVER_BASEVERSION
+ return ap_pstrcat(r->pool, prefix, "<ADDRESS>" AP_SERVER_BASEVERSION
" Server at ", ap_get_server_name(r), " Port ", sport,
"</ADDRESS>\n", NULL);
}
1.50 +2 -2 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.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- http_protocol.c 2000/01/19 01:15:09 1.49
+++ http_protocol.c 2000/01/19 02:09:03 1.50
@@ -1332,7 +1332,7 @@
r->connection->keepalive = -1;
}
else
- protocol = SERVER_PROTOCOL;
+ protocol = AP_SERVER_PROTOCOL;
#ifdef CHARSET_EBCDIC
ap_bsetflag(r->connection->client, B_EBCDIC2ASCII, 1);
@@ -1775,7 +1775,7 @@
if (r->expecting_100 && r->proto_num >= HTTP_VERSION(1,1)) {
/* sending 100 Continue interim response */
- ap_rvputs(r, SERVER_PROTOCOL, " ", status_lines[0], "\015\012\015\012",
+ ap_rvputs(r, AP_SERVER_PROTOCOL, " ", status_lines[0], "\015\012\015\012",
NULL);
ap_rflush(r);
}