[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1501-ga2efa2e

[Gabriele Giacone]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  a2efa2eaa937110ac257c6b06a9b04904335a202 (commit)
      from  b1240b2dea588a108154814bf72dd1c18e0ae347 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=a2efa2eaa937110ac257c6b06a9b04904335a202


commit a2efa2eaa937110ac257c6b06a9b04904335a202
Author: Gabriele Giacone <address@hidden>
Date:   Fri Jul 6 02:01:13 2012 +0200

    Set http_proxy environment variable only if not already set.
    
    see bug #26713, authenticated proxy works by setting http_proxy with
    credentials.

diff --git a/plugin/npapi/plugin.cpp b/plugin/npapi/plugin.cpp
index dc597f1..af476e2 100644
--- a/plugin/npapi/plugin.cpp
+++ b/plugin/npapi/plugin.cpp
@@ -1203,10 +1203,16 @@ nsPluginInstance::setupProxy(const std::string& url)
         // no proxy
     }
     else if ( parts[0] == "PROXY" ) {
-        if (setenv("http_proxy", parts[1].c_str(), 1) < 0) {
-            gnash::log_error(
-                "Couldn't set environment variable http_proxy to %s",
-                nproxy);
+        char *http_proxy=getenv("http_proxy");
+        if (!http_proxy) {
+            gnash::log_debug("Setting http_proxy to %s", parts[1].c_str());
+            if (setenv("http_proxy", parts[1].c_str(), 1) < 0) {
+                gnash::log_error(
+                    "Couldn't set environment variable http_proxy to %s",
+                    parts[1].c_str());
+            }
+        } else {
+            gnash::log_debug("http_proxy already set to %s", http_proxy);
         }
     }
     else {

-----------------------------------------------------------------------

Summary of changes:
 plugin/npapi/plugin.cpp |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Gnash