------------------------------------------------------------ revno: 14004 revision-id: squid3@treenet.co.nz-20160323140051-tywvw5g6nrv0gvp7 parent: squid3@treenet.co.nz-20160323131731-2myugkam9gkm9xos committer: Amos Jeffries branch nick: 3.5 timestamp: Thu 2016-03-24 03:00:51 +1300 message: RFC 7725: Add registry entry for 451 status text While Squid does not generate these messages automatically we still have to relay the status line text accurately, and admin may want to use it for deny_info status. ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20160323140051-tywvw5g6nrv0gvp7 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # testament_sha1: f9a3c19ff2f729f7b9c09c670747fc1d27f5be53 # timestamp: 2016-03-23 14:50:54 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # base_revision_id: squid3@treenet.co.nz-20160323131731-\ # 2myugkam9gkm9xos # # Begin patch === modified file 'src/http/StatusCode.cc' --- src/http/StatusCode.cc 2016-01-01 00:14:27 +0000 +++ src/http/StatusCode.cc 2016-03-23 14:00:51 +0000 @@ -212,6 +212,10 @@ return "Request Header Fields Too Large"; break; + case scUnavailableForLegalReasons: + return "Unavailable For Legal Reasons"; + break; + // 500-599 case Http::scInternalServerError: return "Internal Server Error"; === modified file 'src/http/StatusCode.h' --- src/http/StatusCode.h 2016-01-01 00:14:27 +0000 +++ src/http/StatusCode.h 2016-03-23 14:00:51 +0000 @@ -66,6 +66,7 @@ scPreconditionRequired = 428, /**< RFC6585 */ scTooManyRequests = 429, /**< RFC6585 */ scRequestHeaderFieldsTooLarge = 431, /**< RFC6585 */ + scUnavailableForLegalReasons = 451, /**< RFC7725 */ scInternalServerError = 500, scNotImplemented = 501, scBadGateway = 502,