From 2b001826de0afb8e38d3a0e428d6aae6bff06034 Mon Sep 17 00:00:00 2001
From: Rizchel Dayao <rizchel.a.dayao@gmail.com>
Date: Thu, 11 Jan 2018 15:19:49 -0700
Subject: [PATCH 1/2] Remove Schneider and Schneider Web Server, closes #1991
 (#2011)

---
 src/apps.json           |  20 --------------------
 src/icons/Schneider.png | Bin 1473 -> 0 bytes
 2 files changed, 20 deletions(-)
 delete mode 100644 src/icons/Schneider.png

diff --git a/src/apps.json b/src/apps.json
index 41fbe28ca..cb7e0418d 100644
--- a/src/apps.json
+++ b/src/apps.json
@@ -8237,26 +8237,6 @@
       "icon": "Scala.png",
       "website": "http://www.scala-lang.org"
     },
-    "Schneider": {
-      "cats": [
-        "45"
-      ],
-      "icon": "Schneider.png",
-      "website": "http://schneider-electric.com"
-    },
-    "Schneider Web Server": {
-      "cats": [
-        "22"
-      ],
-      "headers": {
-        "Server": "Schneider-WEB(?:/V?([\\d.]+))?\\;version:\\1"
-      },
-      "icon": "Schneider.png",
-      "implies": [
-        "Schneider"
-      ],
-      "website": "http://schneider-electric.com"
-    },
     "Scholica": {
       "cats": [
         "21"
diff --git a/src/icons/Schneider.png b/src/icons/Schneider.png
deleted file mode 100644
index d795ac7f5f41dbc3d55de6b9559def7ac889bd8b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1473
zcmV;y1wQ(TP)<h;3K|Lk000e1NJLTq001BW001Be0{{R3M5Kzw00093P)t-s00000
zk1qg^FaVD+0FW>MkTC#}GXRn`0FpKUlQsa8Hvp720F*cYlsW*FI{=kD0F^xemOB8J
zJOGwG0G2-hmpuTNJ^+_L0GB}km^=WOKmeFQ0GL7mnLq%UK>(RT0GUGonM44YMgW>Z
z0GdMpnneJcHvpSN0GmbtoI?PdMF5;g0G&brok;+mLja#e0H8nsphf_qNC2cp0HsU;
zn@9niNdcWo0iH_%sZRl_Py(e)0;x~~oJ#|!Pz0Pz1fEO;r%(l&Mg^Qo2B%I2t5XM^
zP6w$_2dYyCtWyZ5Pzjt%3aL^Holgs%Pz$V93$0iTpHUB~QxUFP5};EOuUr<QR~DpM
z7_VL$rCS=WUmm1e9<5;>v0xsuVjs3-A*Np<r(q+lWF)6zB(G&9uVyBxWGAj?C$D8E
zuxBT;X(+a9DY9uPvuG)~YAmd1EwgGat7$N;XE3d6F|cVeu52^0Y&5TKHLh+qu5UTA
zb2_qdJg{>-w{||jc|WvtL$r8Cvw23id`Pr=NxXebw|z~ud``B2P`80ly@OG>fl|AH
zQ@Vp!x`tS|g;~CZTD^!`y@^}Ch+MvkUcHK5zl&qPjAX!&WxtSR!H{OglxM+@XTp+a
z(3xnzl4-z`YQvRk#+PfrlWW72ZNZgo!<TNtmT$zBZ^xK$!<cZynQ_FJbjF)>&!2h6
zn|jHheafMI%c6hEqJPe%fXk$S&7p$LrH0L@h|Q>q&Z>*etBcR8jm@o%&#jWruanQN
zlhLu1)U%b*v6j)Ym({hJ)V7<_wxQy{q}RQq*uACMyQkQ`r`^A)*}$sY!mi%MvfanC
z+{m@w$++Cgz~<7$<J89F)YR$U*z4ln?d9O^=iu(><?rk0@$KmH?dkCC>GSXH^YHcd
z_VxGn_V@Sq_xJbr`1tqu`1ttw`1$$y`TF?z`uO_$`TP6&{QUX*{QCR+`uzR*{Qdg;
z{rdg>`u+a?{{Q*?|N8y^`u_j>{{Q>`|NQ^|{r~^||NsC0Fs=)P00001bW%=J06^y0
zW&i*JZ%IT!RCwC8k!4sEK^TBn%)ndRRlz%5P+4zr84(1(12eF@yF0Pa!^AGsv%4`c
z&%!QD?CutXQ}I-6*<E*Lk4Fyu;}74T^S;kF^F2fT2PXGvRw*zrxJKJaf3uqgRrL`>
z1OQ0nLZ@fey9W3hv2=iZ$2j|O<&EG3D!m}1ALxU~so>5Kbeu_S@mud{>V>t*n{64n
zbYry2)`>g>%t-e;>k5Ej+r>TpDHD`qG#E#w2M+Hx<(ZQDDgl$2Hmwi{{WX20PChR@
zzu@?HX)m#r6j}M!*&D?6T5#*a)q_C@gys)5|Ng|H6>DZyR8RV9f!d#C0hlccnf~!n
z<veT-m;4Nqx0mMM+EdJWK!zI<38d>D$TKq5YPIe=js40YL&L)mfY9W@XA;QU7*yo8
zf;XWsWpd`urBee#ggqJiBzuJ3yUSNak`xl$yc8dQWjBw2iIK^GPxl*&L9G_fwOHm@
zaqvY^N9|<*6}YSg(nWWKbS~MlXDO*Y(e~#1^ENz)HSal|u!JdBC2GFKGH*Nf>xPAg
zkLW1?aA7tZ_BLCXr`{~flB7McTVamlTxpih8m-;%<8F0Pw;$h|NP->$K(WOq4<9)G
z<Td#NC58n)D%QH=97X6ZfY{(EUOMFk-ch+$O#~B1yOyOix(c8lotl(DNS5UD^>|Pb
zYHe@?gG&K@NRc%@+?nmco3IaEMmd=3kN8z*;#5u@U2QJTBK+@s{k23A8jB_a?S`RQ
zg9s|9L?<c(6MVrL!GAdAM8Bd=+ONZADidS<1VkhfjR75JQh&0%ccb8tkdO+sTaQ{#
b{Ug5srh-K-E$q^600000NkvXXu0mjfe5%_r


From 69a4864a0f1c76ab2ac4a4d14cf051f648e81fdd Mon Sep 17 00:00:00 2001
From: Brandon Kelly <brandon@pixelandtonic.com>
Date: Tue, 16 Jan 2018 13:16:01 -0800
Subject: [PATCH 2/2] Escaped a bunch of \'s (#2022)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If these `\`s aren’t escaped property, they will be discarded when the JSON is decoded.
---
 src/apps.json | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/apps.json b/src/apps.json
index cb7e0418d..07c2025ae 100644
--- a/src/apps.json
+++ b/src/apps.json
@@ -627,7 +627,7 @@
         "22"
       ],
       "headers": {
-        "Server": "(?:Apache(?:$|/([\\d.]+)|[^/-])|(?:^|\b)HTTPD)\\;version:\\1"
+        "Server": "(?:Apache(?:$|/([\\d.]+)|[^/-])|(?:^|\\b)HTTPD)\\;version:\\1"
       },
       "icon": "Apache.svg",
       "website": "http://apache.org"
@@ -666,7 +666,7 @@
       ],
       "headers": {
         "Server": "^Apache-Coyote(/1\\.1)?$\\;version:\\1?4.1+:",
-        "X-Powered-By": "\bTomcat\b(?:-([\\d.]+))?\\;version:\\1"
+        "X-Powered-By": "\\bTomcat\\b(?:-([\\d.]+))?\\;version:\\1"
       },
       "icon": "Apache Tomcat.svg",
       "implies": "Java",
@@ -1190,7 +1190,7 @@
       ],
       "html": [
         "(?:<!--|<BR>)Copyright\\(C\\) [\\d-]+ Brother Industries",
-        "<TITLE>\n\\s*BROTHER "
+        "<TITLE>\\n\\s*BROTHER "
       ],
       "icon": "Brother.png",
       "website": "http://www.brother.com"
@@ -3132,7 +3132,7 @@
         "FTB_API": "",
         "FTB_AddEvent": ""
       },
-      "html": "/<!--\\s*\\*\\s*FreeTextBox v\\d+ \\(([.\\d]+)(?:(?:.|\n)+?<!--\\s*\\*\\s*License Type: (Distribution|Professional)License)?/i\\;version:\\1 \\2",
+      "html": "/<!--\\s*\\*\\s*FreeTextBox v\\d+ \\(([.\\d]+)(?:(?:.|\\n)+?<!--\\s*\\*\\s*License Type: (Distribution|Professional)License)?/i\\;version:\\1 \\2",
       "icon": "FreeTextBox.png",
       "implies": "Microsoft ASP.NET",
       "website": "http://freetextbox.com"
@@ -3455,7 +3455,7 @@
         "Set-Cookie": "i_like_gogits="
       },
       "html": [
-        "<div class=\"ui left\">\n\\s+© \\d{4} Gogs Version: ([\\d.]+) Page:\\;version:\\1",
+        "<div class=\"ui left\">\\n\\s+© \\d{4} Gogs Version: ([\\d.]+) Page:\\;version:\\1",
         "<button class=\"ui basic clone button\" id=\"repo-clone-ssh\" data-link=\"gogs@"
       ],
       "icon": "gogs.png",
@@ -3827,7 +3827,7 @@
         "22"
       ],
       "headers": {
-        "Server": "(?:^|[^-])\bHTTP-Server(?: ?/?V?([\\d.]+))?\\;version:\\1"
+        "Server": "(?:^|[^-])\\bHTTP-Server(?: ?/?V?([\\d.]+))?\\;version:\\1"
       },
       "website": "http://example.com"
     },
@@ -5321,7 +5321,7 @@
         "27"
       ],
       "headers": {
-        "X-Powered-By": "\bLua(?: ([\\d.]+))?\\;version:\\1"
+        "X-Powered-By": "\\bLua(?: ([\\d.]+))?\\;version:\\1"
       },
       "icon": "Lua.png",
       "website": "http://www.lua.org"
@@ -5834,7 +5834,7 @@
       "cats": [
         "2"
       ],
-      "html": "<a href=\"[^\"]+minibb[^<]+</a>[^<]+\n<!--End of copyright link",
+      "html": "<a href=\"[^\"]+minibb[^<]+</a>[^<]+\\n<!--End of copyright link",
       "icon": "MiniBB.png",
       "website": "http://www.minibb.com"
     },
@@ -6578,7 +6578,7 @@
         "50"
       ],
       "headers": {
-        "Set-Cookie": "\bOJSSID\b"
+        "Set-Cookie": "\\bOJSSID\\b"
       },
       "icon": "Open Journal Systems.png",
       "implies": "PHP",
@@ -7074,7 +7074,7 @@
         "27"
       ],
       "headers": {
-        "Server": "\bPerl\b(?: ?/?v?([\\d.]+))?\\;version:\\1"
+        "Server": "\\bPerl\\b(?: ?/?v?([\\d.]+))?\\;version:\\1"
       },
       "icon": "Perl.png",
       "website": "http://perl.org"
@@ -10243,7 +10243,7 @@
         "webix": ""
       },
       "icon": "Webix.png",
