Permalink
Browse files

join from trunk to acl62 branch

  • Loading branch information...
1 parent 37d54d1 commit 8032172886317532794d0e76cda974cb50e3c25e layer committed Jul 29, 2004
View
@@ -1,36 +1,33 @@
-*******************************************************************************
-merge from trunk to acl62 branch on 12/23/03
-command:
-join.sh trunk trunk_to_acl62_merge_122203 trunk_to_acl62_merge_122303 aserve
-*******************************************************************************
+2004-06-09 John Foderaro <jkf@tiger.franz.com>
+1.2.37
+ * main.cl - return a 400 response if there's an error reading
+ the request.
+ Use process locks when allocating sresources rather
+ then without-scheduling.
-*******************************************************************************
-merge from trunk to acl62 branch on 12/22/03
-command:
-join.sh trunk trunk_to_acl62_merge_102203_2 trunk_to_acl62_merge_122203 aserve
-*******************************************************************************
+2004-04-29 John Foderaro <jkf@tiger.franz.com>
-2003-10-22 Kevin Layer <layer@crikey>
+ * main.cl - http-worker-thread don't expect the stream
+ to process to be the first and only thing on the
+ run-reasons list. Acl7.0 will add things as well.
- * packages.cl: update defpatch
+2004-03-04 John Foderaro <jkf@tiger.franz.com>
-*******************************************************************************
-2nd merge from trunk to acl62 branch on 10/22/03
-command:
-join.sh trunk trunk_to_acl62_merge_102203 trunk_to_acl62_merge_102203_2 aserve
-*******************************************************************************
+ * main.cl - ensure that get-request-body always reads from
+ a stream with the :octets external format so that the
+ content-length header value is meaningful.
-*******************************************************************************
-merge from trunk to acl62 branch on 10/22/03
-command:
-join.sh trunk trunk_to_acl62_merge_092403 trunk_to_acl62_merge_102203 aserve
-*******************************************************************************
+2004-03-03 <jkf@main.verada.com>
+1.2.36
+ * main.cl: add request-variable-value (moved from webactions)
-*******************************************************************************
-merge from trunk to acl62 branch on 9/24/03
-command:
-join.sh trunk trunk_to_acl62_merge_070703 trunk_to_acl62_merge_092403 aserve
-*******************************************************************************
+2004-01-09 John Foderaro <jkf@tiger.franz.com>
+1.2.35
+ * publish.cl, main.cl, test/t-aserve.cl: add a slot to
+ all entities holding
+ the extra headers to add to the response. Add a :headers
+ argument to all publish functions that allows one
+ to store a value in the new headers slot.
2003-12-23 John Foderaro <jkf@tiger.franz.com>
1.2.34
@@ -92,41 +89,6 @@ join.sh trunk trunk_to_acl62_merge_070703 trunk_to_acl62_merge_092403 aserve
* move the require of :uri to before the first
reference to it in packages.cl
-2003-07-08 Kevin Layer <layer@crikey>
-
- * packages.cl: fmakunbound 'get-request-body so there are not
- conflicts with earlier patch versions
-
-2003-07-07 Kevin Layer <layer@crikey>
-
- * packages.cl: v2 of the patch for 6.2
-
-*******************************************************************************
-merge from trunk to acl62 branch on 7/7/03
-command:
-join.sh trunk trunk_to_acl62_merge3 trunk_to_acl62_merge_070703 aserve
-*******************************************************************************
-
-*******************************************************************************
-Tue Apr 29 10:00:00 PDT 2003
-merge from trunk to acl62 branch
-command:
-join.sh trunk trunk_to_acl62_merge2 trunk_to_acl62_merge3 aserve
-*******************************************************************************
-
-*******************************************************************************
-Fri Jan 10 08:19:16 PST 2003
-merge from trunk to acl62 branch
-command:
-join.sh trunk trunk_to_acl62_merge1 trunk_to_acl62_merge2 aserve
-*******************************************************************************
-
-*******************************************************************************
-Mon Jun 17 11:27:39 PDT 2002
-merge from trunk to acl62 branch
-cmd: join.sh trunk acl62 trunk_to_acl62_merge1 aserve
-*******************************************************************************
-
2003-05-09 <jkf@main.verada.com>
1.2.27
* added a hook argument to most publish functions. documented
View
@@ -2,7 +2,8 @@
;;
;; authorize.cl
;;
-;; copyright (c) 1986-2000 Franz Inc, Berkeley, CA
+;; copyright (c) 1986-2000 Franz Inc, Berkeley, CA - All rights reserved.
+;; copyright (c) 2000-2004 Franz Inc, Oakland, CA - All rights reserved.
;;
;; This code is free software; you can redistribute it and/or
;; modify it under the terms of the version 2.1 of
@@ -23,7 +24,7 @@
;; Suite 330, Boston, MA 02111-1307 USA
;;
-;; $Id: authorize.cl,v 1.4.10.2.2.2 2003/09/24 17:12:02 layer Exp $
+;; $Id: authorize.cl,v 1.4.10.2.2.3 2004/07/29 16:09:52 layer Exp $
;; Description:
;; classes and functions for authorizing access to entities
View
@@ -2,7 +2,8 @@
;;
;; cgi.cl
;;
-;; copyright (c) 1986-2000 Franz Inc, Berkeley, CA
+;; copyright (c) 1986-2000 Franz Inc, Berkeley, CA - All rights reserved.
+;; copyright (c) 2000-2004 Franz Inc, Oakland, CA - All rights reserved.
;;
;; This code is free software; you can redistribute it and/or
;; modify it under the terms of the version 2.1 of
@@ -23,7 +24,7 @@
;; Suite 330, Boston, MA 02111-1307 USA
;;
;;
-;; $Id: cgi.cl,v 1.5.4.3.2.2 2003/12/22 21:52:10 layer Exp $
+;; $Id: cgi.cl,v 1.5.4.3.2.3 2004/07/29 16:09:52 layer Exp $
;; Description:
;; common gateway interface (running external programs)
View
@@ -2,7 +2,8 @@
;;
;; client.cl
;;
-;; copyright (c) 1986-2000 Franz Inc, Berkeley, CA
+;; copyright (c) 1986-2000 Franz Inc, Berkeley, CA - All rights reserved.
+;; copyright (c) 2000-2004 Franz Inc, Oakland, CA - All rights reserved.
;;
;; This code is free software; you can redistribute it and/or
;; modify it under the terms of the version 2.1 of
@@ -23,7 +24,7 @@
;; Suite 330, Boston, MA 02111-1307 USA
;;
;;
-;; $Id: client.cl,v 1.21.2.7.2.2 2003/01/10 16:21:36 layer Exp $
+;; $Id: client.cl,v 1.21.2.7.2.3 2004/07/29 16:09:52 layer Exp $
;; Description:
;; http client code.
View
@@ -2,7 +2,8 @@
;;
;; decode.cl
;;
-;; copyright (c) 1986-2000 Franz Inc, Berkeley, CA
+;; copyright (c) 1986-2000 Franz Inc, Berkeley, CA - All rights reserved.
+;; copyright (c) 2000-2004 Franz Inc, Oakland, CA - All rights reserved.
;;
;; This code is free software; you can redistribute it and/or
;; modify it under the terms of the version 2.1 of
@@ -24,7 +25,7 @@
;;
;;
-;; $Id: decode.cl,v 1.8.10.5.14.4 2003/12/23 20:54:22 layer Exp $
+;; $Id: decode.cl,v 1.8.10.5.14.5 2004/07/29 16:09:52 layer Exp $
;; Description:
;; decode/encode code
Oops, something went wrong.

0 comments on commit 8032172

Please sign in to comment.