From 117994993a2872b717a3475e6ecfe6cc5d48bf7c Mon Sep 17 00:00:00 2001
From: Matt Atterbury <matterbury@google.com>
Date: Wed, 30 Apr 2014 09:59:34 -0400
Subject: [PATCH] Rename QueryParams::Parse to ParseFromUrl. Add a wrapper that
 takes an untrusted string.

---
 src/ngx_pagespeed.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ngx_pagespeed.cc b/src/ngx_pagespeed.cc
index abdd6c3e4..04af06fbc 100644
--- a/src/ngx_pagespeed.cc
+++ b/src/ngx_pagespeed.cc
@@ -1797,7 +1797,7 @@ ngx_int_t ps_resource_handler(ngx_http_request_t* r,
     return ps_async_wait_response(r);
   } else if (is_an_admin_handler) {
     QueryParams query_params;
-    query_params.Parse(url.Query());
+    query_params.ParseFromUrl(url);
 
     PosixTimer timer;
     int64 now_ms = timer.NowMs();
@@ -2394,7 +2394,7 @@ ngx_int_t ps_simple_handler(ngx_http_request_t* r,
   GoogleUrl url(url_string);
   QueryParams query_params;
   if (url.IsWebValid()) {
-    query_params.Parse(url.Query());
+    query_params.ParseFromUrl(url);
   }
 
   GoogleString output;