From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 31291 invoked from network); 17 Oct 2022 11:50:42 -0000 Received: from lists.zx2c4.com (165.227.139.114) by inbox.vuxu.org with ESMTPUTF8; 17 Oct 2022 11:50:42 -0000 Received: by lists.zx2c4.com (OpenSMTPD) with ESMTP id a444bdb0; Mon, 17 Oct 2022 11:50:28 +0000 (UTC) Return-Path: Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lists.zx2c4.com (OpenSMTPD) with ESMTP id e544d67c for ; Mon, 17 Oct 2022 11:50:26 +0000 (UTC) Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 29HBHSUY016619; Mon, 17 Oct 2022 11:50:24 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=corp-2022-7-12; bh=GDcqAs37/bwwf25bGBy2x0RT8wSO4pNl8ops9ELplv4=; b=t53ByxH/FtBdh3DyMC2+jLQebR+pO0boiu4crzO1MDr4TQAHawXfcCcdFS9zsv+8Tz23 qgbRkMNh5Sk21wwCji+Zx5QmRzrHJP5lO3YTm9WlTvWvS/xrIiFAsbF/UDWNyi8PSruV Ojd9sT+v+7ePbgJ+97t0eSJr6A5cpPiMLo/9W/9B32KH/I0WEfmfZiEuNXoRphh/GOrY nETWXQhxgdiC3DY37jj5Lh63pb7/DRFF3E/gVVKoqmXpF9zIewsFNkjlovZYZNhh35NR dhahGQS9Z+bRFiReYK+yJoK2h6rEzA2B/V+8aYpLxucBfNHznPnGhMLSnV9CQiDpAKuf OA== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3k8jt2hgcm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 17 Oct 2022 11:50:24 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 29H8t63w027654; Mon, 17 Oct 2022 11:50:23 GMT Received: from pps.reinject (localhost [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3k8hqx7kbm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 17 Oct 2022 11:50:23 +0000 Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 29HBoICr030872; Mon, 17 Oct 2022 11:50:23 GMT Received: from t460.home (dhcp-10-175-3-136.vpn.oracle.com [10.175.3.136]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTP id 3k8hqx7k5g-5; Mon, 17 Oct 2022 11:50:22 +0000 From: Vegard Nossum To: cgit@lists.zx2c4.com Cc: konstantin@linuxfoundation.org, Vegard Nossum Subject: [PATCH 4/6] git: handle string_list_init_{nodup, dup}() changes for ctx.cfg.mimetypes Date: Mon, 17 Oct 2022 13:50:08 +0200 Message-Id: <20221017115010.21977-5-vegard.nossum@oracle.com> X-Mailer: git-send-email 2.35.1.46.g38062e73e0 In-Reply-To: <20221017115010.21977-1-vegard.nossum@oracle.com> References: <20221017115010.21977-1-vegard.nossum@oracle.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-10-17_09,2022-10-17_02,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 adultscore=0 bulkscore=0 malwarescore=0 phishscore=0 mlxlogscore=999 spamscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2209130000 definitions=main-2210170068 X-Proofpoint-ORIG-GUID: 12Z6nFOI6ZvJRAIRvWmrdLbvZ45v3aHg X-Proofpoint-GUID: 12Z6nFOI6ZvJRAIRvWmrdLbvZ45v3aHg X-BeenThere: cgit@lists.zx2c4.com X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: List for cgit developers and users List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: cgit-bounces@lists.zx2c4.com Sender: "CGit" The newer git version this requires changes for these upstream commits: * bd4232fac3319890429ec303e2f7c3d287c8eaa3 Merge branch 'ab/struct-init' Signed-off-by: Vegard Nossum --- cgit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cgit.c b/cgit.c index dc6b491..e64694b 100644 --- a/cgit.c +++ b/cgit.c @@ -432,7 +432,7 @@ static void prepare_context(void) ctx.page.modified = time(NULL); ctx.page.expires = ctx.page.modified; ctx.page.etag = NULL; - string_list_init(&ctx.cfg.mimetypes, 1); + string_list_init_dup(&ctx.cfg.mimetypes); if (ctx.env.script_name) ctx.cfg.script_name = xstrdup(ctx.env.script_name); if (ctx.env.query_string) -- 2.35.1.46.g38062e73e0