From 72cbe53eda0012dc922ad5c61165a27684f0596a Mon Sep 17 00:00:00 2001
From: Mikhail Chechnev <mim_@mail.ru>
Date: Fri, 20 Mar 2020 11:56:46 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BB=D1=8F=20=D1=84=D1=83=D0=BD=D0=BA?=
 =?UTF-8?q?=D1=86=D0=B8=D0=B8=20Upload=20=D0=B8=D1=81=D0=BA=D0=BB=D1=8E?=
 =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=B0=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80?=
 =?UTF-8?q?=D0=BA=D0=B0=20Content-type=20=D0=B7=D0=B0=D0=B3=D0=BE=D0=BB?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=BA=D0=B0=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=BF=D1=80=D0=B8=20=D0=BF=D1=80=D0=B8?=
 =?UTF-8?q?=D0=BD=D1=8F=D1=82=D0=B8=D0=B8=20=D1=80=D0=B5=D1=88=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=BE=20=D0=BA=D0=BE=D0=BD=D0=B2=D0=B5=D1=80?=
 =?UTF-8?q?=D1=82=D0=B0=D1=86=D0=B8=D0=B8=20=D0=BE=D1=82=D0=B2=D0=B5=D1=82?=
 =?UTF-8?q?=D0=B0=20=D0=B2=20Json,=20=D1=82.=D0=BA.=20=D0=B2=20Content-typ?=
 =?UTF-8?q?e=20=D0=B7=D0=B0=D0=B3=D0=BE=D0=BB=D0=BE=D0=B2=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D1=83=D0=BA=D0=B0=D0=B7=D1=8B=D0=B2=D0=B0=D0=B5=D1=82=D1=81?=
 =?UTF-8?q?=D1=8F=20=D0=BD=D0=B5=20=D1=82=D0=B8=D0=BF=20=D0=BE=D1=82=D0=B2?=
 =?UTF-8?q?=D0=B5=D1=82=D0=B0,=20=D0=B0=20=D1=82=D0=B8=D0=BF=20=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=B3=D1=80=D1=83=D0=B6=D0=B0=D0=B5=D0=BC=D1=8B=D1=85=20?=
 =?UTF-8?q?=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85,=20=D1=82=D0=B8=D0=BF=20?=
 =?UTF-8?q?=D0=BE=D1=82=D0=B2=D0=B5=D1=82=D0=B0=20=D1=83=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D1=8F=D0=B5=D1=82=D1=81=D1=8F=20=D1=82=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=8C=D0=BA=D0=BE=20=D1=87=D0=B5=D1=80=D0=B5=D0=B7=20URL=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=BF=D1=80=D0=BE=D1=81=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/pws.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/modules/pws.js b/modules/pws.js
index 8160eee..23287a0 100644
--- a/modules/pws.js
+++ b/modules/pws.js
@@ -24,6 +24,9 @@ const SHEADER_RESP_CONTENT_TYPE_JSON = "application/json;charset=utf-8"; //Зн
 //Поля запроса
 const SQUERY_RESP_CT = "SRESP_CT"; //Параметр URL-запроса для принудительного указания типа возвращаемых данных
 
+//Коды функций-обработчиков (согласно настройкам "Сервисов обмена")
+const SFNC_UPLOAD = "Upload"; //Функция загрузки
+
 //------------
 // Тело модуля
 //------------
@@ -94,11 +97,16 @@ const before = async prms => {
 const after = async prms => {
     //Если пришел запрос в JSON или просили ответ в JSON
     if (
-        (prms.options.headers["content-type"] &&
-            prms.options.headers["content-type"].startsWith(SHEADER_REQ_CONTENT_TYPE_JSON)) ||
-        (prms.options.qs &&
+        (prms.function.sCode === SFNC_UPLOAD &&
+            prms.options.qs &&
             prms.options.qs[SQUERY_RESP_CT] &&
-            prms.options.qs[SQUERY_RESP_CT].startsWith(SHEADER_REQ_CONTENT_TYPE_JSON))
+            prms.options.qs[SQUERY_RESP_CT].startsWith(SHEADER_REQ_CONTENT_TYPE_JSON)) ||
+        (prms.function.sCode != SFNC_UPLOAD &&
+            ((prms.options.headers["content-type"] &&
+                prms.options.headers["content-type"].startsWith(SHEADER_REQ_CONTENT_TYPE_JSON)) ||
+                (prms.options.qs &&
+                    prms.options.qs[SQUERY_RESP_CT] &&
+                    prms.options.qs[SQUERY_RESP_CT].startsWith(SHEADER_REQ_CONTENT_TYPE_JSON))))
     ) {
         //Буфер для конвертации
         let parseRes = "";