Changeset 1838

Timestamp:

08/15/08 00:27:24 (3 months ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/ChangeLog (modified) (1 diff)
• cherokee/trunk/cherokee/connection.c (modified) (1 diff)
• cherokee/trunk/cherokee/socket.c (modified) (7 diffs)
• cherokee/trunk/cherokee/socket.h (modified) (1 diff)
• cherokee/trunk/cherokee/thread.c (modified) (5 diffs)
• cherokee/trunk/cherokee/thread.h (modified) (1 diff)

cherokee/trunk/ChangeLog

@@ -1 +1 @@
-2008-08-14  Alvaro Lopez Ortega  <alvaro@alobbs.com>
+
+        * cherokee/socket.c, cherokee/socket.h, cherokee/thread.c,
+        cherokee/thread.h, cherokee/connection.c: Fixes the TLS/SSL
+        support. It adds support for a new concept within the server: a
+        cherokee_buffer_t can have pending information to be read, so in
+        addition to the file descriptor this property must be checked
+        whenever it real status need to be known.
-
-        * qa/run-tests.py, qa/base.py: Fixes two minor issues.

cherokee/trunk/cherokee/connection.c

@@ -717 +717 @@
-        case ret_eof:
-        case ret_error:
+                return ret;
+
-        case ret_eagain:
-
+
+
+
+
-
-        default:

cherokee/trunk/cherokee/socket.c

@@ -1141 +1141 @@
-
-        if (likely (len > 0)) {
-
+
+
+
-                return ret_ok;
-        }
@@ -1171 +1173 @@
-#elif defined (HAVE_OPENSSL)
-        len = SSL_read (socket->session, buf, buf_size);
-
-        if (likely (len > 0)) {
-                *pcnt_read = len;
+                if (SSL_pending (socket->session))
+                        return ret_eagain;
-                return ret_ok;
-        }
@@ -1184 +1187 @@
-        {       /* len < 0 */
-                int re;
+                int error = errno;
-
-                re = SSL_get_error (socket->session, len);
@@ -1195 +1199 @@
-                case SSL_ERROR_SSL:         
-                        return ret_error;
+                case SSL_ERROR_SYSCALL:
+                        switch (error) {
+                        case EPIPE:
+                        case ECONNRESET:
+                                socket->status = socket_closed;
+                                return ret_eof;
+                        default:
+                                PRINT_ERRNO (error, "SSL_read: unknown errno: ${errno}\n");
+                        }
+                        return ret_error;
-                }
-
@@ -1207 +1221 @@
-#endif  /* HAVE_TLS */
-
+}
+
+
+int
+cherokee_socket_pending_read (cherokee_socket_t *socket)
+{
+        if (socket->is_tls != TLS)
+                return 0;
+
+        if (unlikely ((socket->status != socket_reading) &&
+                      (socket->status != socket_writing)))
+                return 0;
+
+#ifdef HAVE_TLS
+# ifdef HAVE_GNUTLS
+        return (gnutls_record_check_pending (socket->session) > 0);
+# elif defined (HAVE_OPENSSL)
+        return (SSL_pending (socket->session) > 0);
+# endif
+#endif
-}
-
@@ -1375 +1409 @@
- */
-ret_t      
-
+
+
+
+
-{
-        ret_t    ret;
@@ -1387 +1424 @@
-
-        starting = buf->buf + buf->len;
-
+
-        ret = cherokee_socket_read (socket, starting, count, pcnt_read);
-ret == ret_ok
+*pcnt_read > 0
-                buf->len += *pcnt_read;
-                buf->buf[buf->len] = '\0';

cherokee/trunk/cherokee/socket.h

@@ -191 +191 @@
-ret_t cherokee_socket_shutdown          (cherokee_socket_t *socket, int how);
-ret_t cherokee_socket_accept            (cherokee_socket_t *socket, int server_socket);
+int   cherokee_socket_pending_read      (cherokee_socket_t *socket);
-
-ret_t cherokee_socket_set_client        (cherokee_socket_t *socket, unsigned short int type);

cherokee/trunk/cherokee/thread.c

@@ -155 +155 @@
-        n->polling_list_num   = 0;
-        n->reuse_list_num     = 0;
+
-        n->pending_conns_num  = 0;
+        n->pending_read_num   = 0;
-
-        n->fastcgi_servers    = NULL;
@@ -581 +583 @@
-                 */
-                if ((conn->traffic_next < thd->bogo_now) &&
-conn->rx != 0) &&
-    (conn->tx != 0)) 
+(conn->rx != 0) || (conn->tx != 0)))
+
-                        cherokee_connection_update_vhost_traffic (conn);
-                }
@@ -603 +605 @@
-                                continue;
-                        case 0:
-
+
+
-                        }
-                }
@@ -1509 +1512 @@
-        }
-
+        if (thd->pending_read_num > 0) {
+                fdwatch_msecs         = 0;
+                thd->pending_read_num = 0;
+        }
+
-        re = cherokee_fdpoll_watch (thd->fdpoll, fdwatch_msecs);
-        if (re <= 0)
@@ -1852 +1860 @@
-                fdwatch_msecs          = 0;
-                thd->pending_conns_num = 0;
+        }
+
+        if (thd->pending_read_num > 0) {
+                fdwatch_msecs         = 0;
+                thd->pending_read_num = 0;
-        }
-

cherokee/trunk/cherokee/thread.h

@@ -86 +86 @@
-
-        int                     pending_conns_num;  /* Waiting pipelining connections */
-
+
+
-        struct {
-                uint32_t        continuous;