-      "script": "\bwebix\\.js",
+      "script": "\\bwebix\\.js",
       "website": "http://webix.com"
     },
     "Webs": {
@@ -10365,7 +10365,7 @@
         "28"
       ],
       "headers": {
-        "Server": "\bWinCE\b"
+        "Server": "\\bWinCE\\b"
       },
       "icon": "Microsoft.svg",
       "website": "http://microsoft.com"
@@ -11073,7 +11073,7 @@
         "22"
       ],
       "headers": {
-        "Server": "\beHTTP(?: v?([\\d\\.]+))?\\;version:\\1"
+        "Server": "\\beHTTP(?: v?([\\d\\.]+))?\\;version:\\1"
       },
       "implies": "HP ProCurve",
       "website": "http://example.com"
@@ -11130,7 +11130,7 @@
       ],
       "icon": "git.svg",
       "meta": {
-        "generator": "\bgit/([\\d.]+\\d)\\;version:\\1"
+        "generator": "\\bgit/([\\d.]+\\d)\\;version:\\1"
       },
       "website": "http://git-scm.com"
     },
@@ -11403,7 +11403,7 @@
         "33"
       ],
       "headers": {
-        "Server": "\b(?:mod_)?DAV\b(?:/([\\d.]+))?\\;version:\\1"
+        "Server": "\\b(?:mod_)?DAV\\b(?:/([\\d.]+))?\\;version:\\1"
       },
       "icon": "Apache.svg",
       "implies": "Apache",
@@ -11631,7 +11631,7 @@
       "headers": {
         "Set-Cookie": "^phpbb"
       },
-      "html": "(?:Powered by <a[^>]+phpbb|<a[^>]+phpbb[^>]+class=\\.copyright|\tphpBB style name|<[^>]+styles/(?:sub|pro)silver/theme|<img[^>]+i_icon_mini|<table class=\"forumline)",
+      "html": "(?:Powered by <a[^>]+phpbb|<a[^>]+phpbb[^>]+class=\\.copyright|\\tphpBB style name|<[^>]+styles/(?:sub|pro)silver/theme|<img[^>]+i_icon_mini|<table class=\"forumline)",
       "icon": "phpBB.png",
       "implies": "PHP",
       "meta": {
@@ -11828,7 +11828,7 @@
         "22"
       ],
       "headers": {
-        "Server": "\bthttpd(?:/([\\d.]+))?\\;version:\\1"
+        "Server": "\\bthttpd(?:/([\\d.]+))?\\;version:\\1"
       },
       "icon": "thttpd.png",
       "website": "http://acme.com/software/thttpd"