From 527d36c7e340b883e122d7181533089003cabc56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= <jindra.petrik@gmail.com>
Date: Tue, 18 Nov 2014 20:07:47 +0100
Subject: [PATCH] Fix for ESET firewall #717 Clear proxy button fix

---
 build_common.xml                              |   4 +++-
 lib/jpproxy.jar                               | Bin 86912 -> 86928 bytes
 .../jpproxy/src/com/jpexs/proxy/Server.java   |   2 ++
 .../flash/gui/proxy/ProxyFrame.java           |   7 +++----
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/build_common.xml b/build_common.xml
index fdc6a46a6..1d6aabca8 100644
--- a/build_common.xml
+++ b/build_common.xml
@@ -209,6 +209,7 @@
                     <jdkPreference>preferJre</jdkPreference>
                     <runtimeBits>64/32</runtimeBits>
                     <maxHeapPercent>${MAXHEAPSIZEPERCENT}</maxHeapPercent>
+                    <opt>-Djava.net.preferIPv4Stack=true</opt>
                 </jre>
                 <splash>
                     <file>graphics/splash.bmp</file>
@@ -516,7 +517,8 @@
 
     <target name="run" depends="build">
         <java jar="${DISTRIBUTIONDIR}/${JARFILENAME}.jar" fork="true">
-            <jvmarg value="-Xmx${MAXHEAPSIZERUN}m"/>
+            <jvmarg value="-Xmx${MAXHEAPSIZERUN}m" />
+            <jvmarg value="-Djava.net.preferIPv4Stack=true" />
             <arg line="${RUNPARAMS}" />
         </java>
     </target>
