Merge "DELIA-59431:Fog requesting fragments directly through TR causing server load" into stable2

Author: Paulpandian Mariappan

admanager_mpd.cpp

@@ -562,8 +562,8 @@ MPD* PrivateCDAIObjectMPD::GetAdMPD(std::string &manifestUrl, bool &finalManifes
 			GrowableBuffer fogManifest;
 			memset(&fogManifest, 0, sizeof(manifest));
 			http_error = 0;
-
-			if((mAamp->GetFile(effectiveUrl, &fogManifest, effectiveUrl, &http_error, &downloadTime, NULL, eCURLINSTANCE_DAI)))
+			mAamp->GetFile(effectiveUrl, &fogManifest, effectiveUrl, &http_error, &downloadTime, NULL, eCURLINSTANCE_DAI);
+			if(200 == http_error || 204 == http_error)
 			{
 				manifestUrl = effectiveUrl;
 				if(200 == http_error)

priv_aamp.cpp

@@ -3999,15 +3999,14 @@ bool PrivateInstanceAAMP::GetFile(std::string remoteUrl,struct GrowableBuffer *b
 							effectiveUrlPtr =  const_cast<char *>(httpRespHeaders[curlInstance].data.c_str());
 						}
 					}
-					//When Fog is having tsb write error , then it will respond back with 302 with direct CDN url,In this case alone TSB should be disabled
-					if(http_code == 302)
-					{
-						mTSBEnabled = false;
-					}
 					else
 					{
+						//When Fog is having tsb write error , then it will respond back with 302 with direct CDN url,In this case alone TSB should be disabled
+						if(mTSBEnabled && http_code == 302)
+						{
+							mTSBEnabled = false;
+						}
 						res = curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &effectiveUrlPtr);
-
 						if((simType == eMEDIATYPE_INIT_VIDEO || simType ==  eMEDIATYPE_INIT_AUDIO))
 						{
 							IsoBmffBuffer isobuf(mLogObj);