[GNUnet-SVN] r33894 - gnunet/src/transport

[gnunet]

Author: amatus
Date: 2014-07-02 17:27:39 +0200 (Wed, 02 Jul 2014)
New Revision: 33894

Modified:
   gnunet/src/transport/plugin_transport_http_server.c
Log:
Simplify HTTP server session cleanup even more

Allow HTTP clients to get disconnected without deleting
their session so they can re-connect quickly. This also
works for XHR clients which need to disconnect to work.


Modified: gnunet/src/transport/plugin_transport_http_server.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_server.c 2014-07-02 12:51:48 UTC 
(rev 33893)
+++ gnunet/src/transport/plugin_transport_http_server.c 2014-07-02 15:27:39 UTC 
(rev 33894)
@@ -1905,16 +1905,8 @@
                                                s->address->address,
                                                s->address->address_length));
     s->server_send = NULL;
-    if (! ( (0 != (sc->options & OPTION_LONG_POLL)) &&
-            (NULL != s->server_recv) ) )
-    {
-      server_delete_session (s);
-      GNUNET_free (sc);
-      plugin->cur_connections--;
-      return;
-    }
   }
-  if (sc->direction == _RECEIVE)
+  else if (sc->direction == _RECEIVE)
   {
     LOG (GNUNET_ERROR_TYPE_DEBUG,
          "Peer `%s' connection %p PUT on address `%s' disconnected\n",
@@ -1932,19 +1924,6 @@
   }
   GNUNET_free (sc);
   plugin->cur_connections--;
-
-  if ( (NULL == s->server_send) &&
-       (NULL == s->server_recv) )
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Peer `%s' on address `%s' disconnected\n",
-         GNUNET_i2s (&s->target),
-         http_common_plugin_address_to_string (plugin->protocol,
-                                               s->address->address,
-                                               s->address->address_length));
-
-    server_delete_session (s);
-  }
 }