[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipcop-svn
Subject:    [Ipcop-svn] SF.net SVN: ipcop:[6899] ipcop/trunk
From:       owes () users ! sourceforge ! net
Date:       2013-01-06 13:53:13
Message-ID: E1Trqf3-0005gz-Kw () sfp-svn-3 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 6899
          http://ipcop.svn.sourceforge.net/ipcop/?rev=6899&view=rev
Author:   owes
Date:     2013-01-06 13:53:13 +0000 (Sun, 06 Jan 2013)
Log Message:
-----------
Fix generating proxy.pac when using proxy for OpenVPN

Modified Paths:
--------------
    ipcop/trunk/src/scripts/makesquidconf.pl
    ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0

Modified: ipcop/trunk/src/scripts/makesquidconf.pl
===================================================================
--- ipcop/trunk/src/scripts/makesquidconf.pl	2013-01-06 10:29:32 UTC (rev 6898)
+++ ipcop/trunk/src/scripts/makesquidconf.pl	2013-01-06 13:53:13 UTC (rev 6899)
@@ -5,7 +5,7 @@
 #
 # IPCop is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
 # IPCop is distributed in the hope that it will be useful,
@@ -14,10 +14,9 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with IPCop; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+# along with IPCop.  If not, see <http://www.gnu.org/licenses/>.
 #
-# Copyright (C) 2009-2011, the IPCop team.
+# Copyright (C) 2009-2013, the IPCop team.
 #
 # $Id$
 #
@@ -253,7 +252,7 @@
             print FILE <<END
 
     // OpenVPN Network
-    else if (isInNet(myIpAddress(), "$ovpnnet", "$ovpnmask))
+    else if (isInNet(myIpAddress(), "$ovpnnet", "$ovpnmask"))
         return "PROXY $serverip:$proxysettings{'PROXY_PORT'}";
 END
             ;

Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0	2013-01-06 10:29:32 UTC (rev 6898)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0	2013-01-06 13:53:13 UTC (rev 6899)
@@ -36,6 +36,7 @@
 /usr/local/bin/disk-partition.sh
 /usr/local/bin/ipcopreboot
 /usr/local/bin/ipsecctrl
+/usr/local/bin/makesquidconf.pl
 /usr/local/bin/puzzleFwRules.pl
 /usr/local/bin/restartsquid
 /usr/local/bin/scheduler.pl

This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.


------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnmore_123012
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn


[prev in list] [next in list] [prev in thread] [next in thread]