Skip to content

- Fixing html in pac_files_docu.html #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
flyhard wants to merge 1 commit into
base: master
Choose a base branch
from
Open

- Fixing html in pac_files_docu.html #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion src/doc/pac_files_docu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,20 @@
<title>Proxy Client Autoconfig File Format</title>
</head><body text="#000000" vlink="#ff0000" alink="#ff0000" bgcolor="#ffffff" link="#0000ff">

<center><!-- BANNER:s3 --><a href="http://web.archive.org/web/20060424005037/http://wp.netscape.com/maps/banners/documentation_s3.map"><img ismap="ismap" src="proxy-live-Dateien/documentation_s3.gif" alt="Documentation" usemap="#banner_nav" width="612" border="0" height="50"></a><map name="banner_nav"><area shape="RECT" coords="62,11,91,40" href="http://web.archive.org/web/20060424005037/http://wp.netscape.com/"><area shape="RECT" coords="153,41,221,50" href="http://web.archive.org/web/20060424005037/http://wp.netscape.com/"><area shape="RECT" coords="298,8,374,34" href="http://web.archive.org/web/20060424005037/http://wp.netscape.com/support/index.html"><area shape="RECT" coords="381,15,586,43" href="http://web.archive.org/web/20060424005037/http://help.netscape.com/browse/index.html"><area shape="default" nohref=""></map><!-- BANNER:s3 --></center>
<center><!-- BANNER:s3 -->
<a href="http://web.archive.org/web/20060424005037/http://wp.netscape.com/maps/banners/documentation_s3.map">
<img ismap="ismap" src="proxy-live-Dateien/documentation_s3.gif" alt="Documentation" usemap="#banner_nav"
width="612" border="0" height="50"></a>
<map name="banner_nav">
<area shape="RECT" coords="62,11,91,40" href="http://web.archive.org/web/20060424005037/http://wp.netscape.com/" alt="">
<area shape="RECT" coords="153,41,221,50"
href="http://web.archive.org/web/20060424005037/http://wp.netscape.com/" alt="">
<area shape="RECT" coords="298,8,374,34"
href="http://web.archive.org/web/20060424005037/http://wp.netscape.com/support/index.html" alt="">
<area shape="RECT" coords="381,15,586,43"
href="http://web.archive.org/web/20060424005037/http://help.netscape.com/browse/index.html" alt="">
<area shape="default" nohref alt="">
</map><!-- BANNER:s3 --></center>

<center>
<h2>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/github/markusbernhardt/proxy/search/browser/ie/IEProxySearchStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public IEProxyConfig readIEProxyConfig() {
/*************************************************************************
* Parses the settings and creates an PAC ProxySelector for it.
*
* @param ieSettings
* @param ieProxyConfig
* the IE settings to use.
* @return a PacProxySelector the selector or null.
************************************************************************/
Expand Down Expand Up @@ -120,7 +120,7 @@ private PacProxySelector createPacSelector(IEProxyConfig ieProxyConfig) {
/*************************************************************************
* Parses the proxy settings into an ProxySelector.
*
* @param ieSettings
* @param ieProxyConfig
* the settings to use.
* @return a ProxySelector, null if no settings are set.
* @throws ProxyException
Expand Down
2 changes: 0 additions & 2 deletions .../com/github/markusbernhardt/proxy/search/desktop/gnome/GnomeDConfProxySearchStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,8 +280,6 @@ private void installSecureSelector(Properties settings, ProtocolDispatchSelector
/*************************************************************************
* Parse the settings file and extract all network.proxy.* settings from it.
*
* @param context
* the gconf context to parse.
* @param settings
* the settings object to fill.
* @return the parsed properties.
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/com/github/markusbernhardt/proxy/search/desktop/win/WinProxySearchStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public WinProxyConfig readWindowsProxyConfig() {
/*************************************************************************
* Parses the proxy settings into an ProxySelector.
*
* @param winProxySettings
* @param winProxyConfig
* the settings to use.
* @return a ProxySelector, null if no settings are set.
* @throws ProxyException
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/github/markusbernhardt/proxy/search/wpad/WpadProxySearchStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,7 @@ private String checkDhcpAckForPAC(InetAddress ip, byte[] mac) throws IOException
// fields MUST be set all-zero.
byte[] addr = new byte[16];
if (mac != null)
for (int i = 0; i < 6; i++)
addr[i] = mac[i];
System.arraycopy(mac, 0, addr, 0, 6);
// Despite what the spec says above if these are set to 0 you may
// not get a response from some dhcp servers
messageOut.setHtype((byte) 1); // 1 for Ethernet
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/com/github/markusbernhardt/proxy/search/wpad/dhcp/DHCPOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,7 @@ public void setOption(byte entryCode, byte value[]) {
*/
private byte[] getArrayOption(int length, int position, byte options[]) {
byte value[] = new byte[length];
for (int i = 0; i < length; i++) {
value[i] = options[position + i];
}
System.arraycopy(options, position, value, 0, length);
return value;
}

Expand Down
8 changes: 1 addition & 7 deletions src/main/java/com/github/markusbernhardt/proxy/search/wpad/dhcp/DHCPSocket.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
package com.github.markusbernhardt.proxy.search.wpad.dhcp;

import java.io.IOException;
import java.net.DatagramPacket;
import java.net.DatagramSocket;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.SocketException;
import java.net.UnknownHostException;
import java.net.*;

/**
* This class represents a Socket for sending DHCP Messages
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/github/markusbernhardt/proxy/TestUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public class TestUtil {
* the name of the test folder.
************************************************************************/

public static final void setTestDataFolder(String folder) {
public static void setTestDataFolder(String folder) {
System.setProperty(PlatformUtil.OVERRIDE_HOME_DIR,
System.getProperty("user.dir") + File.separator + TestUtil.TEST_DATA_FOLDER + folder);
}
Expand Down