diff --git a/lib/jpproxy.jar b/lib/jpproxy.jar
index 92c28db9bfc5f156f92bed77777a8ed74a36d2da..dc386eea57e1f84095d8d8dc49c0b7a135a56695 100644
GIT binary patch
delta 1362
zcmZWp+jA3D9R5zTn@yIcG;K}UZ0RM%UN%XK*oIhz4%JpmZ7Ej7faoCV3|<&SXOwHG
z<x=VmL|AJ>Z2?)udTDC1oymi5&gi30J~;jXIzId0jQE|zGJ`(s@BGgB-M{ngIq9h9
z9W^jI<WY3M2V9*ybRp2@nV&l}p3EghdrN>P{p)M4WinMj#y-#@I@2l+>+s`<4i!iJ
z6vs3imzxuElh$xj!?=dGbm*Ay;}lLy?Tim+<vJ;2&uN&_5yXTPZ_C(sbi9lAWP<ml
zIIkmu3)1xi9Z8u+#YHJT^rtB=N%gW6wk+_Gj%j?XVMa#=S7hj{6rbpr!@Lhy<$6t?
zT-Wfa4huJYaAeibG<>e(Cce<ofdvg;>bM7ANx?Qd@U;}|;-(Zne4}AegFDkI{!rC&
z3}e&9-T}j%j|)rK<EurrJr@(2`&)<j)gx5<hYjL-x&a!z0G?ll$Fl^b05uhk#^Q$J
z!n*{`f!3pX77FmE3eZz7R%KD1N1&>LB9GNBDwiM%2+~y5qZ(=!B9H22)EH_WcPUE<
zQO`n?n*|7#t3{a2da#{k(+LE)v~k-`Q<TOInq#O#9QEkLCeAv54H&__cmiG6g>LLa
z0*^E55k}OZ3_EC1<qX(~C%H;(0KF_GwawJZidr8YWF2|-5c;9er@`LWC4#G@`@<!7
zJKZJB{Rg>`(UB}d)2QbZ3c(3+jBin!#~KI9P;pRWk$x5bj#O40DI$rA9-?|b>GS}t
zn`z&|sd{0e4^6BtyDw*?Y5&zFn$lrQ<WOsQaxkq}4s}*MhqacW<WO%JY7PxqH1>E6
z@Arrp-aMLS5w;45q|9I$4DT|UU94jQ2UWL^UEEzf@yWRFWS8sk6rQ;ad><;=!vIkz
z$3{Odp@MK$V-RbwmB0_teS}xCjZlxW`R!!W7!&MdiXGTXz@Nh|`=@SkT=?wKgouR9
zMdm9ZpcnDp!#jD}o=k|?|809|d)EFjA*^)EowRB#(JGHNi{qPC5%2a#9aIiyp-jW;
zV7GJY_Z58`9n5L86=0>J)a&@I<yX(I!9{eK<Qs{{NInORRx~L7yt7<v|4O~MbL+B%
zsgY!i5~k89TfujQgfZ~~EicjbDy=V*ps$dW2S~<){QY0!6~9iD-XMl=5}m`0ID!{(
zlwQX$g%f-`()KSK#ii&<;u1?H2>dC+eHzU;gI1j5zkim=C&~ILJChW9)R6ou-M^C}
zQ|aMjXI~i<N%;V}KM#t$??3O~%wuA=62DKt?raueyJk$R7dPzwG12Xv9h8Lr2RxPm
AE&u=k

delta 1382
zcmZWpS#uOs7(I8odwS-Qge+$12?^QE(lZkfO_-#>K+tG_5FkVu0|ra25|vP~$^|42
z39A?&NJtYwM7CB4N+!;9s^-BrtNaT-_~4V}^6Vp?J29zB`EbAc-TUpQPu~gGIPMy`
zJGW`N1OmX}$>B@6joQ%U@MtU*6HWEbqYj}5^A2seHC_meJ45wiO+v>JN$;Z)IzBdW
zOzk5<icd@=OdK~cDiOq35GQa_X{Q1>t@bl2?5v4TCGs(*#5ooFnZ!8Gs{|L6xF}JL
z3FUf8BBs*l_*{w0N=yb5lvk8Gr3yF_S21nk3yEvEu0p?5;)cXmxEa9LYQLp!ZmW<x
zChkhuxEFw{N`GVGTZ#L4AkmB&6AvYx!gorr*JgaL1Y5bUgo#HcW=(k48pPkm<&G}P
zyB8I<Fmlj?jn3#wQRLi=2-EwcS^TOA-T8T)xRWSloFBkz^UyNT<DqaQYUv(~Irv?e
z?S?j!K_H$%Fz!Jnu_BF}!d!|p@;t1ZgUBGCrh<0EGLjH!6waf_GSYZLpF=VAB>d_y
z0|5<1C}BYjyI67^a*zNTd9-PW(iBD+A_#G+HmpS_=iExS-FO-=;Ta5~1$!9yB2$#X
zhko7~s&~AMz1)@7g$@={+OyPrS*;UWSVP@Chv$iECsrelR~S3M`YgNP)`b_ALO1hn
z6Ky{1BQf^lRa$oP{1$hWzA}m8X@oS6$oYOiNgAat^le!L%4X>!|C`m9owbrJgG2ez
zPRj<`I#_oj3QAd~f*q;3au`<XtY{I{3Ck8Kl-ODdAv=;nxgAYmm2K%MRM?i0QuSB2
z`z`-ZsIdrd)eZV(P#rHX@WJxWqsBum6Syc`y7o|)y$PteA61KW9By#wb99pLAVNC(
zSRX_#@(5-TF)1V9mFTAXb~KSot=NIh=%u!c3Hq6$kI?SH8`$go)*?oP=^SVkH6@{0
z=35wFW+5IR;`^Mdts?S&+aPTRoL^dnop^FN+3FX_mPUik@k4eN?8fab@_UkKnpQL&
za3BA<sQ1z#G>yg#?0A@ZIoB$#3a&~I;T}?QM>Il8x~Q_l1>&FO<st_c>qXtiQwpXk
zQZ!7M7Dm|$zBG6p<(#()2WdM@>)WL5JEZEnr05V|g<;a~J)-nJvHO7Ne26#k5xtJ!
z5RT#;j^R8;oWItKE8)e&HGENkQ35|kxKE%KC((d2{5MW9`Dy+OXPudt*l!e*bxmGg
zo4B5@@kMkVc8i#L6TRQNMLOV2^e%f6AM6$bdPSRnv!+&roVq@-R!lkleWJyGp<7Y;
EU%dhQ761SM

diff --git a/libsrc/jpproxy/src/com/jpexs/proxy/Server.java b/libsrc/jpproxy/src/com/jpexs/proxy/Server.java
index 00ba753a7..3f0654f3a 100644
--- a/libsrc/jpproxy/src/com/jpexs/proxy/Server.java
+++ b/libsrc/jpproxy/src/com/jpexs/proxy/Server.java
@@ -38,6 +38,7 @@ public class Server implements Runnable {
      */
     public static boolean startServer(int port, List<Replacement> replacements, List<String> catchedContentTypes, CatchedListener catchedListener, ReplacedListener replacedListener) {
         stopServer();
+        stopping = false;
         try {
             myServer = new Server(port, replacements, catchedContentTypes, catchedListener, replacedListener);
         } catch (IOException ex) {
@@ -55,6 +56,7 @@ public class Server implements Runnable {
 
     public static void stopServer() {
         if (serverRunning) {
+            stopping = true;
             serverRunning = false;
             try {
                 myServer.server.close();
diff --git a/src/com/jpexs/decompiler/flash/gui/proxy/ProxyFrame.java b/src/com/jpexs/decompiler/flash/gui/proxy/ProxyFrame.java
index 61f08c28e..65459d49d 100644
--- a/src/com/jpexs/decompiler/flash/gui/proxy/ProxyFrame.java
+++ b/src/com/jpexs/decompiler/flash/gui/proxy/ProxyFrame.java
@@ -491,8 +491,7 @@ public class ProxyFrame extends AppFrame implements ActionListener, CatchedListe
                         Logger.getLogger(ProxyFrame.class.getName()).log(Level.SEVERE, null, ex);
                     }
                 }
-                tableModel = new DefaultTableModel(0, 3);
-                replacementsTable.setModel(tableModel);
+                tableModel.setRowCount(0);                
                 reps.clear();
                 break;
             case ACTION_REMOVE:
@@ -538,8 +537,8 @@ public class ProxyFrame extends AppFrame implements ActionListener, CatchedListe
             catchedContentTypes.add("text/xml");
             catchedContentTypes.add("application/xml");
             catchedContentTypes.add("application/octet-stream");
-            if(!Server.startServer(port, Configuration.getReplacements(), catchedContentTypes, this, this)){
-                JOptionPane.showMessageDialog(this, translate("error.start.server").replace("%port%", ""+port),AppStrings.translate("error"),JOptionPane.ERROR_MESSAGE);
+            if (!Server.startServer(port, reps, catchedContentTypes, this, this)) {
+                JOptionPane.showMessageDialog(this, translate("error.start.server").replace("%port%", "" + port), AppStrings.translate("error"), JOptionPane.ERROR_MESSAGE);
                 started = false;
                 return;
             }