From 49857fbfda8419babba2caae1dbf992bd91b43e4 Mon Sep 17 00:00:00 2001
From: Konstantin Haase <konstantin.mailinglists@googlemail.com>
Date: Tue, 21 Aug 2012 11:48:00 +0200
Subject: [PATCH] update changes

---
 CHANGES | 47 ++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 44 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 31f06500..37621d89 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,8 +2,15 @@
 
  * Add support for Yajl templates. (Jamie Hodge)
 
- * No longer include Sinatra::Delegator in Object, instead extend the main
-   object only. (Konstantin Haase)
+ * Add support for Rabl templates. (Jesse Cooke)
+
+ * Add support for Wlang templates. (Bernard Lambeau)
+
+ * When running in classic mode, no longer include Sinatra::Delegator in Object,
+   instead extend the main object only. (Konstantin Haase)
+
+ * Improved route parsing: "/:name.?:format?" with "/foo.png" now matches to
+   {name: "foo", format: "png"} instead of {name: "foo.png"}. (Florian Hanke)
 
  * Add :status option support to send_file. (Konstantin Haase)
 
@@ -22,11 +29,45 @@
    It also implements a nice #inspect, so it plays nice with Rails' `rake
    routes`. (Konstantin Haase)
 
-= 1.3.3 / Not Yet Released
+ * In addition to WebRick, Thin and Mongrel, Sinatra will now automatically pick
+   up Puma, Trinidad, ControlTower or Net::HTTP::Server when installed. The
+   logic for picking the server has been improved and now depends on the Ruby
+   implementation used. (Konstantin Haase)
+
+ * "Sinatra doesn't know this ditty" pages now show the app class when running
+   a modular application. This helps detecting where the response came from when
+   combining multiple modular apps. (Konstantin Haase)
+
+ * When port is not set explicitly, use $PORT env variable if set and only
+   default to 4567 if not. Plays nice with foreman. (Konstantin Haase)
+
+= 1.3.3 / 2012-08-19
+
+ * Improved documentation. (burningTyger, Konstantin Haase, Gabriel Andretta,
+   Anurag Priyam, michelc)
+
+ * No longer modify the load path. (Konstantin Haase)
 
  * When keeping a stream open, set up callback/errback correctly to deal with
    clients closing the connection. (Konstantin Haase)
 
+ * Fix bug where having a query param and a URL param by the same name would
+   concatenate the two values. (Konstantin Haase)
+
+ * Prevent duplicated log output when application is already wrapped in a
+   `Rack::CommonLogger`. (Konstantin Haase)
+
+ * Fix issue where `Rack::Link` and Rails were preventing indefinite streaming.
+   (Konstantin Haase)
+
+ * No longer cause warnings when running Ruby with `-w`. (Konstantin Haase)
+
+ * HEAD requests on static files no longer report a Content-Length of 0, but
+   instead the proper length. (Konstantin Haase)
+
+ * When protecting against CSRF attacks, drop the session instead of refusing
+   the request. (Konstantin Haase)
+
 = 1.3.2 / 2011-12-30
 
  * Don't automatically add `Rack::CommonLogger` if `Rack::Server` is adding it,