Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mozilla - added mkprefs.h to the builds and replaced "*" pref strings with #defines.

Browse Source 
nglayout - added get & set methods for http proxies to nsINetService.


git-svn-id: svn://10.0.0.236/trunk@10714 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
valeski%netscape.com
1998-09-22 22:41:27 +00:00
parent 979f4bccb3
commit cea5b8a6ec
14 changed files with 240 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
mozilla/network/module/nsNetService.cpp
View File

@@ -22,6 +22,8 @@
#include "nsNetService.h"
#include "nsNetStream.h"
#include "nsNetFile.h"
#include "prefapi.h"
#include "mkprefs.h"
extern "C" {
#include "mkutils.h"
#include "mkgeturl.h"
@@ -108,6 +110,28 @@ nsNetlibService::nsNetlibService(nsINetContainerApplication *aContainerApp)
mNetlibThread->Start();
}
/* Setup our default prefs. Eventually these will come out of a default
* all.js file, but, for now each module needs to address their own
* default settings. */
PREF_SetDefaultIntPref(pref_proxyType, 3);
PREF_SetDefaultCharPref(pref_proxyACUrl, "");
PREF_SetDefaultCharPref(pref_socksServer, "");
PREF_SetDefaultIntPref(pref_socksPort, 0);
PREF_SetDefaultCharPref(pref_proxyFtpServer, "");
PREF_SetDefaultIntPref(pref_proxyFtpPort, 0);
PREF_SetDefaultCharPref(pref_proxyGopherServer, "");
PREF_SetDefaultIntPref(pref_proxyGopherPort, 0);
PREF_SetDefaultCharPref(pref_proxyHttpServer, "");
PREF_SetDefaultIntPref(pref_proxyHttpPort, 0);
PREF_SetDefaultCharPref(pref_proxyNewsServer, "");
PREF_SetDefaultIntPref(pref_proxyNewsPort, 0);
PREF_SetDefaultCharPref(pref_proxyWaisServer, "");
PREF_SetDefaultIntPref(pref_proxyWaisPort, 0);
PREF_SetDefaultCharPref(pref_proxyNoProxiesOn, "");
PREF_SetDefaultCharPref(pref_padPacURL, "");
PREF_SetDefaultCharPref(pref_scriptName, "");
if (NULL != aContainerApp) {
XP_AppCodeName = NULL;
XP_AppVersion = NULL;
@@ -562,6 +586,77 @@ nsNetlibService::SetCookieString(nsIURL *aURL, const nsString& aCookie)
return NS_OK;
}
NS_IMETHODIMP
nsNetlibService::GetProxyHTTP(nsString& aProxyHTTP) {
char *proxy = nsnull;
int32 port;
char outBuf[MAXHOSTNAMELEN + 8];
*outBuf = '\0';
if ( PREF_OK != PREF_CopyCharPref(pref_proxyHttpServer,&proxy) ) {
return NS_FALSE;
}
if ( PREF_OK != PREF_GetIntPref(pref_proxyHttpPort,&port) ) {
PR_FREEIF(proxy);
return NS_FALSE;
}
sprintf(outBuf,"%s:%d", proxy, port);
PR_FREEIF(proxy);
aProxyHTTP.SetString(outBuf);
return NS_OK;
}
NS_IMETHODIMP
nsNetlibService::SetProxyHTTP(nsString& aProxyHTTP) {
nsresult rv = NS_OK;
PRInt32 port;
nsString nsSPort;
char *csPort = nsnull;
char *proxy = nsnull;
nsString nsSProxy;
PRInt32 colonIdx;
PRUnichar colon = ':';
if (aProxyHTTP.Length() < 1) {
NET_SelectProxyStyle(PROXY_STYLE_NONE);
return NS_OK;
}
if ( (colonIdx = aProxyHTTP.Find(colon)) < 0 )
return NS_FALSE;
aProxyHTTP.Left(nsSProxy, colonIdx);
aProxyHTTP.Mid(nsSPort, colonIdx+1, aProxyHTTP.Length() - colonIdx);
proxy = nsSProxy.ToNewCString();
if (!proxy)
return NS_FALSE;
csPort = nsSPort.ToNewCString();
if (!csPort) {
delete proxy;
return NS_FALSE;
}
port = atoi(csPort);
if ( PREF_OK != PREF_SetCharPref(pref_proxyHttpServer, proxy) ) {
rv = NS_FALSE;
}
if ( PREF_OK != PREF_SetIntPref(pref_proxyHttpPort, port) ) {
rv = NS_FALSE;
}
delete proxy;
delete csPort;
NET_SelectProxyStyle(PROXY_STYLE_MANUAL);
return rv;
}
void nsNetlibService::SchedulePollingTimer()
{
#if !defined(NETLIB_THREAD)