From patchwork Sat Jun 15 19:11:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Glembotzki X-Patchwork-Id: 1948205 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20230601 header.b=U6fjFrRx; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=l4hvEU1+; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::13e; helo=mail-lf1-x13e.google.com; envelope-from=swupdate+bncbdy5juxlviebb6gsw6zqmgqezj6niwi@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-lf1-x13e.google.com (mail-lf1-x13e.google.com [IPv6:2a00:1450:4864:20::13e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W1mFT0R6mz23vC for ; Sun, 16 Jun 2024 05:20:28 +1000 (AEST) Received: by mail-lf1-x13e.google.com with SMTP id 2adb3069b0e04-52c8338fd51sf1923203e87.1 for ; Sat, 15 Jun 2024 12:20:28 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1718479225; cv=pass; d=google.com; s=arc-20160816; b=zM8HdfZKoVSyjkjBtVDFBk9KFnwXdf7IkoaUp6+aPZWWqIcEGiQt5VfgRvRfRPJBzv DKG65KJ7k7e+tdBUMZxdDC6O3LIY3VN8OGKfc9/9XHUbPnWBNCffTREK/w2ZhH/k4IBx Y8Fxczed463wtjaMcmqQRVEpj061VmGWuVB8kg+DX1V5SFZygMvQ5UiecW0My+UpMHer adLLxLa1a4WajXdW0u7ANAljZGf+3FwW4BIaFbD0grTmCEiIRFu/6lpc/j2u9x/RZmt3 WvB6ENmnV2bEAYHQSkMF7P7GAKytUpgWAxKI8qSoqYAb+CPz6HG19k2Ts++RQb5UyoZz BMkw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature :dkim-signature; bh=/ItXyRtFww0hgluS8THbYHJmQ6VZZSRLMpUf1dm0dfA=; fh=Ld1J7DYK8ahRwcJJv6z65vnevvVVEnm9ZEXIqrI/wjs=; b=t119OGU4k2/YjSW588M7K/nXgxVYe5McEJBz+sxwnaytgXVWd/p1FIW1ic7PheKqkk a6Gn9WqqY6b3IUlvpNiZGFXLkzZgIrFFdY0prG1R+BT34mp5TX0UhtskN8Zqq6shIOGy A6Kcb4GAMBYIZOjmGyXbEvPVfrsObdhrJ2KKCL2wEP6ifphtSr039D4tGWgbaHSzS6Sk hvl/0wG2oM3b5d/GwPEggpFn/r+lAqE9XYNCzKTvlB4KlVykrj9aBMN3hBIDiU2ABe80 0NUkI7gt0vxLb6RNF6+DNWrTRcBzl6Uw2AiJ/eC7yiwMvIzHEme7O0x147vnRuReiP2W Mw/A==; darn=patchwork.ozlabs.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=UdeEaFIW; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::631 as permitted sender) smtp.mailfrom=m.glembo@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1718479225; x=1719084025; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=/ItXyRtFww0hgluS8THbYHJmQ6VZZSRLMpUf1dm0dfA=; b=U6fjFrRxipOz/Dh2pOv+wZkI98tYQKB3bySMCQvL5GJV4HxMFbp2JyCO/9zPbG+51e D2r2RCbe5UyYVHevhsnldFvnH4n1mRoD8UVfoe2Suxm18OAG7olyYM3n0v2c9hHVzteh ztMMxZluq1ICfb/Ql81z7m7UWimMyPzDmYyUC1C8VlVtHWOhRfaAbNsVay8Qhlcmbj81 FDpixLRWenTidYPk3ro7a2F5Nt9DvTGs33VtEgd2D/VwnZXQzT/h7mrpXXv5gqLX8rhy IPXUKRCAwiDL6/nrRxhHYbxm9U9nOdT7cBulEFZoH08+MBvsmHuidwHJi6pLhiUG/lsx qCTQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718479225; x=1719084025; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=/ItXyRtFww0hgluS8THbYHJmQ6VZZSRLMpUf1dm0dfA=; b=l4hvEU1+c77BG/+uI6paV32QqkF3ILiEN/ht9HEov/bROS487eZFP9kw3jf2uy+o9L ULlOIscQgtAC3ssAkdBvda8fJYBeAGzV67JpX8TQDl85PWxrIKAdH/x/a+xo++bgSQRZ ZCuLWXpSinuN0V/Bgu2SxdYwgzsMW+yQgBEZ4+eTyPZwJts3KBSLUa0/9F8XLrFpJZSM C+m4HWy0IiyFlP0xpFyiTIUEm0AFhMAK5stKs9CDkPKqN/CXC395khKCYlIh815PoN9P 6oZmyUT1QesAPapFrAZuXGykftdCTJ7QvkR2rxkrN+kpftc8Q4OXTSo3LBYIGF3JDSX0 1YYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718479225; x=1719084025; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=/ItXyRtFww0hgluS8THbYHJmQ6VZZSRLMpUf1dm0dfA=; b=IGMzRbpGatQDn7Nc5WB3IoRi7LpfcKVE4Xg8K/lEDBnOZdZVCUuk0YZ1FqMnU+5h3C rpYheVQMnL41qQW3Ha/uEXMhofG/3AYwz1usS/HjfiSN4WIZOowaWnLa3tay1bGLI+iW o6HTFLJEVuSf+uUAlFz99QY8YTmxTYbl3xTOEXXnK0p9S3TPmapapBeG6fVx8PVpAx67 4jCUCvetAQQ6qrNGmBnuH+uusAiw0cFaF0yRgEPLu/4zqZ+ZNXiFxHAUPzan9Ywm+ivv dkEpdAQffBdru3NaWhqxIsy8uPDNgLLGin9SCxSSRNqUAWG83z8rRUuQJ+lDfN4YzHsD NNPA== Sender: swupdate@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCWZYHjamGNGzr8DLeBFuonSKc138jRx3kyPKOKbtUPU7NSgppmwEdicQ6KH/SCqxpdZoF9yNdbTCLmYyQ+pq2BJ3a9FgM/fAg9TtP853w== X-Gm-Message-State: AOJu0YzUeRNJcJpktlLfRPMY44o+HaWLvQuegpOVPbKAivpDV7N8+9F8 nxaZ6xADtYF82xNFQsAGfGPcxiA28H89RnBPUAVL+qTUNSyLbX7q X-Google-Smtp-Source: AGHT+IEPAk8SDUnms9xaBcTks2/OdpEkursALjS/GPe0knUDMU5pectPZ0s8bTeC6kPM90QY113Ttw== X-Received: by 2002:a19:3819:0:b0:52c:b257:bdbf with SMTP id 2adb3069b0e04-52cb257beadmr465597e87.8.1718479225188; Sat, 15 Jun 2024 12:20:25 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:ac2:4d94:0:b0:52c:a191:2696 with SMTP id 2adb3069b0e04-52ca191283fls613129e87.0.-pod-prod-00-eu; Sat, 15 Jun 2024 12:20:22 -0700 (PDT) X-Received: by 2002:a05:6512:31cb:b0:52b:bd97:ffd7 with SMTP id 2adb3069b0e04-52cb04af3fdmr829702e87.29.1718479221554; Sat, 15 Jun 2024 12:20:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718479221; cv=none; d=google.com; s=arc-20160816; b=AqKbYtjCPeQHfdwE7Eh0W1AzYo3sw5oaq1EzK+HUpa1WkDbHWH4YRIoKVsC49XKhUT m016wqHVJyKxcWraoWULzthdZsILmnRN0ymgIZxAQ/Vrn9yeUUzGmWZkQvpbohd9YcZh pUUc4/srt8nrYchNRy4nFlFcZiisbAIUewaNtKJgAOOt5fnMElIC3Hra0+jTUZs/mOLR Kzm0srh8Oi992AQ0109Fz871nzYjf1A87V+Gbx/7FE5+vxNtlK1Siv7uDSOoWPMuQrbZ bd4aHxbck+HLyMX12ksJVm7qp5KQ8N6ymr2Bjr475mkkV4XEG9TWRPl1aDahmDin5cPJ Lvug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=pN7wbSdre8mc5H2QetiMWOP8+y1w0RJnPWEgTEeiwiQ=; fh=zydHuzCQWrku2OPQyZfraJZFcOpEXLQ/YBcu3QNiBd0=; b=HzInpedJdKwx2nF+TUxTOYmTfV+Io404VcfXHJy5J3UpkcNAqj94xCVZFdIJhB4bpS lu9w+k4WE7hJoPRSSw25l4q+rVXVsig4SOROBgVTkqiqisvSJypiNRD+lfqDZw31rFV8 T2aX/J1RkzxNXkm/0x0IxqrdT5LGTgEuI16QWFjPe0PdViTp/fwfX8f2fabiouI9eYaO 6NJ79BjzAFheKcajCroCKPZYscihb5t2tA6sy5FcU1Cy1HYoa/UgEH1kVIK23W4P5kAz FYNXld7oB1WysGr+ar7uoT69+7g+zG+DpvNHoMcb8liiP6ZBM1IJF2CE36IxbemhqiQR fafw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=UdeEaFIW; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::631 as permitted sender) smtp.mailfrom=m.glembo@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com. [2a00:1450:4864:20::631]) by gmr-mx.google.com with ESMTPS id 2adb3069b0e04-52ca27c60e5si142595e87.0.2024.06.15.12.20.21 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 15 Jun 2024 12:20:21 -0700 (PDT) Received-SPF: pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::631 as permitted sender) client-ip=2a00:1450:4864:20::631; Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-a6f1cf00b3aso502532066b.0 for ; Sat, 15 Jun 2024 12:20:21 -0700 (PDT) X-Received: by 2002:a17:906:d28a:b0:a62:49ae:cd7b with SMTP id a640c23a62f3a-a6f608a7977mr365800266b.24.1718479220536; Sat, 15 Jun 2024 12:20:20 -0700 (PDT) Received: from PC-2635.irisgmbh.local ([2a02:8108:96c0:76fc::80bb]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a6f56db61e0sm327283766b.49.2024.06.15.12.20.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Jun 2024 12:20:19 -0700 (PDT) From: Michael Glembotzki To: swupdate@googlegroups.com Cc: Michael Glembotzki Subject: [swupdate] [PATCH 09/21] mongoose: Replace deprecated mg_http_match_uri() with mg_match() Date: Sat, 15 Jun 2024 21:11:22 +0200 Message-ID: <20240615191941.40301-10-Michael.Glembotzki@iris-sensing.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240615191941.40301-1-Michael.Glembotzki@iris-sensing.com> References: <20240615191941.40301-1-Michael.Glembotzki@iris-sensing.com> MIME-Version: 1.0 X-Original-Sender: m.glembo@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=UdeEaFIW; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::631 as permitted sender) smtp.mailfrom=m.glembo@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , mongoose rev-id: a025577b30be2fe0a90358702b41b7d8e5afe69f Signed-off-by: Michael Glembotzki --- mongoose/mongoose_interface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mongoose/mongoose_interface.c b/mongoose/mongoose_interface.c index b3ebc62f..ba2e8d35 100644 --- a/mongoose/mongoose_interface.c +++ b/mongoose/mongoose_interface.c @@ -692,7 +692,7 @@ static void ev_handler(struct mg_connection *nc, int ev, void *ev_data) mg_http_send_digest_auth_request(nc, global_auth_domain); else if (mg_http_get_header(hm, "Sec-WebSocket-Key") != NULL) websocket_handler(nc, ev_data); - else if (mg_http_match_uri(hm, "/restart")) + else if (mg_match(hm->uri, mg_str("/restart"), NULL)) restart_handler(nc, ev_data); else mg_http_serve_dir(nc, ev_data, &s_http_server_opts); @@ -700,7 +700,7 @@ static void ev_handler(struct mg_connection *nc, int ev, void *ev_data) struct mg_http_message hm; int hlen = mg_http_parse((char *) nc->recv.buf, nc->recv.len, &hm); if (hlen > 0) { - if (mg_http_match_uri(&hm, "/upload")) { + if (mg_match(hm.uri, mg_str("/upload"), NULL)) { if (!mg_http_is_authorized(&hm, global_auth_domain, global_auth_file)) { if (nc->pfn != NULL) mg_http_send_digest_auth_request(nc, global_auth_domain);