Changeset 2074

Timestamp:

02/12/2008 02:17:40 PM (7 months ago)

Author:

jan

Message:

fixed error-msg on connection-shutdown if memory-chunks are sent
(SSL_ERROR_ZERO_RETURN).

for the file-chunks we handled it correctly already

Files:

• trunk/src/network_openssl.c (modified) (3 diffs)

trunk/src/network_openssl.c

@@ -46 +46 @@
                 len = SSL_read(sock->ssl, b->ptr, b->size - 1);
 
-                if (len < 0) {
+                /**
+                 * man SSL_read:
+                 *
+                 * >0   is success
+                 * 0    is connection close
+                 * <0   is error 
+                 */
+                if (len <= 0) {
                         int r, ssl_err;
 
@@ -82 +89 @@
                                 return NETWORK_STATUS_FATAL_ERROR;
                         case SSL_ERROR_ZERO_RETURN:
-                                /* clean shutdown on the remote side */
-
-                                if (r == 0) {
-                                        /* FIXME: later */
-                                }
-
-                                /* fall through */
+                                if (len == 0) {
+                                        /* clean shutdown on the remote side */
+                                        return NETWORK_STATUS_CONNECTION_CLOSE;
+                                }
+                                /* fall through otherwise */
                         default:
                                 while((ssl_err = ERR_get_error())) {
@@ -97 +102 @@
                                 return NETWORK_STATUS_FATAL_ERROR;
                         }
-                } else if (len == 0) {
-                        return NETWORK_STATUS_FATAL_ERROR;
                 } else {
                         b->used += len;