Merge pull request #804 from wangkx/gh-803

Fix gh-803 User-Agent not set if no LDAP enabled

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

esp/bindings/http/platform/httpbinding.cpp

@@ -450,9 +450,6 @@ void EspHttpBinding::populateRequest(CHttpRequest *request)
 
     ctx->setSecManger(m_secmgr.getLink());
     ctx->setFeatureAuthMap(m_feature_authmap.getLink());
-    StringBuffer useragent;
-    request->getHeader("User-Agent", useragent);
-    ctx->setUseragent(useragent.str());
 
     StringBuffer userid, password,realm,peer;
     ctx->getUserID(userid);

esp/bindings/http/platform/httptransport.cpp

@@ -1517,6 +1517,10 @@ void CHttpRequest::updateContext()
             else
                 m_context->setClientVersion(0.0);
         }
+
+        StringBuffer useragent;
+        getHeader("User-Agent", useragent);
+        m_context->setUseragent(useragent.str());
     }
 }