pier 01/07/18 12:12:38 Modified: webapp/lib pr_warp.c pr_warp.h pr_warp_config.c pr_warp_network.c pr_warp_packet.c Log: Where the hack that "2" came from? Revision Changes Path 1.8 +2 -2 jakarta-tomcat-connectors/webapp/lib/pr_warp.c Index: pr_warp.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/lib/pr_warp.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- pr_warp.c 2001/07/18 19:08:35 1.7 +++ pr_warp.c 2001/07/18 19:12:38 1.8 @@ -37,7 +37,7 @@ * * * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES * * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * -2 * THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY * + * THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY * * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * @@ -54,7 +54,7 @@ * * * ========================================================================= */ -/* @version $Id: pr_warp.c,v 1.7 2001/07/18 19:08:35 pier Exp $ */ +/* @version $Id: pr_warp.c,v 1.8 2001/07/18 19:12:38 pier Exp $ */ #include "pr_warp.h" /* The list of all configured connections */ 1.2 +2 -2 jakarta-tomcat-connectors/webapp/lib/pr_warp.h Index: pr_warp.h =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/lib/pr_warp.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pr_warp.h 2001/07/18 19:08:35 1.1 +++ pr_warp.h 2001/07/18 19:12:38 1.2 @@ -37,7 +37,7 @@ * * * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES * * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * -2 * THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY * + * THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY * * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * @@ -54,7 +54,7 @@ * * * ========================================================================= */ -/* @version $Id: pr_warp.h,v 1.1 2001/07/18 19:08:35 pier Exp $ */ +/* @version $Id: pr_warp.h,v 1.2 2001/07/18 19:12:38 pier Exp $ */ #ifndef _PR_WARP_H_ #define _PR_WARP_H_ 1.2 +3 -3 jakarta-tomcat-connectors/webapp/lib/pr_warp_config.c Index: pr_warp_config.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/lib/pr_warp_config.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pr_warp_config.c 2001/07/18 19:08:35 1.1 +++ pr_warp_config.c 2001/07/18 19:12:38 1.2 @@ -37,7 +37,7 @@ * * * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES * * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * -2 * THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY * + * THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY * * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * @@ -54,7 +54,7 @@ * * * ========================================================================= */ -/* @version $Id: pr_warp_config.c,v 1.1 2001/07/18 19:08:35 pier Exp $ */ +/* @version $Id: pr_warp_config.c,v 1.2 2001/07/18 19:12:38 pier Exp $ */ #include "pr_warp.h" wa_boolean n_check(wa_connection *conn, warp_packet *pack) { @@ -72,7 +72,7 @@ wa_log(WA_MARK,"Invalid WARP packet %d (WELCOME)",pack->type); return(wa_false); } - + if (p_read_ushort(pack,&maj)!=wa_true) { wa_log(WA_MARK,"Cannot read major version"); return(wa_false); 1.2 +2 -2 jakarta-tomcat-connectors/webapp/lib/pr_warp_network.c Index: pr_warp_network.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/lib/pr_warp_network.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pr_warp_network.c 2001/07/18 19:08:35 1.1 +++ pr_warp_network.c 2001/07/18 19:12:38 1.2 @@ -37,7 +37,7 @@ * * * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES * * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * -2 * THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY * + * THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY * * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * @@ -54,7 +54,7 @@ * * * ========================================================================= */ -/* @version $Id: pr_warp_network.c,v 1.1 2001/07/18 19:08:35 pier Exp $ */ +/* @version $Id: pr_warp_network.c,v 1.2 2001/07/18 19:12:38 pier Exp $ */ #include "pr_warp.h" wa_boolean n_recv(apr_socket_t *sock, warp_packet *pack) { 1.2 +2 -2 jakarta-tomcat-connectors/webapp/lib/pr_warp_packet.c Index: pr_warp_packet.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/lib/pr_warp_packet.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pr_warp_packet.c 2001/07/18 19:08:35 1.1 +++ pr_warp_packet.c 2001/07/18 19:12:38 1.2 @@ -37,7 +37,7 @@ * * * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES * * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * -2 * THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY * + * THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY * * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * @@ -54,7 +54,7 @@ * * * ========================================================================= */ -/* @version $Id: pr_warp_packet.c,v 1.1 2001/07/18 19:08:35 pier Exp $ */ +/* @version $Id: pr_warp_packet.c,v 1.2 2001/07/18 19:12:38 pier Exp $ */ #include "pr_warp.h" void p_reset(warp_packet *pack) {