Author: dreid
Date: Sat Jun 24 07:16:37 2006
New Revision: 416920

URL: http://svn.apache.org/viewvc?rev=416920&view=rev
Log:
Fix non-SSL build.
Tests now build/run even without ssl support, so reflect that in
their code.

Modified:
    apr/apr-util/trunk/ssl/apr_ssl_socket.c
    apr/apr-util/trunk/test/Makefile.in
    apr/apr-util/trunk/test/sockperf.c
    apr/apr-util/trunk/test/testssl.c

Modified: apr/apr-util/trunk/ssl/apr_ssl_socket.c
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/ssl/apr_ssl_socket.c?rev=416920&r1=416919&r2=416920&view=diff
==============================================================================
--- apr/apr-util/trunk/ssl/apr_ssl_socket.c (original)
+++ apr/apr-util/trunk/ssl/apr_ssl_socket.c Sat Jun 24 07:16:37 2006
@@ -278,8 +278,13 @@
     return APR_ENOTIMPL;
 }
 
-APU_DECLARE(apr_status_t) apr_pollset_remove_ssl_socket(apr_pollset_t *pollset,
-                                                        apr_ssl_socket_t *sock)
+APU_DECLARE(apr_status_t) apr_pollset_remove_ssl_socket(apr_ssl_socket_t *sock)
+{
+    return APR_ENOTIMPL;
+}
+
+APU_DECLARE(apr_status_t) apr_ssl_socket_set_poll_events(apr_ssl_socket_t *sock,
+                                                         apr_int16_t events)
 {
     return APR_ENOTIMPL;
 }

Modified: apr/apr-util/trunk/test/Makefile.in
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/test/Makefile.in?rev=416920&r1=416919&r2=416920&view=diff
==============================================================================
--- apr/apr-util/trunk/test/Makefile.in (original)
+++ apr/apr-util/trunk/test/Makefile.in Sat Jun 24 07:16:37 2006
@@ -87,7 +87,7 @@
 
 sockperf_OBJECTS = sockperf.lo
 sockperf_LDADD =  $(TARGET_LIB_PATH)
-sockperf: $(echod_OBJECTS) $(sockperf_LDADD)
+sockperf: $(sockperf_OBJECTS) $(sockperf_LDADD)
 	$(LINK) $(APRUTIL_LDFLAGS) $(sockperf_OBJECTS) $(sockperf_LDADD) \
                 $(PROGRAM_DEPENDENCIES)
 

Modified: apr/apr-util/trunk/test/sockperf.c
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/test/sockperf.c?rev=416920&r1=416919&r2=416920&view=diff
==============================================================================
--- apr/apr-util/trunk/test/sockperf.c (original)
+++ apr/apr-util/trunk/test/sockperf.c Sat Jun 24 07:16:37 2006
@@ -240,7 +240,8 @@
             totTime += results[i].msecs[j];
         }
         printf("<\n");
-        printf("\t  Average: %6Ld\n", totTime / results[i].iters);
+        if (totTime > 0) 
+            printf("\t  Average: %6Ld\n", totTime / results[i].iters);
     }
 
     return 0;

Modified: apr/apr-util/trunk/test/testssl.c
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/test/testssl.c?rev=416920&r1=416919&r2=416920&view=diff
==============================================================================
--- apr/apr-util/trunk/test/testssl.c (original)
+++ apr/apr-util/trunk/test/testssl.c Sat Jun 24 07:16:37 2006
@@ -195,8 +195,6 @@
     apr_pollset_t *pollset;
     struct sslTestCase *mytest;
 
-#ifdef APU_HAVE_SSL
-
     (void) apr_initialize();
     apr_pool_create(&pool, NULL);
     atexit(apr_terminate);
@@ -210,7 +208,6 @@
 
     if (apr_ssl_factory_create(&asf, NULL, NULL, NULL, pool) != APR_SUCCESS) {
         fprintf(stderr, "Unable to create client factory\n");
-
     } else {
         int i;
         for(i = 0; tests[i].host; i++) {
@@ -234,8 +231,6 @@
 
     apr_pollset_destroy(pollset);
     apr_pool_destroy(pool);
-
-#endif /* APU_HAVE_SSL */
 
     return 0;
 }