resolve conflicts

ChangeLog

@@ -4,6 +4,13 @@
 ** Please leave this at the top of the file.  Thanks.
 *******************************************************************************
 
+2009-07-24  Kevin Layer  <layer@gemini.franz.com>
+1.2.60
+	* decode.cl: uriencode-string: use uppercase hex chars for
+	  EC2.  Amazon's EC2 requires that uppercase characters (A-F)
+	  be used, otherwise the signing of EC2 requests via the REST
+	  API won't match.
+
 2009-07-01    <layer@HOBART128>
 
 	* makefile: dribble test output to "test.out" (mainly for windows)

decode.cl

@@ -151,7 +151,9 @@
 					       then (+ ,code
 						       #.(char-code #\0))
 					       else (+ (- ,code 10)
-						       #.(char-code #\a)))))
+;;;; Amazon's EC2 requires that an uppercase character be used here,
+;;;; otherwise the signing of EC2 requests via the REST API don't match.
+						       #.(char-code #\A)))))
 				(let* ((upcode (logand #xf (ash code -4)))
 				       (downcode (logand #xf code)))
 				  (setf (aref newmbvec (+ j 1))

packages.cl

@@ -1,9 +1,10 @@
 #+(version= 8 1)
-(sys:defpatch "aserve" 2
+(sys:defpatch "aserve" 3
   "v1: version 1.2.56, large request body & multipart content type & more;
 v2: version 1.2.58, fix problem introduced in 1.2.56 where the response date 
   is always the zero universal time & correctly send out the comment after
-  the result code."
+  the result code;
+v3: version 1.2.60: uriencode-string: use uppercase hex chars for EC2."
   :type :system
   :post-loadable t)