couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fdman...@apache.org
Subject svn commit: r981349 - /couchdb/branches/1.0.x/src/couchdb/couch_httpd.erl
Date Sun, 01 Aug 2010 23:44:49 GMT
Author: fdmanana
Date: Sun Aug  1 23:44:49 2010
New Revision: 981349

URL: http://svn.apache.org/viewvc?rev=981349&view=rev
Log:
Merged revision 981348 from trunk:

Bug fix - proper RegExp matching to avoid having a case like "hhtml" being considered as "html".


Modified:
    couchdb/branches/1.0.x/src/couchdb/couch_httpd.erl

Modified: couchdb/branches/1.0.x/src/couchdb/couch_httpd.erl
URL: http://svn.apache.org/viewvc/couchdb/branches/1.0.x/src/couchdb/couch_httpd.erl?rev=981349&r1=981348&r2=981349&view=diff
==============================================================================
--- couchdb/branches/1.0.x/src/couchdb/couch_httpd.erl (original)
+++ couchdb/branches/1.0.x/src/couchdb/couch_httpd.erl Sun Aug  1 23:44:49 2010
@@ -763,7 +763,8 @@ error_headers(#httpd{mochi_req=MochiReq}
                             Else ->
                                 Else
                             end,
-                            case re:run(Accepts, "html", [{capture, none}, caseless]) of
+                            case re:run(Accepts, "\\bhtml\\b",
+                                    [{capture, none}, caseless]) of
                             nomatch ->
                                 {Code, []};
                             match ->



Mime
View raw message