Merge remote-tracking branch 'origin/broken-dotnet'

* origin/broken-dotnet:
  Mention rfc2617 in broken_dotnet_digest_without_query_string docs
  Add broken_dotnet_digest_without_query_string option

diff --git a/Changes b/Changes
index 805ebce..b6d1486 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+1.015 2012-02-23
+   - Fix broken synopsis. RT#75254
+
 1.014 2012-02-05
    - Add require_ssl configuration setting.
    - Add no_unprompted_authorization_required configuration setting.

diff --git a/lib/Catalyst/Authentication/Credential/HTTP.pm b/lib/Catalyst/Authentication/Credential/HTTP.pm
index 507562c..8d76f6c 100644 (file)
--- a/lib/Catalyst/Authentication/Credential/HTTP.pm
+++ b/lib/Catalyst/Authentication/Credential/HTTP.pm
@@ -436,7 +436,7 @@ for Catalyst.
     sub foo : Local {
         my ( $self, $c ) = @_;
 
-        $c->authenticate({ realm => "example" });
+        $c->authenticate({}, "example");
         # either user gets authenticated or 401 is sent
         # Note that the authentication realm sent to the client (in the
         # RFC 2617 sense) is overridden here, but this *does not*