Changeset 667

Timestamp:

03/13/07 23:46:45 (2 years ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/ChangeLog (modified) (1 diff)
• cherokee/trunk/cherokee/socket.c (modified) (8 diffs)
• cherokee/trunk/configure.in (modified) (1 diff)

cherokee/trunk/ChangeLog

@@ +1 @@
+2007-03-13  A.D.F  <adefacc@tin.it>
+
+        * cherokee/socket.c:
+        - cherokee_socket_read(), cherokee_socket_write*():
+          - GNUTLS_E_INTERRUPTED is used only if its value
+            is not equal to GNUTLS_E_AGAIN;
+        - cherokee_socket_writev():
+          - don't increment "vector" because we use vector[i].*
+            not vector->*;
+          - micro-fix to not return ret_again if at least 1 bytes
+            has been sent.
+        
-2007-03-13  Alvaro Lopez Ortega  <alvaro@alobbs.com>
-

cherokee/trunk/cherokee/socket.c

@@ -407 +407 @@
-
-        switch (re) {
+#if (GNUTLS_E_INTERRUPTED != GNUTLS_E_AGAIN)
+        case GNUTLS_E_INTERRUPTED:
+#endif
-        case GNUTLS_E_AGAIN:
-                return ret_eagain;
-
-
-
-
+
+
-        if (re < 0) {
-                PRINT_ERROR ("ERROR: Init GNUTLS: Handshake has failed: %s\n", gnutls_strerror(re));
@@ -929 +930 @@
-                                socket->status = socket_closed;
-                                return ret_eof;
+#if (GNUTLS_E_INTERRUPTED != GNUTLS_E_AGAIN)
-                        case GNUTLS_E_INTERRUPTED:
+#endif
-                        case GNUTLS_E_AGAIN:           
-                                return ret_eagain;
@@ -1067 +1070 @@
-                switch (len) {
-                case GNUTLS_E_PUSH_ERROR:
-                case GNUTLS_E_INTERRUPTED:              
-                case GNUTLS_E_INVALID_SESSION:
-                case GNUTLS_E_UNEXPECTED_PACKET_LENGTH:
-                        socket->status = socket_closed;
-                        return ret_eof;
+#if (GNUTLS_E_INTERRUPTED != GNUTLS_E_AGAIN)
+                case GNUTLS_E_INTERRUPTED:              
+#endif
-                case GNUTLS_E_AGAIN:
-                        return ret_eagain;
@@ -1140 +1145 @@
-#endif
-        {
-
+ = 0
-#ifdef _WIN32
-                int i;
@@ -1146 +1151 @@
-
-                for (i = 0, re = 0, total = 0; i < vector_len; i++) {
+                        if (vector[i].iov_len == 0)
+                                continue;
-                        re = send (SOCKET_FD(socket), vector[i].iov_base, vector[i].iov_len, 0);
-                        if (re < 0)
-                                break;
+
-                        total += re;
+
+                        /* if it is a partial send, then stop sending data
+                         */
-                        if (re != vector[i].iov_len)
-                                break;
@@ -1231 +1242 @@
-                size_t cnt;
-                
-, vector++
+
-
-                        if (vector[i].iov_base == NULL || vector[i].iov_len == 0)
@@ -1239 +1250 @@
-                        ret = cherokee_socket_write (socket, vector[i].iov_base, vector[i].iov_len, &cnt);
-                        *pcnt_written += cnt;
-
-
+
+ && cnt == vector[i].iov_len
-                                continue;
-
-
+ || cnt != vector[i].iov_len
-                         */
-                        if (*pcnt_written != 0)
-                                return ret_ok;
+
-                        /* Nothing has been written, return error code.
-                         */
@@ -1602 +1614 @@
-                if (re < 0) {
-                        switch (re) {
+#if (GNUTLS_E_INTERRUPTED != GNUTLS_E_AGAIN)
+                        case GNUTLS_E_INTERRUPTED:
+#endif
-                        case GNUTLS_E_AGAIN:
-                        case GNUTLS_E_INTERRUPTED:
-                                break;
-                        default:

cherokee/trunk/configure.in

@@ -418 +418 @@
-
-
-
-
-
-dnl
-dnl Pthread