# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: kinkie@squid-cache.org-20090326152554-x98nxy9el6w3ytz2 # target_branch: http://www.squid-cache.org/bzr/squid3/trunk # testament_sha1: 6a42cc37ff3aca6f44e4c85692b375087be4b7b7 # timestamp: 2009-03-26 16:26:57 +0100 # base_revision_id: chtsanti@users.sourceforge.net-20090325114609-\ # ix310ws0oa31vwi7 # # Begin patch === modified file 'src/HttpStatusLine.cc' --- src/HttpStatusLine.cc 2009-01-21 03:47:47 +0000 +++ src/HttpStatusLine.cc 2009-03-26 15:25:54 +0000 @@ -168,6 +168,10 @@ p = "Partial Content"; break; + case HTTP_MULTI_STATUS: + p = "Multi-Status"; + break; + case HTTP_MULTIPLE_CHOICES: p = "Multiple Choices"; break; # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWU6YiGcAAZpfgEQQUWP//3tm TgC/7//wUAOe5xba24du7btuCShNExNTTaNCejUaMRk2hNNNMmmmQElBDApgin6pvVGTPUhiAAyY jagJIgmqep4qfqjyn+qntSeak9RoBoyepmpg1G1DmmJgATABMAAJgACYJKASGmmU3op6QAekAaBo BoByurs0EvTaV0ZXyUxioZfRY54FtLWtZdUgetzxyZztowzb5HjGY2zQ6lDuru3Wvvv8/KcCHk5/ GHYK3a35tOz1RjNiqV7ywiamS7nOS1VOOSmLPI9YDrX4OUF6WXw86kxasSzWBnrrZ2InTSAm8Nzu yYjCyAwH8z0DORm8qejaLyMVQQ8hx5N6cr0fHBmtE9ZqtPdhJdBbwtzqSZItr4Ek3MTYkFaV9O10 z3p0zFO5xrWljBxF1xFh3eUCjrlFgOKIcxSMycgcLITInFZE0gIx5yewgPuTiByn8KNt+BmSe4va hs6tAZnF2DmYkGr1SmPFxm4Tolwolg8xedL9OhPFljQYmF9TAydMSKnQUFabaXYjtQhp0FhEkYlS w3LeWlxMla6OpIeZMp5sjaEi8vdfoUFgPvqmjBFhMjWMN4UU8oLxS2YosxlmVUJ9ZBEMJ85h1kmF 0sZ39Oqg0Pk5kc7K7cV+sJuTZ4Ml7fcuGOMhmGcLbbDWQ9JOr3vfBpLtX5Dz5dHdetE7DC0G29mB 40N60G7QlPIRngDcVklgHrXEKxtUKNtZmKuWLGEczDUfprKyJL7rX9GqIhl6hK18DXX48/cQAT6h tZKoExyHmaGQ21GObfIuKyJOuLcMpVsiyZCMnS33GZbLwmKbuPnODy89hYmCupZ2piImFeAaBiTy WYRAuTprYmSgaSh369nLNOufHkSltdZi4X5DaAZK23zgt/Rnirl8JiqK60GtHulAzm2mlbw10lOR 6X5e+UwOADFpTpKD0w3UrgdMBgTI1ULvUriPRT4PaWr6hJKJCe26eZ75yEVJEEofdWQLmSeSZOyG X5FLPUfRY4OkSGCywRwhiSxC0uVVy1UvsJzmoFAYrYxGUGk/ehVBpoEw/3lZRNlzQFXbK9iduoIr CLkxuAPRFhlcVXzUbBov6BlDDTJMWmQDTUTUuHFKzbasw4NplLw7uNxhMs2Jg2vGSVslaPJA5RWZ zlDUmqjm4mQ84i11bkGXmWe1WlaTDLxtq+B1XmLYq1eWcXqyJWBb70zOFQnO4CdDAKmUpkv/4u5I pwoSCdMRDOA=