diff --git a/checkin_notes b/checkin_notes
index 91c059edd1..8c8764e29e 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -7404,3 +7404,11 @@ David  1 Sept 2009
         scheduler_op.cpp
     lib/
         proxy_info.cpp,h
+
+Rom    1 Sept 2009
+    - client: Use HTTP_OP::pi to avoid a crash when using a proxy. libcurl uses
+        the proxy information after the PROXY_INFO struct in setup_proxy_session()
+        had been popped off the stack.
+        
+    client/
+        http_curl.cpp,h
diff --git a/client/http_curl.cpp b/client/http_curl.cpp
index b1d4e571db..040ae63ad1 100644
--- a/client/http_curl.cpp
+++ b/client/http_curl.cpp
@@ -806,7 +806,7 @@ void HTTP_OP::setup_proxy_session(bool no_proxy) {
         return;
     }
 
-    PROXY_INFO pi = gstate.proxy_info;
+    pi = gstate.proxy_info;
     if (pi.use_http_proxy) {
         if (log_flags.proxy_debug) {
             msg_printf(