[svn r26332] get rid of the zip ready stuff

diff --git a/src/s_serv.c b/src/s_serv.c
index e29fdba03e2e5dc88447ef10e0f64a9119d281e0..ed8f0376981816f8e2165d450e873d734e76d24b 100644 (file)
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -892,8 +892,7 @@ server_estab(struct Client *client_p)
 
        free_pre_client(client_p);
 
-       if (!IsCapable(client_p, CAP_ZIP))
-               send_pop_queue(client_p);
+       send_pop_queue(client_p);
 
        return 0;
 }

diff --git a/src/sslproc.c b/src/sslproc.c
index f05053847054805da4964bccb6fe70a396cb1074..73c28b4196c7ed8829266d85b2a5fab16760d298 100644 (file)
--- a/src/sslproc.c
+++ b/src/sslproc.c
@@ -385,29 +385,6 @@ ssl_process_dead_fd(ssl_ctl_t * ctl, ssl_ctl_buf_t * ctl_buf)
        exit_client(client_p, client_p, &me, reason);
 }
 
-
-static void
-ssl_process_zip_ready(ssl_ctl_t * ctl, ssl_ctl_buf_t * ctl_buf)
-{
-       struct Client *client_p;
-       int32_t fd;
-
-       if(ctl_buf->buflen < 5)
-               return;         /* bogus message..drop it.. XXX should warn here */
-
-       fd = buf_to_int32(&ctl_buf->buf[1]);
-       client_p = find_cli_fd_hash(fd);
-       if(client_p == NULL)
-               return;
-
-       /* Now start sending the data that should be compressed. */
-       // ClearCork(client_p);
-       send_pop_queue(client_p);
-       /* Start reading uncompressed data. */
-       read_packet(client_p->localClient->F, client_p);
-}
-
-
 static void
 ssl_process_cmd_recv(ssl_ctl_t * ctl)
 {
@@ -442,9 +419,6 @@ ssl_process_cmd_recv(ssl_ctl_t * ctl)
                        sendto_realops_snomask(SNO_GENERAL, L_ALL, no_ssl_or_zlib);
                        ssl_killall();
                        break;
-               case 'R':
-                       ssl_process_zip_ready(ctl, ctl_buf);
-                       break;
                case 'z':
                        zlib_ok = 0;
                        break;

diff --git a/ssld/ssld.c b/ssld/ssld.c
index d7d8970c37f3bb15f1f2757b03f3e2594834504d..526069691bc5d822cae5d647206e0e30b6f694d8 100644 (file)
--- a/ssld/ssld.c
+++ b/ssld/ssld.c
@@ -751,16 +751,6 @@ process_stats(mod_ctl_t * ctl, mod_ctl_buf_t * ctlb)
 }
 
 #ifdef HAVE_LIBZ
-static void
-zlib_send_zip_ready(mod_ctl_t * ctl, conn_t * conn)
-{
-       char buf[5];
-
-       buf[0] = 'R';
-       int32_to_buf(&buf[1], conn->id);
-       mod_cmd_write_queue(conn->ctl, buf, sizeof(buf));
-}
-
 static void
 zlib_process(mod_ctl_t * ctl, mod_ctl_buf_t * ctlb)
 {
@@ -811,7 +801,7 @@ zlib_process(mod_ctl_t * ctl, mod_ctl_buf_t * ctlb)
        deflateInit(&((zlib_stream_t *) conn->stream)->outstream, level);
        if(recvqlen > 0)
                common_zlib_inflate(conn, recvq_start, recvqlen);
-       zlib_send_zip_ready(ctl, conn);
+
        conn_mod_read_cb(conn->mod_fd, conn);
        conn_plain_read_cb(conn->plain_fd, conn);
        return;