apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dr...@apache.org
Subject svn commit: r415924 - in /apr/apr-util/trunk/ssl: apr_ssl.c apr_ssl_socket.c
Date Wed, 21 Jun 2006 06:30:57 GMT
Author: dreid
Date: Tue Jun 20 23:30:57 2006
New Revision: 415924

URL: http://svn.apache.org/viewvc?rev=415924&view=rev
Log:
Add stubs for ssl code when we're building sans SSL.

Highlighted by Daniel Rand (Hope I spelt your name right) when
building httpd the exports code picked up on the prototypes
but didn't find symbols - now it's happy and with this patch
httpd builds again.

Modified:
    apr/apr-util/trunk/ssl/apr_ssl.c
    apr/apr-util/trunk/ssl/apr_ssl_socket.c

Modified: apr/apr-util/trunk/ssl/apr_ssl.c
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/ssl/apr_ssl.c?rev=415924&r1=415923&r2=415924&view=diff
==============================================================================
--- apr/apr-util/trunk/ssl/apr_ssl.c (original)
+++ apr/apr-util/trunk/ssl/apr_ssl.c Tue Jun 20 23:30:57 2006
@@ -25,13 +25,13 @@
 
 #include "apu_config.h"
 
-#ifdef APU_HAVE_SSL
 
 #include "apu.h"
 #include "apr_ssl.h"
-#include "apr_ssl_private.h"
 
-#include <stdio.h>
+#ifdef APU_HAVE_SSL
+
+#include "apr_ssl_private.h"
 
 static int sslInit = 0;
 
@@ -67,5 +67,16 @@
     return APR_SUCCESS;
 }
 
+#else /* ! APU_HAVE_SSL */
+
+APU_DECLARE(apr_status_t) apr_ssl_factory_create(apr_ssl_factory_t **fact,
+                                                 const char *privateKeyFn,
+                                                 const char *certFn,
+                                                 const char *digestType,
+                                                 apr_pool_t *p)
+
+{
+    return APR_ENOTIMPL;
+}
 
 #endif /* APU_HAVE_SSL */

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=415924&r1=415923&r2=415924&view=diff
==============================================================================
--- apr/apr-util/trunk/ssl/apr_ssl_socket.c (original)
+++ apr/apr-util/trunk/ssl/apr_ssl_socket.c Tue Jun 20 23:30:57 2006
@@ -24,13 +24,12 @@
 #include "apr_general.h"
 
 #include "apu_config.h"
+#include "apu.h"
+#include "apr_ssl.h"
 
 #ifdef APU_HAVE_SSL
 
-#include "apu.h"
-#include "apr_ssl.h"
 #include "apr_ssl_private.h"
-
 #include "apr_network_io.h"
 #include "apr_portable.h"
 
@@ -38,7 +37,8 @@
 
 
 APU_DECLARE(apr_status_t) apr_ssl_socket_create(apr_ssl_socket_t **sock,
-                                                int family, int type, int protocol,
+                                                int family, int type,
+                                                int protocol,
                                                 apr_ssl_factory_t *asf,
                                                 apr_pool_t *p)
 {
@@ -57,7 +57,8 @@
     if (!sslSock)
         return ENOMEM;
 
-    if (apr_socket_create(&sslSock->plain, family, type, protocol, thepool) != APR_SUCCESS)
{
+    if (apr_socket_create(&sslSock->plain, family, type, protocol, thepool)
+        != APR_SUCCESS) {
         return -1;
     }
     sslSock->pool = thepool;
@@ -155,5 +156,57 @@
     return APR_SUCCESS;
 }
 
+#else /* ! APU_HAVE_SSL */
+
+APU_DECLARE(apr_status_t) apr_ssl_socket_create(apr_ssl_socket_t **sock,
+                                                int family, int type,
+                                                int protocol,
+                                                apr_ssl_factory_t *asf,
+                                                apr_pool_t *p)
+{
+    return APR_ENOTIMPL;
+}
+
+APU_DECLARE(apr_status_t) apr_ssl_socket_close(apr_ssl_socket_t *sock)
+{
+    return APR_ENOTIMPL;
+}
+
+APU_DECLARE(apr_status_t) apr_ssl_socket_connect(apr_ssl_socket_t *sock,
+                                                 apr_sockaddr_t *sa)
+{
+    return APR_ENOTIMPL;
+}
+
+APU_DECLARE(apr_status_t) apr_ssl_socket_send(apr_ssl_socket_t *sock,
+                                              const char *buf,
+                                              apr_size_t *len)
+{
+    return APR_ENOTIMPL;
+}
+
+APU_DECLARE(apr_status_t) apr_ssl_socket_recv(apr_ssl_socket_t * sock,
+                                              char *buf, apr_size_t *len)
+{
+    return APR_ENOTIMPL;
+}
+
+APU_DECLARE(apr_status_t) apr_ssl_socket_bind(apr_ssl_socket_t *sock,
+                                              apr_sockaddr_t *sa)
+{
+    return APR_ENOTIMPL;
+}
+
+APU_DECLARE(apr_status_t) apr_ssl_socket_listen(apr_ssl_socket_t *sock,
+                                                apr_int32_t backlog)
+{
+    return APR_ENOTIMPL;
+}
+APU_DECLARE(apr_status_t) apr_ssl_socket_accept(apr_ssl_socket_t **news,
+                                                apr_ssl_socket_t *sock,
+                                                apr_pool_t *conn)
+{
+    return APR_ENOTIMPL;
+}
 
 #endif /* APU_HAVE_SSL */



Mime
View raw message