jfclere 2004/07/29 01:12:57
Modified: ajp/ajplib/test testajp.c
Log:
Don't include httpd_wrap.h that is done in ajp.h.
Conditionaly add APR_PROTO_TCP to apr_socket_create().
Revision Changes Path
1.6 +3 -1 jakarta-tomcat-connectors/ajp/ajplib/test/testajp.c
Index: testajp.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/ajp/ajplib/test/testajp.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- testajp.c 29 Jul 2004 07:57:10 -0000 1.5
+++ testajp.c 29 Jul 2004 08:12:57 -0000 1.6
@@ -30,7 +30,6 @@
#include "apr_optional_hooks.h"
#include "apr_buckets.h"
-#include "httpd_wrap.h"
#include "ajp.h"
#if APR_HAVE_NETINET_IN_H
@@ -61,6 +60,9 @@
port, 0, pool)) != APR_SUCCESS)
return rv;
if ((rv = apr_socket_create(socket, remote_sa->family, SOCK_STREAM,
+#if (APR_MAJOR_VERSION > 0)
+ APR_PROTO_TCP,
+#endif
pool)) != APR_SUCCESS)
return rv;
if ((rv = apr_socket_timeout_set(*socket,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
