Message-Id: <199612031510.PAA02765>
Subject: Apache 1.2b1 patches for QNX 4.23, Watcom 10.6 (fwd)
To: apache <new-httpd@mail.apache.org>
Date: Tue, 3 Dec 1996 15:10:08 +0000 (GMT)
From: Rob Hartill <robh@imdb.com>
Organization: Internet Movie Database
Content-Type: text
Sender: new-httpd-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@hyperreal.com


not acked.


----- Forwarded message from colin@econz.co.nz -----

From: colin@econz.co.nz
Message-Id: <199612031347.CAA14393@voodoo.econz.co.nz>
Subject: Apache 1.2b1 patches for QNX 4.23, Watcom 10.6
To: apache-bugs@apache.org
Date: Wed, 4 Dec 1996 02:47:14 +1300 (nzdt)
X-Mailer: ELM [version 2.4 PL25]
Content-Type: text

Hi there,

I just downloaded and compiled the 1.2b1 release, which so far seems to
be working well, although admittedly I haven't thrashed it very hard yet.

Anyway, while compiling it, I had to make a few minor changes to:

src/Configure - QNX defines etc.
src/conf.h    - QNX defines, includes etc.

src/http_protocol.c - found a possible bug, assignment in boolean expression?

On line 219 there you assign r->chunked to 1 in a boolean expression, which
doesn't look quite right.

However I've met people who like using && and || to replace if statements,
so could you please let me know whether this last one really is a bug
or not?

BTW - do you know which browsers support HTTP/1.1?

Please find patches generated by diff -c of the three files.

Cheers,

Colin

-----------------------SNIP--------------------------------------------
*** ../../apache_1.2b1/src/Configure	Wed Nov 20 19:04:29 1996
--- Configure	Wed Dec  4 01:51:16 1996
***************
*** 218,226 ****
  	OS='DEC OSF/1'
  	CFLAGS="$CFLAGS -DOSF1"
  	;;
!     QNX)
  	OS='QNX'
! 	CFLAGS="$CFLAGS -DQNX"
  	LIBS="$LIBS -N128k -lsocket"
  	;;
      *-sco3*)
--- 218,228 ----
  	OS='DEC OSF/1'
  	CFLAGS="$CFLAGS -DOSF1"
  	;;
!     *QNX*)
! 	DEF_WANTHSREGEX=yes
  	OS='QNX'
! 	CFLAGS="$CFLAGS -mf -DQNX"
! 	LFLAGS="$LFLAGS -mf"
  	LIBS="$LIBS -N128k -lsocket"
  	;;
      *-sco3*)
-----------------------SNIP--------------------------------------------
*** ../../apache_1.2b1/src/conf.h	Tue Dec  3 05:07:23 1996
--- conf.h	Wed Dec  4 02:21:23 1996
***************
*** 330,337 ****
--- 330,340 ----
  #define NEED_INITGROUPS
  #define NEED_SELECT_H
  #define NEED_PROCESS_H
+ #define HAVE_SYS_SELECT_H
  
  #define JMP_BUF sigjmp_buf
+ 
+ #include <unix.h>
  
  #elif defined(LYNXOS)
  #undef NO_KILLPG
-----------------------SNIP--------------------------------------------
*** ../../apache_1.2b1/src/http_protocol.c	Mon Dec  2 09:28:31 1996
--- http_protocol.c	Wed Dec  4 01:32:09 1996
***************
*** 216,222 ****
      else if ((r->server->keep_alive > r->connection->keepalives) &&
  	(r->server->keep_alive_timeout > 0) &&
  	(r->header_only || length || tenc ||
! 	 ((r->proto_num >= 1001) && (r->byterange > 1 || (r->chunked = 1)))) &&
  	(!find_token(r->pool, conn, "close")) &&
  	((ka_sent = find_token(r->pool, conn, "keep-alive")) ||
  	 r->proto_num >= 1001)) {
--- 216,222 ----
      else if ((r->server->keep_alive > r->connection->keepalives) &&
  	(r->server->keep_alive_timeout > 0) &&
  	(r->header_only || length || tenc ||
! 	 ((r->proto_num >= 1001) && (r->byterange > 1 || (r->chunked == 1)))) &&
  	(!find_token(r->pool, conn, "close")) &&
  	((ka_sent = find_token(r->pool, conn, "keep-alive")) ||
  	 r->proto_num >= 1001)) {
-----------------------SNIP--------------------------------------------

-- 
===========================================================================
Colin Burgess          | email:  colin@econz.co.nz     Ph: +64 9 378 8611 |
QNX Systems Programmer |        scolinb@iconz.co.nz   Fax: +64 9 378 9010 |
ECONZ (1971) Ltd       | smail: PO Box 68-261 Newton Auckland New Zealand |
---------------------------------------------------------------------------
Some people fall for everything and stand for nothing.

----- End of forwarded message from colin@econz.co.nz -----

-- 
Rob Hartill.       Internet Movie Database Ltd.    http://www.imdb.com/