1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
2228
2229
2230
2231
2232
2233
2234
2235
2236
2237
2238
2239
2240
2241
2242
2243
2244
2245
2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
2271
2272
2273
2274
2275
2276
2277
2278
2279
2280
2281
2282
2283
2284
2285
2286
2287
2288
2289
2290
2291
2292
2293
2294
2295
2296
2297
2298
2299
2300
2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
2319
2320
2321
2322
2323
2324
2325
2326
2327
2328
2329
2330
2331
2332
2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
2350
2351
2352
2353
2354
2355
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376
2377
2378
2379
2380
2381
2382
2383
2384
2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
2395
2396
2397
2398
2399
2400
2401
2402
2403
2404
2405
2406
2407
2408
2409
2410
2411
2412
2413
2414
2415
2416
2417
2418
2419
2420
2421
2422
2423
2424
2425
2426
2427
2428
2429
2430
2431
2432
2433
2434
2435
2436
2437
2438
2439
2440
2441
2442
2443
2444
2445
2446
2447
2448
2449
2450
2451
2452
2453
2454
2455
2456
2457
2458
2459
2460
2461
2462
2463
2464
2465
2466
2467
2468
2469
2470
2471
2472
2473
2474
2475
2476
2477
2478
2479
2480
2481
2482
2483
2484
2485
2486
2487
2488
2489
2490
2491
2492
2493
2494
2495
2496
2497
2498
2499
2500
2501
2502
2503
2504
2505
2506
2507
2508
2509
2510
2511
2512
2513
2514
2515
2516
2517
2518
2519
2520
2521
2522
2523
2524
2525
2526
2527
2528
2529
2530
2531
2532
2533
2534
2535
2536
2537
2538
2539
2540
2541
2542
2543
2544
2545
2546
2547
2548
2549
2550
2551
2552
2553
2554
2555
2556
2557
2558
2559
2560
2561
2562
2563
2564
2565
2566
2567
2568
2569
2570
2571
2572
2573
2574
2575
2576
2577
2578
2579
2580
2581
2582
2583
2584
2585
2586
2587
2588
2589
2590
2591
2592
2593
2594
2595
2596
2597
2598
2599
2600
2601
2602
2603
2604
2605
2606
2607
2608
2609
2610
2611
2612
2613
2614
2615
2616
2617
2618
2619
2620
2621
2622
2623
2624
2625
2626
2627
2628
2629
2630
2631
2632
2633
2634
2635
2636
2637
2638
2639
2640
2641
2642
2643
2644
2645
2646
2647
2648
2649
2650
2651
2652
2653
2654
2655
2656
2657
2658
2659
2660
2661
2662
2663
2664
2665
2666
2667
2668
2669
2670
2671
2672
2673
2674
2675
2676
2677
2678
2679
2680
2681
2682
2683
2684
2685
2686
2687
2688
2689
2690
2691
2692
2693
2694
2695
2696
2697
2698
2699
2700
2701
2702
2703
2704
2705
2706
2707
2708
2709
2710
2711
2712
2713
2714
2715
2716
2717
2718
2719
2720
2721
2722
2723
2724
2725
2726
2727
2728
2729
2730
2731
2732
2733
2734
2735
2736
2737
2738
2739
2740
2741
2742
2743
2744
2745
2746
2747
2748
2749
2750
2751
2752
2753
2754
2755
2756
2757
2758
2759
2760
2761
2762
2763
2764
2765
2766
2767
2768
2769
2770
2771
2772
2773
2774
2775
2776
2777
2778
2779
2780
2781
2782
2783
2784
2785
2786
2787
2788
2789
2790
2791
2792
2793
2794
2795
2796
2797
2798
2799
2800
2801
2802
2803
2804
2805
2806
2807
2808
2809
2810
2811
2812
2813
2814
2815
2816
2817
2818
2819
2820
2821
2822
2823
2824
2825
2826
2827
2828
2829
2830
2831
2832
2833
2834
2835
2836
2837
2838
2839
2840
2841
2842
2843
2844
2845
2846
2847
2848
2849
2850
2851
2852
2853
2854
2855
2856
2857
2858
2859
2860
2861
2862
2863
2864
2865
2866
2867
2868
2869
2870
2871
2872
2873
2874
2875
2876
2877
2878
2879
2880
2881
2882
2883
2884
2885
2886
2887
2888
2889
2890
2891
2892
2893
2894
2895
2896
2897
2898
2899
2900
2901
2902
2903
2904
2905
2906
2907
2908
2909
2910
2911
2912
2913
2914
2915
2916
2917
2918
2919
2920
2921
2922
2923
2924
2925
2926
2927
2928
2929
2930
2931
2932
2933
2934
2935
2936
2937
2938
2939
2940
2941
2942
2943
2944
2945
2946
2947
2948
2949
2950
2951
2952
2953
2954
2955
2956
2957
2958
2959
2960
2961
2962
2963
2964
2965
2966
2967
2968
2969
2970
2971
2972
2973
2974
2975
2976
2977
2978
2979
2980
2981
2982
2983
2984
2985
2986
2987
2988
2989
2990
2991
2992
2993
2994
2995
2996
2997
2998
2999
3000
3001
3002
3003
3004
3005
3006
3007
3008
3009
3010
3011
3012
3013
3014
3015
3016
3017
3018
3019
3020
3021
3022
3023
3024
3025
3026
3027
3028
3029
3030
3031
3032
3033
3034
3035
3036
3037
3038
3039
3040
3041
3042
3043
3044
3045
3046
3047
3048
3049
3050
3051
3052
3053
3054
3055
3056
3057
3058
3059
3060
3061
3062
3063
3064
3065
3066
3067
3068
3069
3070
3071
3072
3073
3074
3075
3076
3077
3078
3079
3080
3081
3082
3083
3084
3085
3086
3087
3088
3089
3090
3091
3092
3093
3094
3095
3096
3097
3098
3099
3100
3101
3102
3103
3104
3105
3106
3107
3108
3109
3110
3111
3112
3113
3114
3115
3116
3117
3118
3119
3120
3121
3122
3123
3124
3125
3126
3127
3128
3129
3130
3131
3132
3133
3134
3135
3136
3137
3138
3139
3140
3141
3142
3143
3144
3145
3146
3147
3148
3149
3150
3151
3152
3153
3154
3155
3156
3157
3158
3159
3160
3161
3162
3163
3164
3165
3166
3167
3168
3169
3170
3171
3172
3173
3174
3175
3176
3177
3178
3179
3180
3181
3182
3183
3184
3185
3186
3187
3188
3189
3190
3191
3192
3193
3194
3195
3196
3197
3198
3199
3200
3201
3202
3203
3204
3205
3206
3207
3208
3209
3210
3211
3212
3213
3214
3215
3216
3217
3218
3219
3220
3221
3222
3223
3224
3225
3226
3227
3228
3229
3230
3231
3232
3233
3234
3235
3236
3237
3238
3239
3240
3241
3242
3243
3244
3245
3246
3247
3248
3249
3250
3251
3252
3253
3254
3255
3256
3257
3258
3259
3260
3261
3262
3263
3264
3265
3266
3267
3268
3269
3270
3271
3272
3273
3274
3275
3276
3277
3278
3279
3280
3281
3282
3283
3284
3285
3286
3287
3288
3289
3290
3291
3292
3293
3294
3295
3296
3297
3298
3299
3300
3301
3302
3303
3304
3305
3306
3307
3308
3309
3310
3311
3312
3313
3314
3315
3316
3317
3318
3319
3320
3321
3322
3323
3324
3325
3326
3327
3328
3329
3330
3331
3332
3333
3334
3335
3336
3337
3338
3339
3340
3341
3342
3343
3344
3345
3346
3347
3348
3349
3350
3351
3352
3353
3354
3355
3356
3357
3358
3359
3360
3361
3362
3363
3364
3365
3366
3367
3368
3369
3370
3371
3372
3373
3374
3375
3376
3377
3378
3379
3380
3381
3382
3383
3384
3385
3386
3387
3388
3389
3390
3391
3392
3393
3394
3395
3396
3397
3398
3399
3400
3401
3402
3403
3404
3405
3406
3407
3408
3409
3410
3411
3412
3413
3414
3415
3416
3417
3418
3419
3420
3421
3422
3423
3424
3425
3426
3427
3428
3429
3430
3431
3432
3433
3434
3435
3436
3437
3438
3439
3440
3441
3442
3443
3444
3445
3446
3447
3448
3449
3450
3451
3452
3453
3454
3455
3456
3457
3458
3459
3460
3461
3462
3463
3464
3465
3466
3467
3468
3469
3470
3471
3472
3473
3474
3475
3476
3477
3478
3479
3480
3481
3482
3483
3484
3485
3486
3487
3488
3489
3490
3491
3492
3493
3494
3495
3496
3497
3498
3499
3500
3501
3502
3503
3504
3505
3506
3507
3508
3509
3510
3511
3512
3513
3514
3515
3516
3517
3518
3519
3520
3521
3522
3523
3524
3525
3526
3527
3528
3529
3530
3531
3532
3533
3534
3535
3536
3537
3538
3539
3540
3541
3542
3543
3544
3545
3546
3547
3548
3549
3550
3551
3552
3553
3554
3555
3556
3557
3558
3559
3560
3561
3562
3563
3564
3565
3566
3567
3568
3569
3570
3571
3572
3573
3574
3575
3576
3577
3578
3579
3580
3581
3582
3583
3584
3585
3586
3587
3588
3589
3590
3591
3592
3593
3594
3595
3596
3597
3598
3599
3600
3601
3602
3603
3604
3605
3606
3607
3608
3609
3610
3611
3612
3613
3614
3615
3616
3617
3618
3619
3620
3621
3622
3623
3624
3625
3626
3627
3628
3629
3630
3631
3632
3633
3634
3635
3636
3637
3638
3639
3640
3641
3642
3643
3644
3645
3646
3647
3648
3649
3650
3651
3652
3653
3654
3655
3656
3657
3658
3659
3660
3661
3662
3663
3664
3665
3666
3667
3668
3669
3670
3671
3672
3673
3674
3675
3676
3677
3678
3679
3680
3681
3682
3683
3684
3685
3686
3687
3688
3689
3690
3691
3692
3693
3694
3695
3696
3697
3698
3699
3700
3701
3702
3703
3704
3705
3706
3707
3708
3709
3710
3711
3712
3713
3714
3715
3716
3717
3718
3719
3720
3721
3722
3723
3724
3725
3726
3727
3728
3729
3730
3731
3732
3733
3734
3735
3736
3737
3738
3739
3740
3741
3742
3743
3744
3745
3746
3747
3748
3749
3750
3751
3752
3753
3754
3755
3756
3757
3758
3759
3760
3761
3762
3763
3764
3765
3766
3767
3768
3769
3770
3771
3772
3773
3774
3775
3776
3777
3778
3779
3780
3781
3782
3783
3784
3785
3786
3787
3788
3789
3790
3791
3792
3793
3794
3795
3796
3797
3798
3799
3800
3801
3802
3803
3804
3805
3806
3807
3808
3809
3810
3811
3812
3813
3814
3815
3816
3817
3818
3819
3820
3821
3822
3823
3824
3825
3826
3827
3828
3829
3830
3831
3832
3833
3834
3835
3836
3837
3838
3839
3840
3841
3842
3843
3844
3845
3846
3847
3848
3849
3850
3851
3852
3853
3854
3855
3856
3857
3858
3859
3860
3861
3862
3863
3864
3865
3866
3867
3868
3869
3870
3871
3872
3873
3874
3875
3876
3877
3878
3879
3880
3881
3882
3883
3884
3885
3886
3887
3888
3889
3890
3891
3892
3893
3894
3895
3896
3897
3898
3899
3900
3901
3902
3903
3904
3905
3906
3907
3908
3909
3910
3911
3912
3913
3914
3915
3916
3917
3918
3919
3920
3921
3922
3923
3924
3925
3926
3927
3928
3929
3930
3931
3932
3933
3934
3935
3936
3937
3938
3939
3940
3941
3942
3943
3944
3945
3946
3947
3948
3949
3950
3951
3952
3953
3954
3955
3956
3957
3958
3959
3960
3961
3962
3963
3964
3965
3966
3967
3968
3969
3970
3971
3972
3973
3974
3975
3976
3977
3978
3979
3980
3981
3982
3983
3984
3985
3986
3987
3988
3989
3990
3991
3992
3993
3994
3995
3996
3997
3998
3999
4000
4001
4002
4003
4004
4005
4006
4007
4008
4009
4010
4011
4012
4013
4014
4015
4016
4017
4018
4019
4020
4021
4022
4023
4024
4025
4026
4027
4028
4029
4030
4031
4032
4033
4034
4035
4036
4037
4038
4039
4040
4041
4042
4043
4044
4045
4046
4047
4048
4049
4050
4051
4052
4053
4054
4055
4056
4057
4058
4059
4060
4061
4062
4063
4064
4065
4066
4067
4068
4069
4070
4071
4072
4073
4074
4075
4076
4077
4078
4079
4080
4081
4082
4083
4084
4085
4086
4087
4088
4089
4090
4091
4092
4093
4094
4095
4096
4097
4098
4099
4100
4101
4102
4103
4104
4105
4106
4107
4108
4109
4110
4111
4112
4113
4114
4115
4116
4117
4118
4119
4120
4121
4122
4123
4124
4125
4126
4127
4128
4129
4130
4131
4132
4133
4134
4135
4136
4137
4138
4139
4140
4141
4142
4143
4144
4145
4146
4147
4148
4149
4150
4151
4152
4153
4154
4155
4156
4157
4158
4159
4160
4161
4162
4163
4164
4165
4166
4167
4168
4169
4170
4171
4172
4173
4174
4175
4176
4177
4178
4179
4180
4181
4182
4183
4184
4185
4186
4187
4188
4189
4190
4191
4192
4193
4194
4195
4196
4197
4198
4199
4200
4201
4202
4203
4204
4205
4206
4207
4208
4209
4210
4211
4212
4213
4214
4215
4216
4217
4218
4219
4220
4221
4222
4223
4224
4225
4226
4227
4228
4229
4230
4231
4232
4233
4234
4235
4236
4237
4238
4239
4240
4241
4242
4243
4244
4245
4246
4247
4248
4249
4250
4251
4252
4253
4254
4255
4256
4257
4258
4259
4260
4261
4262
4263
4264
4265
4266
4267
4268
4269
4270
4271
4272
4273
4274
4275
4276
4277
4278
4279
4280
4281
4282
4283
4284
4285
4286
4287
4288
4289
4290
4291
4292
4293
4294
4295
4296
4297
4298
4299
4300
4301
4302
4303
4304
4305
4306
4307
4308
4309
4310
4311
4312
4313
4314
4315
4316
4317
4318
4319
4320
4321
4322
4323
4324
4325
4326
4327
4328
4329
4330
4331
4332
4333
4334
4335
4336
4337
4338
4339
4340
4341
4342
4343
4344
4345
4346
4347
4348
4349
4350
4351
4352
4353
4354
4355
4356
4357
4358
4359
4360
4361
4362
4363
4364
4365
4366
4367
4368
4369
4370
4371
4372
4373
4374
4375
4376
4377
4378
4379
4380
4381
4382
4383
4384
4385
4386
4387
4388
4389
4390
4391
4392
4393
4394
4395
4396
4397
4398
4399
4400
4401
4402
4403
4404
4405
4406
4407
4408
4409
4410
4411
4412
4413
4414
4415
4416
4417
4418
4419
4420
4421
4422
4423
4424
4425
4426
4427
4428
4429
4430
4431
4432
4433
4434
4435
4436
4437
4438
4439
4440
4441
4442
4443
4444
4445
4446
4447
4448
4449
4450
4451
4452
4453
4454
4455
4456
4457
4458
4459
4460
4461
4462
4463
4464
4465
4466
4467
4468
4469
4470
4471
4472
4473
4474
4475
4476
4477
4478
4479
4480
4481
4482
4483
4484
4485
4486
4487
4488
4489
4490
4491
4492
4493
4494
4495
4496
4497
4498
4499
4500
4501
4502
4503
4504
4505
4506
4507
4508
4509
4510
4511
4512
4513
4514
4515
4516
4517
4518
4519
4520
4521
4522
4523
4524
4525
4526
4527
4528
4529
4530
4531
4532
4533
4534
4535
4536
4537
4538
4539
4540
4541
4542
4543
4544
4545
4546
4547
4548
4549
4550
4551
4552
4553
4554
4555
4556
4557
4558
4559
4560
4561
4562
4563
4564
4565
4566
4567
4568
4569
4570
4571
4572
4573
4574
4575
4576
4577
4578
4579
4580
4581
4582
4583
4584
4585
4586
4587
4588
4589
4590
4591
4592
4593
4594
4595
4596
4597
4598
4599
4600
4601
4602
4603
4604
4605
4606
4607
4608
4609
4610
4611
4612
4613
4614
4615
4616
4617
4618
4619
4620
4621
4622
4623
4624
4625
4626
4627
4628
4629
4630
4631
4632
4633
4634
4635
4636
4637
4638
4639
4640
4641
4642
4643
4644
4645
4646
4647
4648
4649
4650
4651
4652
4653
4654
4655
4656
4657
4658
4659
4660
4661
4662
4663
4664
4665
4666
4667
4668
4669
4670
4671
4672
4673
4674
4675
4676
4677
4678
4679
4680
4681
4682
4683
4684
4685
4686
4687
4688
4689
4690
4691
4692
4693
4694
4695
4696
4697
4698
4699
4700
4701
4702
4703
4704
4705
4706
4707
4708
4709
4710
4711
4712
4713
4714
4715
4716
4717
4718
4719
4720
4721
4722
4723
4724
4725
4726
4727
4728
4729
4730
4731
4732
4733
4734
4735
4736
4737
4738
4739
4740
4741
4742
4743
4744
4745
4746
4747
4748
4749
4750
4751
4752
4753
4754
4755
4756
4757
4758
4759
4760
4761
4762
4763
4764
4765
4766
4767
4768
4769
4770
4771
4772
4773
4774
4775
4776
4777
4778
4779
4780
4781
4782
4783
4784
4785
4786
4787
4788
4789
4790
4791
4792
4793
4794
4795
4796
4797
4798
4799
4800
4801
4802
4803
4804
4805
4806
4807
4808
4809
4810
4811
4812
4813
4814
4815
4816
4817
4818
4819
4820
4821
4822
4823
4824
4825
4826
4827
4828
4829
4830
4831
4832
4833
4834
4835
4836
4837
4838
4839
4840
4841
4842
4843
4844
4845
4846
4847
4848
4849
4850
4851
4852
4853
4854
4855
4856
4857
4858
4859
4860
4861
4862
4863
4864
4865
4866
4867
4868
4869
4870
4871
4872
4873
4874
4875
4876
4877
4878
4879
4880
4881
4882
4883
4884
4885
4886
4887
4888
4889
4890
4891
4892
4893
4894
4895
4896
4897
4898
4899
4900
4901
4902
4903
4904
4905
4906
4907
4908
4909
4910
4911
4912
4913
4914
4915
4916
4917
4918
4919
4920
4921
4922
4923
4924
4925
4926
4927
4928
4929
4930
4931
4932
4933
4934
4935
4936
4937
4938
4939
4940
4941
4942
4943
4944
4945
4946
4947
4948
4949
4950
4951
4952
4953
4954
4955
4956
4957
4958
4959
4960
4961
4962
4963
4964
4965
4966
4967
4968
4969
4970
4971
4972
4973
4974
4975
4976
4977
4978
4979
4980
4981
4982
4983
4984
4985
4986
4987
4988
4989
4990
4991
4992
4993
4994
4995
4996
4997
4998
4999
5000
5001
5002
5003
5004
5005
5006
5007
5008
5009
5010
5011
5012
5013
5014
5015
5016
5017
5018
5019
5020
5021
5022
5023
5024
5025
5026
5027
5028
5029
5030
5031
5032
5033
5034
5035
5036
5037
5038
5039
5040
5041
5042
5043
5044
5045
5046
5047
5048
5049
5050
5051
5052
5053
5054
5055
5056
5057
5058
5059
5060
5061
5062
5063
5064
5065
5066
5067
5068
5069
5070
5071
5072
5073
5074
5075
5076
5077
5078
5079
5080
5081
5082
5083
5084
5085
5086
5087
5088
5089
5090
5091
5092
5093
5094
5095
5096
5097
5098
5099
5100
5101
5102
5103
5104
5105
5106
5107
5108
5109
5110
5111
5112
5113
5114
5115
5116
5117
5118
5119
5120
5121
5122
5123
5124
5125
5126
5127
5128
5129
5130
5131
5132
5133
5134
5135
5136
5137
5138
5139
5140
5141
5142
5143
5144
5145
5146
5147
5148
5149
5150
5151
5152
5153
5154
5155
5156
5157
5158
5159
5160
5161
5162
5163
5164
5165
5166
5167
5168
5169
5170
5171
5172
5173
5174
5175
5176
5177
5178
5179
5180
5181
5182
5183
5184
5185
5186
5187
5188
5189
5190
5191
5192
5193
5194
5195
5196
5197
5198
5199
5200
5201
5202
5203
5204
5205
5206
5207
5208
5209
5210
5211
5212
5213
5214
5215
5216
5217
5218
5219
5220
5221
5222
5223
5224
5225
5226
5227
5228
5229
5230
5231
5232
5233
5234
5235
5236
5237
5238
5239
5240
5241
5242
5243
5244
5245
5246
5247
5248
5249
5250
5251
5252
5253
5254
5255
5256
5257
5258
5259
5260
5261
5262
5263
5264
5265
5266
5267
5268
5269
5270
5271
5272
5273
5274
5275
5276
5277
5278
5279
5280
5281
5282
5283
5284
5285
5286
5287
5288
5289
5290
5291
5292
5293
5294
5295
5296
5297
5298
5299
5300
5301
5302
5303
5304
5305
5306
5307
5308
5309
5310
5311
5312
5313
5314
5315
5316
5317
5318
5319
5320
5321
5322
5323
5324
5325
5326
5327
5328
5329
5330
5331
5332
5333
5334
5335
5336
5337
5338
5339
5340
5341
5342
5343
5344
5345
5346
5347
5348
5349
5350
5351
5352
5353
5354
5355
5356
5357
5358
5359
5360
5361
5362
5363
5364
5365
5366
5367
5368
5369
5370
5371
5372
5373
5374
5375
5376
5377
5378
5379
5380
5381
5382
5383
5384
5385
5386
5387
5388
5389
5390
5391
5392
5393
5394
5395
5396
5397
5398
5399
5400
5401
5402
5403
5404
5405
5406
5407
5408
5409
5410
5411
5412
5413
5414
5415
5416
5417
5418
5419
5420
5421
5422
5423
5424
5425
5426
5427
5428
5429
5430
5431
5432
5433
5434
5435
5436
5437
5438
5439
5440
5441
5442
5443
5444
5445
5446
5447
5448
5449
5450
5451
5452
5453
5454
5455
5456
5457
5458
5459
5460
5461
5462
5463
5464
5465
5466
5467
5468
5469
5470
5471
5472
5473
5474
5475
5476
5477
5478
5479
5480
5481
5482
5483
5484
5485
5486
5487
5488
5489
5490
5491
5492
5493
5494
5495
5496
5497
5498
5499
5500
5501
5502
5503
5504
5505
5506
5507
5508
5509
5510
5511
5512
5513
5514
5515
5516
5517
5518
5519
5520
5521
5522
5523
5524
5525
5526
5527
5528
5529
5530
5531
5532
5533
5534
5535
5536
5537
5538
5539
5540
5541
5542
5543
5544
5545
5546
5547
5548
5549
5550
5551
5552
5553
5554
5555
5556
5557
5558
5559
5560
5561
5562
5563
5564
5565
5566
5567
5568
5569
5570
5571
5572
5573
5574
5575
5576
5577
5578
5579
5580
5581
5582
5583
5584
5585
5586
5587
5588
5589
5590
5591
5592
5593
5594
5595
5596
5597
5598
5599
5600
5601
5602
5603
5604
5605
5606
5607
5608
5609
5610
5611
5612
5613
5614
5615
5616
5617
5618
5619
5620
5621
5622
5623
5624
5625
5626
5627
5628
5629
5630
5631
5632
5633
5634
5635
5636
5637
5638
5639
5640
5641
5642
5643
5644
5645
5646
5647
5648
5649
5650
5651
5652
5653
5654
5655
5656
5657
5658
5659
5660
5661
5662
5663
5664
5665
5666
5667
5668
5669
5670
5671
5672
5673
5674
5675
5676
5677
5678
5679
5680
5681
5682
5683
5684
5685
5686
5687
5688
5689
5690
5691
5692
5693
5694
5695
5696
5697
5698
5699
5700
5701
5702
5703
5704
5705
5706
5707
5708
5709
5710
5711
5712
5713
5714
5715
5716
5717
5718
5719
5720
5721
5722
5723
5724
5725
5726
5727
5728
5729
5730
5731
5732
5733
5734
5735
5736
5737
5738
5739
5740
5741
5742
5743
5744
5745
5746
5747
5748
5749
5750
5751
5752
5753
5754
5755
5756
5757
5758
5759
5760
5761
5762
5763
5764
5765
5766
5767
5768
5769
5770
5771
5772
5773
5774
5775
5776
5777
5778
5779
5780
5781
5782
5783
5784
5785
5786
5787
5788
5789
5790
5791
5792
5793
5794
5795
5796
5797
5798
5799
5800
5801
5802
5803
5804
5805
5806
5807
5808
5809
5810
5811
5812
5813
5814
5815
5816
5817
5818
5819
5820
5821
5822
5823
5824
5825
5826
5827
5828
5829
5830
5831
5832
5833
5834
5835
5836
5837
5838
5839
5840
5841
5842
5843
5844
5845
5846
5847
5848
5849
5850
5851
5852
5853
5854
5855
5856
5857
5858
5859
5860
5861
5862
5863
5864
5865
5866
5867
5868
5869
5870
5871
5872
5873
5874
5875
5876
5877
5878
5879
5880
5881
5882
5883
5884
5885
5886
5887
5888
5889
5890
5891
5892
5893
5894
5895
5896
5897
5898
5899
5900
5901
5902
5903
5904
5905
5906
5907
5908
5909
5910
5911
5912
5913
5914
5915
5916
5917
5918
5919
5920
5921
5922
5923
5924
5925
5926
5927
5928
5929
5930
5931
5932
5933
5934
5935
5936
5937
5938
5939
5940
5941
5942
5943
5944
5945
5946
5947
5948
5949
5950
5951
5952
5953
5954
5955
5956
5957
5958
5959
5960
5961
5962
5963
5964
5965
5966
5967
5968
5969
5970
5971
5972
5973
5974
5975
5976
5977
5978
5979
5980
5981
5982
5983
5984
5985
5986
5987
5988
5989
5990
5991
5992
5993
5994
5995
5996
5997
5998
5999
6000
6001
6002
6003
6004
6005
6006
6007
6008
6009
6010
6011
6012
6013
6014
6015
6016
6017
6018
6019
6020
6021
6022
6023
6024
6025
6026
6027
6028
6029
6030
6031
6032
6033
6034
6035
6036
6037
6038
6039
6040
6041
6042
6043
6044
6045
6046
6047
6048
6049
6050
6051
6052
6053
6054
6055
6056
6057
6058
6059
6060
6061
6062
6063
6064
6065
6066
6067
6068
6069
6070
6071
6072
6073
6074
6075
6076
6077
6078
6079
6080
6081
6082
6083
6084
6085
6086
6087
6088
6089
6090
6091
6092
6093
6094
6095
6096
6097
6098
6099
6100
6101
6102
6103
6104
6105
6106
6107
6108
6109
6110
6111
6112
6113
6114
6115
6116
6117
6118
6119
6120
6121
6122
6123
6124
6125
6126
6127
6128
6129
6130
6131
6132
6133
6134
6135
6136
6137
6138
6139
6140
6141
6142
6143
6144
6145
6146
6147
6148
6149
6150
6151
6152
6153
6154
6155
6156
6157
6158
6159
6160
6161
6162
6163
6164
6165
6166
6167
6168
6169
6170
6171
6172
6173
6174
6175
6176
6177
6178
6179
6180
6181
6182
6183
6184
6185
6186
6187
6188
6189
6190
6191
6192
6193
6194
6195
6196
6197
6198
6199
6200
6201
6202
6203
6204
6205
6206
6207
6208
6209
6210
6211
6212
6213
6214
6215
6216
6217
6218
6219
6220
6221
6222
6223
6224
6225
6226
6227
6228
6229
6230
6231
6232
6233
6234
6235
6236
6237
6238
6239
6240
6241
6242
6243
6244
6245
6246
6247
6248
6249
6250
6251
6252
6253
6254
6255
6256
6257
6258
6259
6260
6261
6262
6263
6264
6265
6266
6267
6268
6269
6270
6271
6272
6273
6274
6275
6276
6277
6278
6279
6280
6281
6282
6283
6284
6285
6286
6287
6288
6289
6290
6291
6292
6293
6294
6295
6296
6297
6298
6299
6300
6301
6302
6303
6304
6305
6306
6307
6308
6309
6310
6311
6312
6313
6314
6315
6316
6317
6318
6319
6320
6321
6322
6323
6324
6325
6326
6327
6328
6329
6330
6331
6332
6333
6334
6335
6336
6337
6338
6339
6340
6341
6342
6343
6344
6345
6346
6347
6348
6349
6350
6351
6352
6353
6354
6355
6356
6357
6358
6359
6360
6361
6362
6363
6364
6365
6366
6367
6368
6369
6370
6371
6372
6373
6374
6375
6376
6377
6378
6379
6380
6381
6382
6383
6384
6385
6386
6387
6388
6389
6390
6391
6392
6393
6394
6395
6396
6397
6398
6399
6400
6401
6402
6403
6404
6405
6406
6407
6408
6409
6410
6411
6412
6413
6414
6415
6416
6417
6418
6419
6420
6421
6422
6423
6424
6425
6426
6427
6428
6429
6430
6431
6432
6433
6434
6435
6436
6437
6438
6439
6440
6441
6442
6443
6444
6445
6446
6447
6448
6449
6450
6451
6452
6453
6454
6455
6456
6457
6458
6459
6460
6461
6462
6463
6464
6465
6466
6467
6468
6469
6470
6471
6472
6473
6474
6475
6476
6477
6478
6479
6480
6481
6482
6483
6484
6485
6486
6487
6488
6489
6490
6491
6492
6493
6494
6495
6496
6497
6498
6499
6500
6501
6502
6503
6504
6505
6506
6507
6508
6509
6510
6511
6512
6513
6514
6515
6516
6517
6518
6519
6520
6521
6522
6523
6524
6525
6526
6527
6528
6529
6530
6531
6532
6533
6534
6535
6536
6537
6538
6539
6540
6541
6542
6543
6544
6545
6546
6547
6548
6549
6550
6551
6552
6553
6554
6555
6556
6557
6558
6559
6560
6561
6562
6563
6564
6565
6566
6567
6568
6569
6570
6571
6572
6573
6574
6575
6576
6577
6578
6579
6580
6581
6582
6583
6584
6585
6586
6587
6588
6589
6590
6591
6592
6593
6594
6595
6596
6597
6598
6599
6600
6601
6602
6603
6604
6605
6606
6607
6608
6609
6610
6611
6612
6613
6614
6615
6616
6617
6618
6619
6620
6621
6622
6623
6624
6625
6626
6627
6628
6629
6630
6631
6632
6633
6634
6635
6636
6637
6638
6639
6640
6641
6642
6643
6644
6645
6646
6647
6648
6649
6650
6651
6652
6653
6654
6655
6656
6657
6658
6659
6660
6661
6662
6663
6664
6665
6666
6667
6668
6669
6670
6671
6672
6673
6674
6675
6676
6677
6678
6679
6680
6681
6682
6683
6684
6685
6686
6687
6688
6689
6690
6691
6692
6693
6694
6695
6696
6697
6698
6699
6700
6701
6702
6703
6704
6705
6706
6707
6708
6709
6710
6711
6712
6713
6714
6715
6716
6717
6718
6719
6720
6721
6722
6723
6724
6725
6726
6727
6728
6729
6730
6731
6732
6733
6734
6735
6736
6737
6738
6739
6740
6741
6742
6743
6744
6745
6746
6747
6748
6749
6750
6751
6752
6753
6754
6755
6756
6757
6758
6759
6760
6761
6762
6763
6764
6765
6766
6767
6768
6769
6770
6771
6772
6773
6774
6775
6776
6777
6778
6779
6780
6781
6782
6783
6784
6785
6786
6787
6788
6789
6790
6791
6792
6793
6794
6795
6796
6797
6798
6799
6800
6801
6802
6803
6804
6805
6806
6807
6808
6809
6810
6811
6812
6813
6814
6815
6816
6817
6818
6819
6820
6821
6822
6823
6824
6825
6826
6827
6828
6829
6830
6831
6832
6833
6834
6835
6836
6837
6838
6839
6840
6841
6842
6843
6844
6845
6846
6847
6848
6849
6850
6851
6852
6853
6854
6855
6856
6857
6858
6859
6860
6861
6862
6863
6864
6865
6866
6867
6868
6869
6870
6871
6872
6873
6874
6875
6876
6877
6878
6879
6880
6881
6882
6883
6884
6885
6886
6887
6888
6889
6890
6891
6892
6893
6894
6895
6896
6897
6898
6899
6900
6901
6902
6903
6904
6905
6906
6907
6908
6909
6910
6911
6912
6913
6914
6915
6916
6917
6918
6919
6920
6921
6922
6923
6924
6925
6926
6927
6928
6929
6930
6931
6932
6933
6934
6935
6936
6937
6938
6939
6940
6941
6942
6943
6944
6945
6946
6947
6948
6949
6950
6951
6952
6953
6954
6955
6956
6957
6958
6959
6960
6961
6962
6963
6964
6965
6966
6967
6968
6969
6970
6971
6972
6973
6974
6975
6976
6977
6978
6979
6980
6981
6982
6983
6984
6985
6986
6987
6988
6989
6990
6991
6992
6993
6994
6995
6996
6997
6998
6999
7000
7001
7002
7003
7004
7005
7006
7007
7008
7009
7010
7011
7012
7013
7014
7015
7016
7017
7018
7019
7020
7021
7022
7023
7024
7025
7026
7027
7028
7029
7030
7031
7032
7033
7034
7035
7036
7037
7038
7039
7040
7041
7042
7043
7044
7045
7046
7047
7048
7049
7050
7051
7052
7053
7054
7055
7056
7057
7058
7059
7060
7061
7062
7063
7064
7065
7066
7067
7068
7069
7070
7071
7072
7073
7074
7075
7076
7077
7078
7079
7080
7081
7082
7083
7084
7085
7086
7087
7088
7089
7090
7091
7092
7093
7094
7095
7096
7097
7098
7099
7100
7101
7102
7103
7104
7105
7106
7107
7108
7109
7110
7111
7112
7113
7114
7115
7116
7117
7118
7119
7120
7121
7122
7123
7124
7125
7126
7127
7128
7129
7130
7131
7132
7133
7134
7135
7136
7137
7138
7139
7140
7141
7142
7143
7144
7145
7146
7147
7148
7149
7150
7151
7152
7153
7154
7155
7156
7157
7158
7159
7160
7161
7162
7163
7164
7165
7166
7167
7168
7169
7170
7171
7172
7173
7174
7175
7176
7177
7178
7179
7180
7181
7182
7183
7184
7185
7186
7187
7188
7189
7190
7191
7192
7193
7194
7195
7196
7197
7198
7199
7200
7201
7202
7203
7204
7205
7206
7207
7208
7209
7210
7211
7212
7213
7214
7215
7216
7217
7218
7219
7220
7221
7222
7223
7224
7225
7226
7227
7228
7229
7230
7231
7232
7233
7234
7235
7236
7237
7238
7239
7240
7241
7242
7243
7244
7245
7246
7247
7248
7249
7250
7251
7252
7253
7254
7255
7256
7257
7258
7259
7260
7261
7262
7263
7264
7265
7266
7267
7268
7269
7270
7271
7272
7273
7274
7275
7276
7277
7278
7279
7280
7281
7282
7283
7284
7285
7286
7287
7288
7289
7290
7291
7292
7293
7294
7295
7296
7297
7298
7299
7300
7301
7302
7303
7304
7305
7306
7307
7308
7309
7310
7311
7312
7313
7314
7315
7316
7317
7318
7319
7320
7321
7322
7323
7324
7325
7326
7327
7328
7329
7330
7331
7332
7333
7334
7335
7336
7337
7338
7339
7340
7341
7342
7343
7344
7345
7346
7347
7348
7349
7350
7351
7352
7353
7354
7355
7356
7357
7358
7359
7360
7361
7362
7363
7364
7365
7366
7367
7368
7369
7370
7371
7372
7373
7374
7375
7376
7377
7378
7379
7380
7381
7382
7383
7384
7385
7386
7387
7388
7389
7390
7391
7392
7393
7394
7395
7396
7397
7398
7399
7400
7401
7402
7403
7404
7405
7406
7407
7408
7409
7410
7411
7412
7413
7414
7415
7416
7417
7418
7419
7420
7421
7422
7423
7424
7425
7426
7427
7428
7429
7430
7431
7432
7433
7434
7435
7436
7437
7438
7439
7440
7441
7442
7443
7444
7445
7446
7447
7448
7449
7450
7451
7452
7453
7454
7455
7456
7457
7458
7459
7460
7461
7462
7463
7464
7465
7466
7467
7468
7469
7470
7471
7472
7473
7474
7475
7476
7477
7478
7479
7480
7481
7482
7483
7484
7485
7486
7487
7488
7489
7490
7491
|
_ _ ____ _
___| | | | _ \| |
/ __| | | | |_) | |
| (__| |_| | _ <| |___
\___|\___/|_| \_\_____|
Changelog
Version 7.83.1 (11 May 2022)
Daniel Stenberg (11 May 2022)
- RELEASE-NOTES: synced
curl 7.83.1 release
- THANKS: added contributors from 7.83.1
- zuul: fix the ngtcp2-gnutls build
Add packages and tweak the configure options.
Use the GnuTLS 3.7.4 branch (not main).
Closes #8829
- [Tatsuhiro Tsujikawa brought this change]
ngtcp2: add ca-fallback support for OpenSSL backend
Closes #8828
- url: check SSH config match on connection reuse
CVE-2022-27782
Reported-by: Harry Sintonen
Bug: https://curl.se/docs/CVE-2022-27782.html
Closes #8825
- tls: check more TLS details for connection reuse
CVE-2022-27782
Reported-by: Harry Sintonen
Bug: https://curl.se/docs/CVE-2022-27782.html
Closes #8825
- cookies: make bad_domain() not consider a trailing dot fine
The check for a dot in the domain must not consider a single trailing
dot to be fine, as then TLD + trailing dot is fine and curl will accept
setting cookies for it.
CVE-2022-27779
Reported-by: Axel Chong
Bug: https://curl.se/docs/CVE-2022-27779.html
Closes #8820
- test977: reproduce ability to set cookie on TLD
When PSL is not enabled
- scripts/contributors.sh: correct the copyright range
- docs/RELEASE-PROCEDURE.md: refreshed and adjsuted the release dates
- test379: verify --remove-on-error with --no-clobber
- post_per_transfer: remove the updated file name
When --remove-on-error is used with --no-clobber, it might have an
updated file name to remove.
Bug: https://curl.se/docs/CVE-2022-27778.html
CVE-2022-27778
Reported-by: Harry Sintonen
Closes #8824
- hsts: ignore trailing dots when comparing hosts names
CVE-2022-30115
Reported-by: Axel Chong
Bug: https://curl.se/docs/CVE-2022-30115.html
Closes #8821
- test440/441: verify HSTS with trailing dots
- libtest/lib1560: verify the host name percent decode fix
- urlapi: reject percent-decoding host name into separator bytes
CVE-2022-27780
Reported-by: Axel Chong
Bug: https://curl.se/docs/CVE-2022-27780.html
Closes #8826
- nss: return error if seemingly stuck in a cert loop
CVE-2022-27781
Reported-by: Florian Kohnhäuser
Bug: https://curl.se/docs/CVE-2022-27781.html
Closes #8822
- test412/413: verify alt-svc with trailing dots
- altsvc: fix host name matching for trailing dots
Closes #8819
- [Garrett Squire brought this change]
hyper: fix test 357
This change fixes the hyper API such that PUT requests that receive a
417 response can retry without the Expect header.
Closes #8811
- [Harry Sintonen brought this change]
sectransp: bail out if SSLSetPeerDomainName fails
Before the code would just warn about SSLSetPeerDomainName() errors.
Closes #8798
- http_proxy/hyper: handle closed connections
Enable test 1021 for hyper builds.
Patched-by: Prithvi MK
Fixes #8700
Closes #8806
- KNOWN_BUGS: timeout when reusing a http3 connection
Closes #8764
- KNOWN_BUGS: configure --with-ca-fallback is not supported by h3
Closes #8696
- [Ryan Schmidt brought this change]
Makefile: fix "make ca-firefox"
Closes #8804
Daniel Gustafsson (5 May 2022)
- tests: fix markdown formatting in README
The asterisk in the abbreviation *NIX (for UNIX/Linux) needs to be
escaped to not mean start of italic formatting. This is consistent
with docs/RELEASE-PROCEDURE.md.
Closes: #8802
Reviewed-by: Daniel Stenberg <daniel@haxx.se>
Daniel Stenberg (5 May 2022)
- TODO: expand on "Expose tried IP addresses that failed"
Ref: #8794
Daniel Gustafsson (5 May 2022)
- [Fabian Keil brought this change]
tests/server: declare variable 'reqlogfile' static
Silences the warning:
CC socksd-socksd.o
socksd.c:143:13: warning: no previous extern declaration for
non-static variable 'reqlogfile' [-Wmissing-variable-declarations]
const char *reqlogfile = DEFAULT_REQFILE;
^
socksd.c:143:7: note: declare 'static' if the variable is not
intended to be used outside of this translation unit
const char *reqlogfile = DEFAULT_REQFILE;
^
1 warning generated.
... when compiling with clang 13.
Closes: #8799
Reviewed-by: Daniel Gustafsson <daniel@yesql.se>
- HTTP-COOKIES: add missing CURLOPT_COOKIESESSION
Commit 980a47b42 added support for ignoring session cookies, but it
was never added to the documentation.
Closes: #8795
Reviewed-by: Daniel Stenberg <daniel@haxx.se>
Daniel Stenberg (5 May 2022)
- docs/THANKS: remove name duplicate
- [Philip H brought this change]
.mailmap: update
Closes #8800
Jay Satiro (5 May 2022)
- mbedtls: fix some error messages
Prior to this change some of the error messages misidentified the
function that failed.
Daniel Stenberg (5 May 2022)
- RELEASE-NOTES: synced
- [Sergey Markelov brought this change]
x509asn1: make do_pubkey handle EC public keys
Closes #8757
- [Harry Sintonen brought this change]
mbedtls: bail out if rng init fails
There was a failf() call but no actual error return.
Closes #8796
- [Sergey Markelov brought this change]
urlapi: address (harmless) UndefinedBehavior sanitizer warning
`while(i--)` causes runtime error: unsigned integer overflow: 0 - 1
cannot be represented in type 'size_t' (aka 'unsigned long')
Closes #8797
- [Fabian Keil brought this change]
test{898,974,976}: add 'HTTP proxy' keywords
... so the tests can be automatically skipped when
testing external HTTP proxies like Privoxy.
Closes #8791
- [Harry Sintonen brought this change]
gskit_connect_step1: fixed bogus setsockopt calls
setsockopt takes a reference to value, not value. With the current
code this just leads to -1 return value with errno EFAULT.
Closes #8793
- CURLOPT_SSH_AUTH_TYPES.3: fix the default
The default is all possible methods.
Closes #8792
- CURLOPT_DOH_URL.3: mention the known bug
It is mostly duplicating info from KNOWN_BUGS but make it easier to find
for users of this option.
Closes #8790
- CURLOPT_HSTS*FUNCTION.3: document the involved structs as well
Reviewed-By: Daniel Gustafsson
Closes #8788
- docs/SECURITY-PROCESS.md: "Visible command line arguments"
- SECURITY-PROCESS: mention "URL inconsistencies"
... as common problems that are *not* vulns.
Daniel Gustafsson (2 May 2022)
- contributors: strip off final comma
The final row of contributors should not end with a comma as it's the
end of the list.
Closes: #8785
Reviewed-by: Daniel Stenberg <daniel@haxx.se>
Daniel Stenberg (2 May 2022)
- [Philip H brought this change]
misc: use "autoreconf -fi" instead buildconf
Signed-off-by: Philip H <47042125+pheiduck@users.noreply.github.com>
Closes #8777
Daniel Gustafsson (2 May 2022)
- [Philip H brought this change]
cirrus: Use pip for Python packages on FreeBSD
Using pip instead of easy_install is more in line with how other
CI images are being maintained.
Closes: #8783
Reviewed-by: Daniel Gustafsson <daniel@yesql.se>
- [Philip H brought this change]
cirrus: Update to FreeBSD 12.3
Closes: #8783
Reviewed-by: Daniel Gustafsson <daniel@yesql.se>
- tool_getparam: simplify conditional statement
param_place cannot be NULL here since we immediately efter this block
perform arithmetic on it (and use it in order to get here) so there is
little reason to check.
Closes: #8786
Reviewed-by: Daniel Stenberg <daniel@haxx.se>
- RELEASE-NOTES: synced
- gskit: remove unused function set_callback
This function has been unused since the initial commit of the GSKit
backend in 0eba02fd4. The motivation for the code was getting the
whole certificate chain: the only place where the latter is available
is as a callback parameter. Unfortunately it is not possible to pass
a user pointer to this callback, which precludes the possibility to
associate the cert chain with a data/conn structure.
For further information, search for pgsk_cert_validation_callback on:
https://www.ibm.com/docs/api/v1/content/ssw_ibm_i_71/apis/gsk_attribute_set_callback.htm
As the upstream library never added a parameter like that to the API,
we give up the wait and remove the dead code.
Closes: #8782
Reviewed-by: Patrick Monnerat <patrick@monnerat.net>
- curl: free resource in error path
If the new filename cannot be generated due to memory pressure, free
the allocated aname on the way out to avoid a small leak.
Closes: #8770
Reviewed-by: Daniel Stenberg <daniel@haxx.se>
- curl: guard against size_t wraparound in no-clobber code
When generating the new filename, make sure we aren't overflowing the
size_t limit when calculating the new length. This is mostly academic
but good code hygeine nonetheless.
Closes: #8771
Reviewed-by: Daniel Stenberg <daniel@haxx.se>
Daniel Stenberg (30 Apr 2022)
- gha: build msh3
Closes #8779
- scripts/cijobs.pl: try "current branch" first then "master"
- [Yusuke Nakamura brought this change]
msh3: get msh3 version from MsH3Version
Closes #8762
- [Yusuke Nakamura brought this change]
msh3: psss remote_port to MsH3ConnectionOpen
MsH3 supported additional "Port" parameter to connect not hosted on
443 port QUIC website.
* https://github.com/nibanks/msh3/releases/tag/v0.3.0
* https://github.com/nibanks/msh3/pull/37
Closes #8762
- [Christian Weisgerber brought this change]
openssl: define HAVE_SSL_CTX_SET_EC_CURVES for libressl
SSL_CTX_set1_curves_list() has been available since LibreSSL 2.5.3,
released five years ago.
Bug: https://curl.se/mail/lib-2022-04/0059.html
Closes #8773
- http: move Curl_allow_auth_to_host()
It was mistakenly put within the CURL_DISABLE_HTTP_AUTH #ifdef
Reported-by: Michael Olbrich
Fixes #8772
Closes #8775
Daniel Gustafsson (29 Apr 2022)
- msh3: print boolean value as text representation
Print the boolean value as its string representation instead of with
%hhu which isn't a format we typically use.
Closes: #8763
Reviewed-by: Nick Banks <nibanks@microsoft.com>
Daniel Stenberg (29 Apr 2022)
- data/test376: set a proper name
- GHA/mbedtls: enabled nghttp2 in the build
Closes #8767
- mbedtls: fix compile when h2-enabled
Fixes #8766
Reported-by: LigH-de on github
Closes #8768
- RELEASE-NOTES: synced
bumped curlver to 7.83.1-dev
- SECURITY-PROCESS: extended
Also clarify BUG-BOUNTY.md with IBB details.
Closes #8754
- [Adam Rosenfield brought this change]
conn: fix typo 'connnection' -> 'connection' in two function names
Closes #8759
Version 7.83.0 (27 Apr 2022)
Daniel Stenberg (27 Apr 2022)
- RELEASE-NOTES: synced
The 7.83.0 release
- docs/THANKS: contributors from 7.83.0
- test 898/974/976: require proxy to run
Fixes #8755
Reported-by: Marc Hörsken
Closes #8756
- gnutls: don't leak the SRP credentials in redirects
Follow-up to 620ea21410030 and 139a54ed0a172a
Reported-by: Harry Sintonen
Closes #8752
- CURLOPT*TLSAUTH: they only work with OpenSSL or GnuTLS
Closes #8753
- openssl: don't leak the SRP credentials in redirects either
Follow-up to 620ea21410030
Reported-by: Harry Sintonen
Closes #8751
- [Liam Warfield brought this change]
hyper: fix tests 580 and 581 for hyper
Hyper now has the ability to preserve header order. This commit adds a
few lines setting the connection options for this feature.
Related to issue #8617
Closes #8707
- conncache: remove name arg from Curl_conncache_find_bundle
To simplify, and also since the returned name is not the full actual
name used for the check. The port number and zone id is also involved,
so just showing the name is misleading.
Closes #8750
- tests: verify the fix for CVE-2022-27774
- Test 973 redirects from HTTP to FTP, clear auth
- Test 974 redirects from HTTP to HTTP different port, clear auth
- Test 975 redirects from HTTP to FTP, permitted to keep auth
- Test 976 redirects from HTTP to HTTP different port, permitted to keep
auth
- transfer: redirects to other protocols or ports clear auth
... unless explicitly permitted.
Bug: https://curl.se/docs/CVE-2022-27774.html
Reported-by: Harry Sintonen
Closes #8748
- connect: store "conn_remote_port" in the info struct
To make it available after the connection ended.
- cookie.d: clarify when cookies are always sent
- test898: verify the fix for CVE-2022-27776
Do not pass on Authorization headers on redirects to another port
- http: avoid auth/cookie on redirects same host diff port
CVE-2022-27776
Reported-by: Harry Sintonen
Bug: https://curl.se/docs/CVE-2022-27776.html
Closes #8749
- libssh2: make the md5 comparison fail if wrong length
Making it just skip the check unless exactly 32 is too brittle. Even if
the docs says it needs to be exactly 32, it is be safer to make the
comparison fail here instead.
Reported-by: Harry Sintonen
Bug: https://hackerone.com/reports/1549461
Closes #8745
- conncache: include the zone id in the "bundle" hashkey
Make connections to two separate IPv6 zone ids create separate
connections.
Reported-by: Harry Sintonen
Bug: https://curl.se/docs/CVE-2022-27775.html
Closes #8747
- [Patrick Monnerat brought this change]
url: check sasl additional parameters for connection reuse.
Also move static function safecmp() as non-static Curl_safecmp() since
its purpose is needed at several places.
Bug: https://curl.se/docs/CVE-2022-22576.html
CVE-2022-22576
Closes #8746
- libssh2: compare sha256 strings case sensitively
Reported-by: Harry Sintonen
Bug: https://hackerone.com/reports/1549435
Closes #8744
- tool_getparam: error out on missing -K file
Add test 411 to verify.
Reported-by: Median Median Stride
Bug: https://hackerone.com/reports/1542881
Closes #8731
- [Tatsuhiro Tsujikawa brought this change]
ngtcp2: deal with sub-millisecond timeout
Closes #8738
- misc: update copyright year ranges
- c_escape: escape '?' in generated --libcurl code
In order to avoid the risk of it being used in an accidental trigraph in
the generated code.
Reported-by: Harry Sintonen
Bug: https://hackerone.com/reports/1548535
Closes #8742
- [Philip H brought this change]
mlc: curl.zuul.vexxhost.dev is reachable again
remove it from ignorelist for linkcheck
Closes #8736
- [Tatsuhiro Tsujikawa brought this change]
ngtcp2: avoid busy loop in low CWND situation
Closes #8739
- TODO: telnet - exit immediately upon connection if stdin is /dev/null
Suggested-by: Robin A. Meade
URL: https://curl.se/mail/archive-2022-04/0027.html
- [Kushal Das brought this change]
docs: updates spellings with full words
Closes #8730
- tests/FILEFORMAT.md: spellfix
Daniel Gustafsson (21 Apr 2022)
- misc: fix typos
Fix a few random typos is comments and workflow names.
- macos: fix .plist installation into framework
The copy command introduced in e498a9b1f had leftover '>' from the
previous sed command it replaced, which broke its syntax. Fix by
removing.
Reported-by: Emanuele Torre <torreemanuele6@gmail.com>
Daniel Stenberg (21 Apr 2022)
- [Christopher Degawa brought this change]
Makefile: fix ca-bundle due to mk-ca-bundle.pl being moved
The script was moved in 8e22fc68e7dda43e9f but the lines that called it
was not changed to reflect it's new position
Signed-off-by: Christopher Degawa <ccom@randomderp.com>
Closes #8728
Daniel Gustafsson (20 Apr 2022)
- macos: set .plist version in autoconf
Set the libcurl version in libcurl.plist like how libcurl.vers is
created.
Closes: #8692
Reviewed-by: Daniel Stenberg <daniel@haxx.se>
Reviewed-by: Nick Zitzmann <nickzman@gmail.com>
- cookies: Improve errorhandling for reading cookiefile
The existing programming had some issues with errorhandling for reading
the cookie file. If the file failed to open, we would silently ignore it
and continue as if there was no file (or stdin) passed. In this case, we
would also call fclose() on the NULL FILE pointer, which is undefined
behavior. Fix by ensuring that the FILE pointer is set before calling
fclose on it, and issue a warning in case the file cannot be opened.
Erroring out on nonexisting file would break backwards compatibility of
very old behavior so we can't really go there.
Closes: #8699
Reviewed-by: Daniel Stenberg <daniel@haxx.se>
Reviewed-by: Jay Satiro <raysatiro@yahoo.com>
Daniel Stenberg (20 Apr 2022)
- libcurl-tutorial.3: spellfix and minor polish
- CURLINFO_PRIMARY_PORT.3: spellfix
Reported-by: Patrick Monnerat
- [Jay Dommaschk brought this change]
libssh: fix double close
libssh closes the socket in ssh_diconnect() so make sure that libcurl
does not also close it.
Fixes #8708
Closes #8718
Jay Satiro (20 Apr 2022)
- [Gisle Vanem brought this change]
unit1620: call global_init before calling Curl_open
Curl_open calls the resolver init and on Windows if the resolver backend
is c-ares then the Windows sockets library (winsock) must already have
been initialized (via global init).
Ref: https://github.com/curl/curl/pull/8540#issuecomment-1059771800
Closes https://github.com/curl/curl/pull/8719
Daniel Stenberg (19 Apr 2022)
- CURLINFO_PRIMARY_PORT.3: clarify which port this is
As it was not entirely clear previously.
Closes #8725
- CURLOPT_UNRESTRICTED_AUTH.3: extended explanation
Include details about Authentication headers.
Reported-by: Brad Spencer
Fixes #8724
Closes #8726
- .github/workflows/macos.yml: add a libssh job with c-ares
... to enable the memdebug system
Closes #8720
- RELEASE-NOTES: synced
Jay Satiro (17 Apr 2022)
- [Gisle Vanem brought this change]
docs/HTTP3.md: fix typo
also fix msh3 section formatting
Ref: https://github.com/curl/curl/commit/37492ebb#r70980087
Marc Hoersken (17 Apr 2022)
- timediff.[ch]: add curlx helper functions for timeval conversions
Also move timediff_t definitions from timeval.h to timediff.h and
then make timeval.h include the new standalone-capable timediff.h.
Reviewed-by: Jay Satiro
Reviewed-by: Daniel Stenberg
Supersedes #5888
Closes #8595
Daniel Stenberg (17 Apr 2022)
- [Balakrishnan Balasubramanian brought this change]
tests: refactor server/socksd.c to support --unix-socket
Closes #8687
- [Emanuele Torre brought this change]
tool_paramhlp: use feof(3) to identify EOF correctly when using fread(3)
This loop was using the number of bytes read from the file as condition
to keep reading.
From Linux's fread(3) man page:
> On success, fread() and fwrite() return the number of items read or
> written. This number equals the number of bytes transferred only when
> size is 1. If an error occurs, or the end of the file is reached, the
> return value is a short item count (or zero).
>
> The file position indicator for the stream is advanced by the number
> of bytes successfully read or written.
>
> fread() does not distinguish between end-of-file and error, and
> callers must use feof(3) and ferror(3) to determine which occurred.
This means that nread!=0 doesn't make much sense as an end condition for
the loop: nread==0 doesn't necessarily mean that EOF has been reached or
an error has occured (but that is usually the case) and nread!=0 doesn't
necessarily mean that EOF has not been reached or that no read errors
have occured. feof(3) and ferror(3) should be uses when using fread(3).
Currently curl has to performs an extra fread(3) call to get a return
value equal to 0 to stop looping.
This usually "works" (even though nread==0 shouldn't be interpreted as
EOF) if stdin is a pipe because EOF usually marks the "real" end of the
stream, so the extra fread(3) call will return immediately and the extra
read syscall won't be noticeable:
bash-5.1$ strace -e read curl -s -F file=@- 0x0.st <<< a 2>&1 |
> tail -n 5
read(0, "a\n", 4096) = 2
read(0, "", 4096) = 0
read(0, "", 4096) = 0
http://0x0.st/oRs.txt
+++ exited with 0 +++
bash-5.1$
But this doesn't work if curl is reading from stdin, stdin is a
terminal, and the EOF is being emulated using a shell with ^D. Two
consecutive ^D will be required in this case to actually make curl stop
reading:
bash-5.1$ curl -F file=@- 0x0.st
a
^D^D
http://0x0.st/oRs.txt
bash-5.1$
A possible workaround to this issue is to use a program that handles EOF
correctly to indirectly send data to curl's stdin:
bash-5.1$ cat - | curl -F file=@- 0x0.st
a
^D
http://0x0.st/oRs.txt
bash-5.1$
This patch makes curl handle EOF properly when using fread(3) in
file2memory() so that the workaround is not necessary.
Since curl was previously ignoring read errors caused by this fread(3),
ferror(3) is also used in the condition of the loop: read errors and EOF
will have the same meaning; this is done to somewhat preserve the old
behaviour instead of making the command fail when a read error occurs.
Closes #8701
- gen.pl: change wording for mutexed options
Instead of saying "This option overrides NNN", now say "This option is
mutually exclusive to NNN" in the generated man page ouput, as the
option does not in all cases actually override the others but they are
always mutually exclusive.
Ref: #8704
Closes #8716
- curl: error out if -T and -d are used for the same URL
As one implies PUT and the other POST, both cannot be used
simultaneously.
Add test 378 to verify.
Reported-by: Boris Verkhovskiy
Fixes #8704
Closes #8715
- lib: remove exclamation marks
... from infof() and failf() calls. Make them less attention seeking.
Closes #8713
- fail.d: tweak the description
Reviewed-by: Daniel Gustafsson
Suggested-by: Robert Charles Muir
Ref: https://twitter.com/rcmuir/status/1514915401574010887
Closes #8714
Daniel Gustafsson (15 Apr 2022)
- docs: Fix missing semicolon in example code
Multiple share examples were missing a semicolon on the line defining
the CURLSHcode variable.
Closes: #8697
Reported-by: Michael Kaufmann <mail@michael-kaufmann.ch>
Reviewed-by: Daniel Stenberg <daniel@haxx.se>
- infof: consistent capitalization of warning messages
Ensure that all infof calls with a warning message are capitalized
in the same way. At some point we should probably set up a style-
guide for infof but until then let's aim for a little consistenncy
where we can.
Closes: #8711
Reviewed-by: Daniel Stenberg <daniel@haxx.se>
- RELEASE-NOTES: synced
- [Matteo Baccan brought this change]
perl: removed a double semicolon at end of line
Remove double semicolons at end of line in Perl code.
Closes: #8709
Reviewed-by: Daniel Gustafsson <daniel@yesql.se>
- curl_easy_header: fix typos in documentation
Closes: #8694
Reviewed-by: Daniel Stenberg <daniel@haxx.se>
Marcel Raad (11 Apr 2022)
- appveyor: add Cygwin build
Closes https://github.com/curl/curl/pull/8693
- appveyor: only add MSYS2 to PATH where required
Closes https://github.com/curl/curl/pull/8693
Daniel Stenberg (10 Apr 2022)
- [Tatsuhiro Tsujikawa brought this change]
ngtcp2: fix memory leak
Closes #8691
- [Tatsuhiro Tsujikawa brought this change]
ngtcp2: remove remote_addr which is not used in a meaningful way
Closes #8689
- [Tatsuhiro Tsujikawa brought this change]
ngtcp2: enlarge H3_SEND_SIZE
Make h3_SEND_SIZE larger because current value (20KiB) is too small
for the high latency environment.
Closes #8690
- [Tatsuhiro Tsujikawa brought this change]
ngtcp2: fix HTTP/3 upload stall and avoid busy loop
This commit fixes HTTP/3 upload stall if upload data is larger than
H3_SEND_SIZE. Only check writability of socket if a stream is
writable to avoid busy loop when QUIC flow control window is filled
up, or upload buffer is full.
Closes #8688
- [Nick Banks brought this change]
msh3: add support for QUIC and HTTP/3 using msh3
Considered experimental, as the other HTTP/3 backends.
Closes #8517
- TODO: "SFTP with SCP://"
- GHA: move bearssl jobs over from zuul
Closes #8684
- data/DISABLED: disable test 313 on bearssl builds
Closes #8684
- runtests: add 'bearssl' as testable feature
Closes #8684
- GHA: add openssl3 jobs moved over from zuul
Closes #8683
- schannel: remove dead code that will never run
As the condition can't ever evaluate true
Reported-by: Andrey Alifanov
Ref: #8675
Closes #8677
- connecache: remove duplicate connc->closure_handle check
The superfluous extra check could cause analyzer false positives
and doesn't serve any purpose.
Closes #8676
- [Michał Antoniak brought this change]
mbedtls: remove server_fd from backend
Closes #8682
- [Tatsuhiro Tsujikawa brought this change]
ngtcp2: use token when detecting :status header field
Closes #8679
- [Tatsuhiro Tsujikawa brought this change]
ngtcp2: make curl 1ms faster
Pass 0 for an already expired timer.
Closes #8678
- [Tatsuhiro Tsujikawa brought this change]
ngtcp2: fix QUIC_IDLE_TIMEOUT
QUIC_IDLE_TIMEOUT should be of type ngtcp2_duration which is
nanoseconds resolution.
Closes #8678
- English: use American spelling consistently
Authorization, Initialization, Organization etc.
Closes #8673
Daniel Gustafsson (5 Apr 2022)
- [Sascha Zengler brought this change]
BUGS: Fix incorrect punctuation
Closes #8672
Reviewed-by: Daniel Gustafsson <daniel@yesql.se>
Daniel Stenberg (4 Apr 2022)
- tool_listhelp.c: uppercase URL
- RELEASE-NOTES: synced
- http: streamclose "already downloaded"
Instead of connclose()ing, since when HTTP/2 is used it doesn't need to
close the connection as stopping the current transfer is enough.
Reported-by: Evangelos Foutras
Closes #8665
Jay Satiro (1 Apr 2022)
- ftp: fix error message for partial file upload
- Show the count of bytes written on partial file upload.
Prior to this change the error message mistakenly showed the count of
bytes read, not written.
Bug: https://github.com/curl/curl/discussions/8637
Reported-by: Taras Kushnir
Closes https://github.com/curl/curl/pull/8649
Daniel Stenberg (1 Apr 2022)
- http: correct the header error message to say colon
Not semicolon
Reported-by: Gisle Vanem
Ref: #8666
Closes #8667
- lib: #ifdef on USE_HTTP2 better
... as nghttp2 might not be the library that provides HTTP/2 support.
Closes #8661
- [Michał Antoniak brought this change]
mbedtls: remove 'protocols' array from backend when ALPN is not used
Closes #8663
- http2: RST the stream if we stop it on our own will
For the "simulated 304" case the done-call isn't considered "premature"
but since the server didn't close the stream it needs to be reset to
stop delivering data.
Closes #8664
- http: close the stream (not connection) on time condition abort
Closes #8664
- http2: handle DONE called for the paused stream
As it could otherwise stall all streams on the connection
Reported-by: Evangelos Foutras
Fixes #8626
Closes #8664
- tls: make mbedtls and NSS check for h2, not nghttp2
This makes them able to also negotiate HTTP/2 even when built to use
hyper for h2.
Closes #8656
- tests/libtest/lib670.c: fixup the copyright year range
follow-up to b54e18640ea4b7
- [Leandro Coutinho brought this change]
lib670: avoid double check result
Closes #8660
- vtls: use a generic "ALPN, server accepted" message
Closes #8657
- vtls: use a backend standard message for "ALPN: offers %s"
I call it VTLS_INFOF_ALPN_OFFER_1STR, the '1str' meaning that the
infof() call also needs a string argument: the ALPN ID.
Closes #8657
- [Christian Schmitz brought this change]
strcase.h: add comment about the return code
Tool often we run into expecting this to work like strcmp, but it
returns 1 instead of 0 for match.
Closes #8658
- vtls: provide a unified APLN-disagree string for all backends
Also rephrase to make it sound less dangerous:
"ALPN: server did not agree on a protocol. Uses default."
Reported-by: Nick Coghlan
Fixes #8643
Closes #8651
- projects/README: converted to markdown
Closes #8652
- misc: spelling fixes
Mostly in comments but also in the -w documentation for headers_json.
Closes #8647
- KNOW_BUGS: HTTP3/Transfer closed with n bytes remaining to read
"HTTP/3 does not support client certs" considered fixed, at least with
the ngtcp2 backend.
Closes #8523
- CURLOPT_PREQUOTE.3: only works for FTP file transfers, not dirs
Also add to quote.d. Add to TODO as something to add in a future.
Reported-by: anon00000000 on github
Closes #8602
Closes #8648
- RELEASE-NOTES: synced
- pop3/smtp: return *WEIRD_SERVER_REPLY when not understood
This leaves the CURLE_RECV_ERROR error code for explicit failure to
receive network data and allows users to better separate the problems.
Ref #8356
Reported-by: Rianov Viacheslav
Closes #8506
- docs: lots of minor language polish
Mostly based on recent language decisions from "everything curl":
- remove contractions (isn't => is not)
- *an* HTTP (consistency)
- runtime (no hyphen)
- backend (no hyphen)
- URL is uppercase
Closes #8646
Jay Satiro (29 Mar 2022)
- projects: Update VC version names for VS2017, VS2022
- Rename VC15 -> VC14.10, VC17 -> VC14.30.
The projects directory that holds the pre-generated Visual Studio
project files uses VC<ver> to indicate the MSVC version. At some point
support for Visual Studio 2017 (Visual Studio version 15 which uses MSVC
14.10) was added as VC15. Visual Studio 2022 (Visual Studio version 17
which uses MSVC 14.30) project files were recently added and followed
that same format using VC17.
There is no such MSVC version (yet) as VC15 or VC17.
For VS 2017 for example, the name we use is correct as either VS17,
VS2017, VC14.10. I opted for the latter since we use VC for earlier
versions (eg VC10, VC12, etc).
Ref: https://github.com/curl/curl/pull/8438#issuecomment-1037070192
Closes https://github.com/curl/curl/pull/8447
Daniel Stenberg (29 Mar 2022)
- mqtt: better handling of TCP disconnect mid-message
Reported-by: Jenny Heino
Bug: https://hackerone.com/reports/1521610
Closes #8644
- CURLOPT_DISALLOW_USERNAME_IN_URL.3: use uppercase URL
- [Ian Blanes brought this change]
docs/DYNBUF: clarify documentation for Curl_dyn_ptr and Curl_dyn_uptr
Closes #8606
- [Ian Blanes brought this change]
curl: fix segmentation fault for empty output file names.
Function glob_match_url set *result to NULL when called with filename =
"", producing an indirect NULL pointer dereference.
Closes #8606
- TODO: Read keys from ~/.ssh/id_ecdsa, id_ed25519
It would be nice to expand the list of key locations curl uses for the
newer key types supported by libssh2.
Closes #8586
- ngtcp2: update to work after recent ngtcp2 updates
Assisted-by: Tatsuhiro Tsujikawa
Reported-by: jurisuk on github
Fixes #8638
Closes #8639
- [Farzin brought this change]
CURLOPT_PROGRESSFUNCTION.3: fix typo in example
Closes #8636
- curl/header_json: output the header names in lowercase
To better allow json[“header”].
Reported-by: Peter Korsgaard
Bug: https://daniel.haxx.se/blog/2022/03/24/easier-header-picking-with-curl/comment-page-1/#comment-25878
Closes #8633
- RELEASE-NOTES: synced
- headers.h: make Curl_headers_push() be CURLE_OK when not built
... to avoid errors when the function isn't there.
Reported-by: Marcel Raad
Fixes #8627
Closes #8628
- scripts: move three scripts from lib/ to scripts/
Move checksrc.pl, firefox-db2pem.sh and mk-ca-bundle.pl since they don't
particularly belong in lib/
Also created an EXTRA_DIST= in scripts/Makefile.am instead of specifying
those files in the root Makefile.am
Closes #8625
Marc Hoersken (23 Mar 2022)
- lib/warnless.[ch]: only check for WIN32 and ignore _WIN32
curl_setup.h automatically defines WIN32 if just _WIN32 is defined.
Therefore make sure curl_setup.h is included through warnless.h.
Reviewed-by: Daniel Stenberg
Reviewed-by: Jay Satiro
Closes #8594
- tests/server/util.h: align WIN32 condition with util.c
There is no need to test for both _WIN32 and WIN32 as curl_setup.h
automatically defines the later if the first one is defined.
Also tests/server/util.c is only checking for WIN32 arouund the
implementation of win32_perror, so just defining _WIN32
would not be sufficient for a successful compilation.
Reviewed-by: Daniel Stenberg
Reviewed-by: Jay Satiro
Closes #8594
Daniel Stenberg (22 Mar 2022)
- [Philip H brought this change]
firefox-db2pem.sh: make the shell script safer
Reported by lift
Closes #8616
Jay Satiro (22 Mar 2022)
- gtls: fix build for disabled TLS-SRP
Prior to this change if, at build time, the GnuTLS backend was found to
have TLS-SRP support (HAVE_GNUTLS_SRP) but TLS-SRP was disabled in curl
via --disable-tls-srp (!USE_TLS_SRP) then a build error would occur.
Bug: https://curl.se/mail/lib-2022-03/0046.html
Reported-by: Robert Brose
Closes https://github.com/curl/curl/pull/8604
- winbuild: Add a Visual Studio example to the README
- Add an example that explains in detail how the user can add libcurl to
their Visual Studio project.
Ref: https://github.com/curl/curl/issues/8591
Closes https://github.com/curl/curl/pull/8592
- docs/opts: Mention Schannel client cert type is P12
Schannel backend code behaves same as Secure Transport, it expects a P12
certificate file or the name of a certificate already in the user's OS
key store. Also, both backends ignore CURLOPT_SSLKEY (tool: --key)
because they expect the private key to already be available from the
keystore or P12 certificate.
Ref: https://github.com/curl/curl/discussions/8581#discussioncomment-2337260
Closes https://github.com/curl/curl/pull/8587
Daniel Stenberg (22 Mar 2022)
- lib1945: fix compiler warning 4706 on MSVC
Follow-up from d1e4a677340c
Closes #8623
- [Philip H brought this change]
ci/event-based.yml: improve impacket install
skip python3-pip
install impacket with library module
Closes #8621
- test1459: disable for oldlibssh
This test with libssh 0.9.3 works fine on github but fails on circleci.
Might as well disable this test for oldlibssh installations.
Closes #8622
- test1135: sync with recent API updates
This test verifies that the order of functions in public headers remain
the same but hasn't been updated to care for recently added header
files. The order is important for some few platforms - or VERSIONINFO
needs to updated.
This fix also updates VERSIONINFO to be sure.
Closes #8620
- curl_easy_nextheader.3: fix two typos
Reported-by: Timothe Litt
Bug: https://curl.se/mail/lib-2022-03/0060.html
- options: remove mistaken space before paren in prototype
- cirrus: add --enable-headers-api for some windows builds
- GHA: --enable-headers-api in all workflows
- lib: make the headers API depend on --enable-headers-api
- configure: add --enable-headers-api to enable the headers API
Defaults to disabled while labeled EXPERIMENTAL.
Make all the headers API tests require 'headers-api' to run.
- test1671: verify -w '%{header_json}
- test1670: verify -w %header{}
- curl: add %{header_json} support in -w handling
Outputs all response headers as a JSON object.
- curl: add %header{name} support in -w handling
Outputs the response header 'name'
- header api: add curl_easy_header and curl_easy_nextheader
Add test 1940 to 1946 to verify.
Closes #8593
- test1459: remove the different exit code for oldlibssh
When using libssh/0.9.3/openssl/zlib, we seem to be getting the "right"
error code.
Closes #8490
- libssh: unstick SFTP transfers when done event-based
Test 604 and 606 (at least).
Closes #8490
- gha: move the event-based test over from Zuul
Switched libssh2 to libssh
Closes #8490
- RELEASE-NOTES: synced
- http: return error on colon-less HTTP headers
It's a protocol violation and accepting them leads to no good.
Add test case 398 to verify
Closes #8610
- test718: edited slightly to return better HTTP
Since hyper is picky and won't play ball otherwise.
Bug: https://github.com/hyperium/hyper/issues/2783
Reported-by: Daniel Valenzuela
Closes #8614
- hyper: no h2c support
Make tests require h2c feature present to run, and only set h2c if
nghttp2 is used in the build. Hyper does not support it.
Remove those tests from DISABLED
Fixes #8605
Closes #8613
- configure: bump the copyright year range int the generated output
- [Andreas Falkenhahn brought this change]
BINDINGS.md: add Hollywood binding
Closes #8609
- HISTORY: add some 2022 data
- scripts/copyright.pl: ignore the new mlc_config.json file
- [Philip H brought this change]
mlc_config.json: add file to ignore known troublesome URLs
This is the config file for the CI markdown link checker and lets us
filter URLs that are known to cause problems. Like
https://curl.zuul.vexxhost.dev/ for now.
Closes #8597
- [Philip H brought this change]
winbuild/README.md: fixup dead link
Closes #8597
Jay Satiro (18 Mar 2022)
- rtsp: don't let CSeq error override earlier errors
- When done, if an error has already occurred then don't check the
sequence numbers for mismatch.
A sequence number may not have been received if an error occurred.
Prior to this change a sequence mismatch error would override earlier
errors. For example, a server that returns nothing would cause error
CURLE_GOT_NOTHING in Curl_http_done which was then overridden by
CURLE_RTSP_CSEQ_ERROR in rtsp_done.
Closes https://github.com/curl/curl/pull/8525
- lib: fix some misuse of curlx_convert_wchar_to_UTF8
curlx_convert_wchar_to_UTF8 must be freed by curlx_unicodefree, but
prior to this change some uses mistakenly called free.
I've reviewed all other uses of curlx_convert_wchar_to_UTF8 and
curlx_convert_UTF8_to_wchar.
Ref: https://github.com/curl/curl/commit/1d5d0ae
Closes https://github.com/curl/curl/pull/8521
- mk-ca-bundle.pl: Use stricter logic to process the certificates
.. and bump version to 1.29.
This change makes the script properly ignore unknown blocks and
otherwise fail when Mozilla changes the certdata format in ways we
don't expect. Though this is less flexible behavior it makes it far less
likely that an invalid certificate can slip through.
Prior to this change the state machine did not always properly reset,
and it was possible that a certificate marked as invalid could then
later be marked as valid when there was conflicting trust info or
an unknown block was erroneously processed as part of the certificate.
Ref: https://github.com/curl/curl/pull/7801#pullrequestreview-768384569
Closes https://github.com/curl/curl/pull/8411
Marcel Raad (17 Mar 2022)
- test375: fix line endings on Windows
Closes https://github.com/curl/curl/pull/8599
Daniel Stenberg (17 Mar 2022)
- http: reject header contents with nul bytes
They are not allowed by the protocol and allowing them risk that curl
misbehaves somewhere where C functions are used but won't work on the
full contents. Further, they are not supported by hyper and they cause
problems for the new coming headers API work.
Updated test 262 to verify and enabled it for hyper as well
Closes #8601
- [Philip H brought this change]
CI: Do not use buildconf. Instead, just use: autoreconf -fi
Closes #8596
- RELEASE-NOTES: synced
Jay Satiro (14 Mar 2022)
- libssh: Improve fix for missing SSH_S_ stat macros
- If building libcurl against an old libssh version missing SSH_S_IFMT
and SSH_S_IFLNK then use the values from a supported version.
Prior to this change if libssh did not define SSH_S_IFMT and SSH_S_IFLNK
then S_IFMT and S_IFLNK, respectively, were used instead. The problem
with that is the user's S_ stat macros don't have the same values across
platforms. For example Windows has values different from Linux.
Follow-up to 7b0fd39.
Ref: https://github.com/curl/curl/pull/8511#discussion_r815292391
Ref: https://github.com/curl/curl/pull/8574
Closes https://github.com/curl/curl/pull/8588
Marc Hoersken (13 Mar 2022)
- tool and tests: force flush of all buffers at end of program
On Windows data can be lost in buffers in case of abnormal program
termination, especially in process chains as seen due to flaky tests.
Therefore flushing all buffers manually should avoid this data loss.
In the curl tool we play the safe game by only flushing write buffers,
but in the testsuite where we manage all buffers, we flush everything.
This should drastically reduce Windows CI and testsuite flakiness.
Reviewed-by: Daniel Stenberg
Supersedes #7833 and #6064
Closes #8516
Daniel Stenberg (12 Mar 2022)
- [Jan Venekamp brought this change]
BearSSL: add CURLOPT_SSL_CTX_FUNCTION support
Closes #8478
- [Jan Venekamp brought this change]
BearSSL: add CURLOPT_SSL_CIPHER_LIST support
Closes #8477
Dan Fandrich (11 Mar 2022)
- tool_cb_hdr: Turn the Location: into a terminal hyperlink
This turns even relative URLs into clickable hyperlinks in a supported
terminal when --styled-output is enabled. Many terminals already turn
URLs into clickable links but there is not enough information in a
relative URL to do this automatically otherwise.
- keepalive-time.d: It takes many probes to detect brokenness
Daniel Stenberg (11 Mar 2022)
- [HexTheDragon brought this change]
curl: add --no-clobber
Does not overwrite output files if they already exist
Closes #7708
Co-authored-by: Daniel Stenberg
- RELEASE-NOTES: synced
also bump next pending version to become 7.83.0
- [Jean-Philippe Menil brought this change]
openssl: check SSL_get_peer_cert_chain return value
Signed-off-by: Jean-Philippe Menil <jpmenil@gmail.com>
Closes #8579
- [Jay Satiro brought this change]
mk-ca-bundle.vbs: delete this script in favor of mk-ca-bundle.pl
mk-ca-bundle.vbs is a Windows-specific script for Mozilla certificate
extraction, similar to mk-ca-bundle.pl which runs on any platform. The
vbs version has not been maintained while the perl version has been
maintained with improvements and security fixes. I don't think it's
worth the work to maintain both versions. Windows users should be able
to use mk-ca-bundle.pl without any problems, as long as they have perl.
Closes #8412
- CURLSHOPT_UNLOCKFUNC.3: fix the callback prototype
Copy and paste error
Reported-by: Francisco Olarte
Fixes #8573
Closes #8577
- remove-on-error.d: typo
Reported-by: Colin Leroy
Bug: https://github.com/curl/curl/pull/8503#pullrequestreview-906520081
- curl: add --remove-on-error
If a transfer returns an error, using this option makes curl remove the
leftover downloded (partial) local file before exiting.
Added test 376 to verify
Closes #8503
- libssh: fix build with old libssh versions
... that don't have the SSH_S_* defines. Spotted on a machine using
libssh 0.7.3
Closes #8574
- hyper: fix status_line() return code
Detected while working on #7708 that happened to trigger an error here
with a new test case.
Closes #8572
- [Alejandro R. Sedeño brought this change]
configure.ac: move -pthread CFLAGS setting back where it used to be
The fix for #8276 proposed in #8374 set `CFLAGS="$CFLAGS -pthead"`
earlier than it used to be set, applying it in cases where it should not
have been applied.
This moves the AIX XLC check to a new `case $host in` block inside of
the `if test "$USE_THREADS_POSIX" != "1"` block, where `CFLAGS="$CFLAGS
-pthead"` used to happen.
Fixes #8541
Closes #8542
- [Tatsuhiro Tsujikawa brought this change]
ngtcp2: add client certificate authentication for OpenSSL
Closes #8522
- tool_operate: fix a scan-build warning
... and avoid the temp storing of the return code in a diff variable.
Closes #8565
- test375: verify that --proxy errors out if proxy is disabled in the build
Closes #8565
- curl: error out when options need features not present in libcurl
Trying to use a proxy when libcurl was built with proxy support disabled
should make curl error out properly.
Remove knowledge of disabled features from the tool code and instead
make it properly respond to what libcurl returns. Update all tests to
properly require the necessary features to be present/absent so that the
test suite can still be run even with libcurl builds with disabled
features.
Ref: https://curl.se/mail/archive-2022-03/0013.html
Closes #8565
- ngtcp2: disconnect the QUIC connection proper
Reported-by: mehatzri on github
Reviewed-by: Tatsuhiro Tsujikawa
Fixes #8534
closes #8569
Dan Fandrich (9 Mar 2022)
- test386: Fix an incorrect test markup tag
Daniel Stenberg (9 Mar 2022)
- [Don J Olmstead brought this change]
nonblock: restore setsockopt method to curlx_nonblock
The implementation using setsockopt was removed when BeOS support was
purged. However this functionality wasn't BeOS specific, it is still
used by for example Orbis OS (Playstation 4/5 OS).
Closes #8562
- openssl: fix CN check error code
Due to a missing 'else' this returns error too easily.
Regressed in: d15692ebb
Reported-by: Kristoffer Gleditsch
Fixes #8559
Closes #8560
- [Frank Meier brought this change]
connect: make Curl_getconnectinfo work with conn cache from share handle
Closes #8524
- [lwthiker brought this change]
openssl: enable CURLOPT_SSL_EC_CURVES with BoringSSL
The CURLOPT_SSL_EC_CURVES option (used by the '--curves' flag) in
libcurl was ignored when compiling with BoringSSL because
HAVE_SSL_CTX_SET_EC_CURVES was explicitly disabled if BoringSSL was
detected. However, this feature is supported in BoringSSL since
5fd1807d. This commit enables it, and also reduces the required minimal
OpenSSL version to 1.0.2 as per OpenSSL's official documentation.
Fixes #8553
Closes #8556
- [Samuel Henrique brought this change]
json.d: fix typo (overriden -> overridden)
Closes #8557
- wolfssl: fix compiler error without IPv6
Reported-by: Joseph Chen
Fixes #8550
Closes #8552
- RELEASE-NOTES: synced
and bump pending version to 7.82.1
- [Paul Howarth brought this change]
runtests: make 'oldlibssh' be before 0.9.4
The 'oldlibssh' feature indicates that the error code returned by libssh
for a broken known_hosts file should be 67 rather than 60 (test1459).
This feature was added as part of #8444 with 'oldlibssh' mapping to
libssh versions prior to 0.9.6, and then refined as part of #8511 to map
to versions prior to 0.9.5.
In Red Hat Enterprise Linux 8.5 there is a patched version of libssh
version 0.9.4 (https://git.centos.org/rpms/libssh/blob/c8/f/SOURCES) in
which test1459 fails because it returns the "new" value rather than the
"old" one. It's plausible that one of the patches is responsible for
this rather than the underlying code but I don't think so.
This change therefore drops the 'oldlibssh' version check to map to
libssh versions older than 0.9.4, which fixes builds on RHEL-8.
Closes #8548
- ipv4/6.d: clarify that they are about using IP addresses
... they may still *resolve* other families, but not use those
addresses.
Ref: #8530
Closes #8543
- [r-a-sattarov brought this change]
curl/system.h: update ifdef condition for MCST-LCC compiler
in mcst-lcc compiler => 1.25 added a new macro definition to determine
compiler
Closes #8546
Marc Hoersken (6 Mar 2022)
- CI: install Python package impacket to run SMB test 1451
Install Python package impacket in relevant CI workflows.
Follow up to #7935
Supersedes #7940
Closes #8544
Daniel Stenberg (5 Mar 2022)
- [Michał Antoniak brought this change]
connect: use TCP_KEEPALIVE only if TCP_KEEPIDLE is not defined
Closes #8539
- docs/HYPER.md: updated to reflect current hyper build needs
- GHA: build hyper with nightly rustc
Closes #8545
Version 7.82.0 (5 Mar 2022)
Daniel Stenberg (5 Mar 2022)
- RELEASE-NOTES: synced
The 7.82.0 release
- THANKS: updates from the 7.82.0 release notes
- misc: update copyright year ranges
Jay Satiro (5 Mar 2022)
- unit1610: init SSL library before calling SHA256 functions
The SSL library must be initialized (via global initialization) because
libcurl's SHA256 functions may call SHA256 functions in the SSL library.
Reported-by: Gisle Vanem
Fixes https://github.com/curl/curl/issues/8538
Closes https://github.com/curl/curl/pull/8540
- examples/curlx: support building with OpenSSL 1.1.0+
- Access members of X509_STORE_CTX in OpenSSL 1.1.0+ by using API
functions.
The X509_STORE_CTX struct has been opaque since OpenSSL 1.1.0.
Ref: https://curl.se/mail/lib-2022-03/0004.html
Closes https://github.com/curl/curl/pull/8529
- h2h3: fix typo
Bug: https://github.com/curl/curl/issues/8381#issuecomment-1055440241
Reported-by: Michael Kaufmann
- [Farzin brought this change]
CURLOPT_XFERINFOFUNCTION.3: fix example struct assignment
Closes https://github.com/curl/curl/pull/8519
Daniel Stenberg (26 Feb 2022)
- azure-pipelines: add a build on Windows with libssh
Closes #8511
- runtests: make 'oldlibssh' be before 0.9.5
Closes #8511
- libssh: fix include files and defines use for Windows builds
Reported-by: 梦终无痕
Bug: https://curl.se/mail/lib-2022-02/0131.html
Closes #8511
- RELEASE-NOTES: synced
- [illusory-dream brought this change]
winbuild: add parameter WITH_SSH
For building with libssh
Closes #8514
- configure: change output for cross-compiled alt-svc support
It said 'no', while it actually is 'yes'
Closes #8512
- gha: add a macOS CI job with libssh
Closes #8513
- TODO: remove "Bring back libssh tests on Travis"
The job was added to Circle CI in d8ddd0e7536
- TODO: remove "better persistency for HTTP/1.0"
Let's not bother.
- TODO: remove "Option to ignore private IP"
... as curl ignores the IP entirely by default these days.
- TODO: remove "hardcode the "localhost" addresses"
This is implmented since 1a0ebf6632f88
- TODO: 1.24 was a dupe of 1.1
- TODO: remove "Typesafe curl_easy_setopt()"
I don't consider this a serious TODO item
- KNOWN_BUGS: remove "Uploading HTTP/3 files gets interrupted"
This works now
- KNOWN_BUGS: remove "HTTP/3 multipart POST with quiche fails"
It works now
- quiche: remove two leftover debug infof() outputs
- [Tatsuhiro Tsujikawa brought this change]
ngtcp2: Reset dynbuf when it is fully drained
Reported-by: vl409 on github
Fixes #7351
Closes #8504
- [Stewart Gebbie brought this change]
hostip: avoid unused parameter error in Curl_resolv_check
When built without DNS-over-HTTP and without asynchronous resolvers,
neither the dns nor the data parameters are used.
That is Curl_resolv_check appears to call
Curl_resolver_is_resolved(data, dns). But,
with CURL_DISABLE_DOH without CURLRES_ASYNCH, the call is actually
elided via a macro definition.
This fix resolves the resultant: "unused parameter 'data'" error.
Closes #8505
- http2: move two infof calls to debug-h2-only
and remove a superflous one
Ref: https://github.com/curl/curl/discussions/8498
Closes #8502
- [Jean-Philippe Menil brought this change]
quiche: fix upload for bigger content-length
Signed-off-by: Jean-Philippe Menil <jpmenil@gmail.com>
Closes #8421
Jay Satiro (23 Feb 2022)
- [Farzin brought this change]
CURLOPT_PROGRESSFUNCTION.3: fix example struct assignment
Closes https://github.com/curl/curl/pull/8500
Daniel Stenberg (22 Feb 2022)
- [Rob Boeckermann brought this change]
OS400/README: clarify compilation steps
Closes #8494
- [Rob Boeckermann brought this change]
OS400: fix typos in rpg include file
This resolves issues compiling rpg code that includes the curl header
file.
Closes #8494
- [Michał Antoniak brought this change]
vtls: fix socket check conditions
fix condition to check the second socket during associate and
disassociate connection
Closes #8493
- libssh2: don't typecast socket to int for libssh2_session_handshake
Since libssh2_socket_t uses SOCKET on windows which can be larger than
int.
Closes #8492
- RELEASE-NOTES: fix typo and make one desc shorter
- RELEASE-NOTES: synced
- CURLOPT_XFERINFOFUNCTION.3: fix typo in example
Reported-by: coralw on github
Fixes #8487
Closes #8488
- README: disable linkchecks for the sponsor links
Closes #8489
Jay Satiro (21 Feb 2022)
- openssl: check if sessionid flag is enabled before retrieving session
Ideally, Curl_ssl_getsessionid should not be called unless sessionid
caching is enabled. There is a debug assertion in the function to help
ensure that. Therefore, the pattern in all vtls is basically:
if(primary.sessionid) {lock(); Curl_ssl_getsessionid(...); unlock();}
There was one instance in openssl.c where sessionid was not checked
beforehand and this change fixes that.
Prior to this change an assertion would occur in openssl debug builds
during connection stage if session caching was disabled.
Reported-by: Jim Beveridge
Fixes https://github.com/curl/curl/issues/8472
Closes https://github.com/curl/curl/pull/8484
- multi: allow user callbacks to call curl_multi_assign
Several years ago a change was made to block user callbacks from calling
back into the API when not supported (recursive calls). One of the calls
blocked was curl_multi_assign. Recently the blocking was extended to the
multi interface API, however curl_multi_assign may need to be called
from within those user callbacks (eg CURLMOPT_SOCKETFUNCTION).
I can't think of any callback where it would be unsafe to call
curl_multi_assign so I removed the restriction entirely.
Reported-by: Michael Wallner
Ref: https://github.com/curl/curl/commit/b46cfbc
Ref: https://github.com/curl/curl/commit/340bb19
Fixes https://github.com/curl/curl/issues/8480
Closes https://github.com/curl/curl/pull/8483
Daniel Stenberg (21 Feb 2022)
- [Michał Antoniak brought this change]
ssl: reduce allocated space for ssl backend when FTP is disabled
Add assert() for the backend pointer in many places
Closes #8471
- [Michał Antoniak brought this change]
checkprefix: remove strlen calls
Closes #8481
Jay Satiro (20 Feb 2022)
- [1337vt brought this change]
curl.h: fix typo
Closes https://github.com/curl/curl/pull/8482
- [Jan Venekamp brought this change]
sectransp: mark a 3DES cipher as weak
- Change TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA strength to weak.
All other 3DES ciphers are already marked as weak.
Closes https://github.com/curl/curl/pull/8479
- [Jan Venekamp brought this change]
bearssl: fix EXC_BAD_ACCESS on incomplete CA cert
- Do not create trust anchor object for a CA certificate until after it
is processed.
Prior to this change the object was created at state BR_PEM_BEGIN_OBJ
(certificate processing begin state). An incomplete certificate (for
example missing a newline at the end) never reaches BR_PEM_END_OBJ
(certificate processing end state) and therefore the trust anchor data
was not set in those objects, which caused EXC_BAD_ACCESS.
Ref: https://github.com/curl/curl/pull/8106
Closes https://github.com/curl/curl/pull/8476
- [Jan Venekamp brought this change]
bearssl: fix connect error on expired cert and no verify
- When peer verification is disabled use the x509_decode engine instead
of the x509_minimal engine to parse and extract the public key from
the first cert of the chain.
Prior to this change in such a case no key was extracted and that caused
CURLE_SSL_CONNECT_ERROR. The x509_minimal engine will stop parsing if
any validity check fails but the x509_decode won't.
Ref: https://github.com/curl/curl/pull/8106
Closes https://github.com/curl/curl/pull/8475
- [Jan Venekamp brought this change]
bearssl: fix session resumption (session id)
Prior to this change br_ssl_client_reset was mistakenly called with
resume_session param set to 0, which disabled session resumption.
Ref: https://github.com/curl/curl/pull/8106
Closes https://github.com/curl/curl/pull/8474
Daniel Stenberg (18 Feb 2022)
- [Michał Antoniak brought this change]
openssl: fix build for version < 1.1.0
Closes #8470
- [Joel Depooter brought this change]
schannel: move the algIds array out of schannel.h
This array is only used by the SCHANNEL_CRED struct in the
schannel_acquire_credential_handle function. It can therefore be kept as
a local variable. This is a minor update to
bbb71507b7bab52002f9b1e0880bed6a32834511.
This change also updates the NUM_CIPHERS value to accurately count the
number of ciphers options listed in schannel.c, which is 47 instead of
45. It is unlikely that anyone tries to set all 47 values, but if they
had tried, the last two would not have been set.
Closes #8469
- [Alejandro R. Sedeño brought this change]
configure.ac: use user-specified gssapi dir when using pkg-config
Using the system pkg-config path in the face of a user-specified
library path is asking to link the wrong library.
Reported-by: Michael Kaufmann
Fixes #8289
Closes #8456
- [Kevin Adler brought this change]
os400: Add link to QADRT devkit to README.OS400
Closes #8455
- [Kevin Adler brought this change]
os400: Add function wrapper for system command
The wrapper will exit if the system command failed instead of blindly
continuing on.
In addition, only copy docs which exist, since now the copy failure will
cause the build to stop.
Closes #8455
- [Kevin Adler brought this change]
os400: Default build to target current release
V6R1M0 is not available as a target release since IBM i 7.2. To keep
from having to keep this up to date in git, default to the current
release. Users can configure this to whatever release they want to
actually build for.
Closes #8455
- docs/INTERNALS.md: clean up, refer to the book
The explanatory parts are now in the everything curl book (which can
also use images etc). This document now refers to that resource and only
leaves listings of supported versions of libs, tools and operating
systems. See https://everything.curl.dev/internals
Closes #8467
Marcel Raad (17 Feb 2022)
- des: fix compile break for OpenSSL without DES
When `USE_OPENSSL` was defined but OpenSSL had no DES support and a
different crypto library was used for that, `Curl_des_set_odd_parity`
was called but not defined. This could for example happen on Windows
and macOS when using OpenSSL v3 with deprecated features disabled.
Use the same condition for the function definition as used at the
caller side, but leaving out the OpenSSL part to avoid including
OpenSSL headers.
Closes https://github.com/curl/curl/pull/8459
Daniel Stenberg (17 Feb 2022)
- RELEASE-NOTES: synced
- docs/DEPRECATE: remove NPN support in August 2022
Closes #8458
- ftp: provide error message for control bytes in path
Closes #8460
- http: fix "unused parameter ‘conn’" warning
Follow-up from 7d600ad1c395
Spotted on appveyor
Closes #8465
Jay Satiro (17 Feb 2022)
- [Alejandro R. Sedeño brought this change]
sha256: Fix minimum OpenSSL version
- Change the minimum OpenSSL version for using their SHA256
implementation from 0.9.7 to 0.9.8.
EVP_sha256() does not appear in the OpenSSL source before 0.9.7h, and
does not get built by default until 0.9.8, so trying to use it for all
0.9.7 is wrong, and before 0.9.8 is unreliable.
Closes https://github.com/curl/curl/pull/8464
Daniel Stenberg (16 Feb 2022)
- KNOWN_BUGS: remove "slow connect to localhost on Windows"
localhost is not resolved anymore since 1a0ebf6632f88
- KNOWN_BUGS: remove "HTTP/3 download is 5x times slower than HTTP/2"
It's not actually a bug. More like room for improvement.
- KNOWN_BUGS: remove "HTTP/3 download with quiche halts after a while"
Follow-up to 96f85a0fef694
- KNOWN_BUGS: remove "pulseUI vpn" as a problem
We haven't heard about this for a long time and rumours have it they
might have fixed it.
- urldata: remove conn->bits.user_passwd
The authentication status should be told by the transfer and not the
connection.
Reported-by: John H. Ayad
Fixes #8449
Closes #8451
- [Kevin Adler brought this change]
gskit: Convert to using Curl_poll
As mentioned in 32766cb, gskit was the last user of Curl_select which is
now gone. Convert to using Curl_poll to allow build to work on IBM i.
Closes #8454
- [Kevin Adler brought this change]
gskit: Fix initialization of Curl_ssl_gskit struct
In c30bf22, Curl_ssl_getsock was factored out in to a member of
struct Curl_ssl but the gskit initialization was not updated to reflect
this new member.
Closes #8454
- [Kevin Adler brought this change]
gskit: Fix errors from Curl_strerror refactor
2f0bb864c1 replaced sterror with Curl_strerror, but the strerror buffer
shadows the set_buffer "buffer" parameter. To keep consistency with the
other functions that use Curl_strerror, rename the parameter.
In addition, strerror.h is needed for the definition of STRERROR_LEN.
Closes #8454
Marcel Raad (15 Feb 2022)
- ntlm: remove unused feature defines
They're not used anymore and always supported.
Closes https://github.com/curl/curl/pull/8453
Daniel Stenberg (15 Feb 2022)
- [Kantanat Wannapaka brought this change]
README.md: fix link and layout
replace <a></a> tags and <img></img> tags
Closes #8448
- KNOWN_BUGS: fix typo "libpsl"
Jay Satiro (14 Feb 2022)
- h2h3: fix compiler warning due to function prototype mismatch
- Add missing const qualifier in Curl_pseudo_headers declaration.
Daniel Stenberg (14 Feb 2022)
- [Stefan Eissing brought this change]
urlapi: handle "redirects" smarter
- avoid one malloc when setting a new url via curl_url_set()
and CURLUPART_URL.
- extract common pattern into a new static function.
Closes #8450
- cijobs: pick up circleci configure lines better
- circleci: add a job using wolfSSH
Build only, no tests.
Closes #8445
- scripts/ciconfig.pl: show used options not available
- circleci: add a job using libssh
Closes #8444
- runtests: set 'oldlibssh' for libssh versions before 0.9.6
... and make test 1459 check for the different return code then.
Closes #8444
Jay Satiro (13 Feb 2022)
- Makefile.am: Generate VS 2022 projects
Follow-up to f13d4d0 which added VS 2022 project support.
Ref: https://github.com/curl/curl/pull/8438
- [Daniel Stenberg brought this change]
projects: remove support for MSVC before VC10 (Visual Studio 2010)
- Remove Visual Studio project files for VC6, VC7, VC7.1, VC8 and VC9.
Those versions are too old to be maintained any longer.
Closes https://github.com/curl/curl/pull/8442
- [Stav Nir brought this change]
projects: add support for Visual Studio 17 (2022)
Closes https://github.com/curl/curl/pull/8438
Daniel Stenberg (13 Feb 2022)
- RELEASE-NOTES: synced
- connect: follow-up fix the copyright year
- [Michał Antoniak brought this change]
misc: remove unused data when IPv6 is not supported
Closes #8430
- scripts/ciconfig: show CI job config info
Closes #8446
- quiche: handle stream reset
A stream reset now causes a CURLE_PARTIAL_FILE error. I'm not convinced
this is the right action nor the right error code.
Reported-by: Lucas Pardue
Fixes #8437
Closes #8440
- mime: use a define instead of the magic number 24
MIME_BOUNDARY_DASHES is now the number of leading dashes in the
generated boundary string.
Closes #8441
- [Henrik Holst brought this change]
hostcheck: reduce strlen calls on chained certificates
Closes #8428
- [Patrick Monnerat brought this change]
mime: some more strlen() call removals.
Closes #8423
- scripts/cijobs.pl: detect zuul cmake jobs better
- url: exclude zonefrom_url when no ipv6 is available
Closes #8439
- if2ip: make Curl_ipv6_scope a blank macro when IPv6-disabled
Closes #8439
- [Henrik Holst brought this change]
mprintf: remove strlen calls on empty strings in dprintf_formatf
Turns out that in dprintf_formatf we did a strlen on empty strings, a
bit strange is how common this actually is, 24 alone when doing a simple
GET from https://curl.se
Closes #8427
- wolfssl: return CURLE_AGAIN for the SSL_ERROR_NONE case
Closes #8431
- wolfssl: when SSL_read() returns zero, check the error
Returning zero indicates end of connection, so if there's no data read
but the connection is alive, it needs to return -1 with CURLE_AGAIN.
Closes #8431
- quiche: after leaving h3_recving state, poll again
This could otherwise easily leave libcurl "hanging" after the entire
transfer is done but without noticing the end-of-transfer signal.
Assisted-by: Lucas Pardue
Closes #8436
- quiche: when *recv_body() returns data, drain it before polling again
Assisted-by: Lucas Pardue
Closes #8429
- [gaoxingwang on github brought this change]
configure: fix '--enable-code-coverage' typo
Fixes #8425
Closes #8426
- lib/h2h3: #ifdef on ENABLE_QUIC, not the wrong define
Otherwise the build fails when H3 is enabled but the build doesn't
include nghttp2.
Closes #8424
- hostcheck: pass in pattern length too, to avoid a strlen call
Removes one strlen() call per SAN name in a cert-check.
Closes #8418
- [Henrik Holst brought this change]
misc: remove strlen for Curl_checkheaders + Curl_checkProxyheaders
Closes #8409
- configure: requires --with-nss-deprecated to build with NSS
Add deprecation plans to docs/DEPRECATE.md
Closes #8395
- mqtt: free 'sendleftovers' in disconnect
Fix a memory-leak
Bug: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=43646
Closes #8415
- [Patrick Monnerat brought this change]
openldap: pass string length arguments to client_write()
This uses the new STRCONST() macro and saves 2 strlen() calls on short
string constants per LDIF output line.
Closes #8404
- [Henrik Holst brought this change]
misc: reduce strlen() calls with Curl_dyn_add()
Use STRCONST() to switch from Curl_dyn_add() to Curl_dyn_addn() for
string literals.
Closes #8398
- http2: fix the array copy to nghttp2_nv
Bug: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=44517
Follow-up to 9f985a11e794
Closes #8414
- RELEASE-NOTES: synced
- scripts/cijobs.pl: output data about all currect CI jobs
This script parses the config files for all the CI services currently in
use and output the information in a uniform way. The idea is that the
output from this script should be possible to massage into informational
tables or graphs to help us visualize what they are all testing and NOT
testing.
Closes #8408
- maketgz: return error if 'make dist' fails
To better detect this problem in CI jobs
Reported-by: Marcel Raad
Bug: https://curl.se/mail/lib-2022-02/0070.html
Closes #8402
- h2h3: pass correct argument types to infof()
Detected by Coverity. CID 1497993
Closes #8401
- lib/Makefile: remove config-tpf.h from the dist
Follow-up from da15443dddea2bfb. Missed before because the 'distcheck'
CI job was not working as intended.
Reported-by: Marcel Raad
Bug: https://curl.se/mail/lib-2022-02/0070.html
Closes #8403
- configure: remove support for "embedded ares"
In March 2010 (commit 4259d2df7dd) we removed the embedded 'ares'
directory from the curl source tree but we have since supported
especially detecting and using that build directory. The time has come
to remove that kludge and ask users to specify the c-ares dir correctly
with --enable-ares.
Closes #8397
- [Sebastian Sterk brought this change]
github/workflows/mbedtls: fix indent & remove unnecessary line breaks
Closes #8399
- CI: move the NSS job from zuul to GHA
Closes #8396
- tests/unit/Makefile.am: add NSS_LIBS to build with NSS fine
Closes #8396
Marcel Raad (7 Feb 2022)
- curl-openssl: fix SRP check for OpenSSL 3.0
When OpenSSL 3.0 is built with `--api=3.0` and `no-deprecated`, the SRP
functions exist in the library, but are disabled for user code. Check
if they are actually usable instead of only if they exist. Also, check
for the functions actually required for TLS-SRP.
TLS-SRP support is still enabled if OpenSSL is configured with just
`--api=3.0` or with `--api=1.1.1 no-deprecated`.
Closes https://github.com/curl/curl/pull/8394
Daniel Stenberg (7 Feb 2022)
- [Henrik Holst brought this change]
http: make Curl_compareheader() take string length arguments too
Also add STRCONST, a macro that returns a string literal and it's length
for functions that take "string,len"
Removes unnecesary calls to strlen().
Closes #8391
- vquic/vquic.h: removed the unused H3 psuedo defines
- ngtcp2: use Curl_pseudo_headers
- quiche: use Curl_pseudo_headers
- http2: use Curl_pseudo_headers
- h2h3: added Curl_pseudo_headers()
For use with both http2 and http3 requests.
- ngtcp2/quiche: make :scheme possible to set
- http2: allow CURLOPT_HTTPHEADER change ":scheme"
The only h2 psuedo header that wasn't previously possible to change by a
user. This change also makes it impossible to send a HTTP/1 header that
starts with a colon, which I don't think anyone does anyway.
The other pseudo headers are possible to change indirectly by doing the
rightly crafted request.
Reported-by: siddharthchhabrap on github
Fixes #8381
Closes #8393
- h2/h3: provide and refer to pseudo headers as defines
... and do sizeof() on the defines to use constants better.
Closes #8389
- [Michał Antoniak brought this change]
smb: passing a socket for writing and reading data instead of FIRSTSOCKET
Closes #8383
- x509asn1: toggle off functions not needed for diff tls backends
... and clean the header file from private defines/structs (move to C
file) and unused function prototypes.
Closes #8386
- lib: move hostcheck and x509sn1 sources to vtls/
... since they are used strictly by TLS code.
Closes #8386
Marcel Raad (4 Feb 2022)
- version_win32: fix warning for `CURL_WINDOWS_APP`
The build version is not supported by the UWP code.
Closes https://github.com/curl/curl/pull/8385
Daniel Stenberg (4 Feb 2022)
- tests/disable-scan.pl: properly detect multiple symbols per line
Test 1165 would fail on some systems because it didn't detect
CURL_DISABLE_* symbols that were used to the right of another one on the
same line! The script would only detect and extract the first one.
Reported-by: Marcel Raad
Fixes #8384
Closes #8388
Jay Satiro (4 Feb 2022)
- config.d: Clarify _curlrc filename is still valid on Windows
Recent changes added support for filename .curlrc on Windows, and
when it's not found curl falls back on the original Windows filename
_curlrc. _curlrc was removed from the doc, however it is still valid.
Closes https://github.com/curl/curl/pull/8382
Daniel Stenberg (4 Feb 2022)
- lib: remove support for CURL_DOES_CONVERSIONS
TPF was the only user and support for that was dropped.
Closes #8378
- TPF: drop support
There has been no TPF related changes done since September 2010 (commit
7e1a45e224e57) and since this is a platform that is relatively different
than many others (== needs attention), I draw the conclusion that this
build is broken since a long time.
Closes #8378
- scripts/delta: check the file delta for current branch
... also polish the output style a little bit
Jay Satiro (3 Feb 2022)
- [Fabian Keil brought this change]
runtests.pl: tolerate test directories without Makefile.inc
Silences the following warnings when using a Makefile.inc-free
TESTDIR using the "-o" argument:
readline() on closed filehandle D at ./runtests.pl line 592.
Use of uninitialized value $disttests in pattern match (m//) at
./runtests.pl line 3602.
Closes https://github.com/curl/curl/pull/8379
Daniel Stenberg (3 Feb 2022)
- [Henrik Holst brought this change]
setopt: do bounds-check before strdup
Curl_setstropt() allocated memory for the string before checking if the
string was within bounds. The bounds check should be done first.
Closes #8377
- [Michał Antoniak brought this change]
mbedtls: enable use of mbedtls without filesystem functions support
Closes #8376
- [Bernhard Walle brought this change]
configure: support specification of a nghttp2 library path
This enables using --with-nghttp2=<dir> on systems without pkg-config.
Closes #8375
- scripts/release-notes.pl: remove leftover debug output
- RELEASE-NOTES: synced
- scripts/release-notes.pl: fix number extraction for full URLs
- [Leah Neukirchen brought this change]
scripts/completion.pl: improve zsh completion
- Detect all spellings of <file>, <file name> etc as well as <path>.
- Only complete directories for <dir>.
- Complete URLs for <URL>.
- Complete --request and --ftp-method.
Closes #8363
- [Davide Cassioli brought this change]
configure: use correct CFLAGS for threaded resolver with xlC on AIX
Fixes #8276
Closes #8374
- mailmap: Henrik Holst
Jay Satiro (2 Feb 2022)
- build: fix ngtcp2 crypto library detection
- Change library link check for ngtcp2_crypto_{gnutls,openssl} to
to use function ngtcp2_crypto_recv_client_initial_cb instead of
ngtcp2_crypto_ctx_initial.
The latter function is no longer external since two days ago in
ngtcp2/ngtcp2@533451f. curl HTTP/3 CI builds have been failing since
then because they would not link to the ngtcp2 crypto library.
Ref: https://github.com/ngtcp2/ngtcp2/pull/356
Closes https://github.com/curl/curl/pull/8372
- [Henrik Holst brought this change]
urlapi: remove an unnecessary call to strlen
- Use strcpy instead of strlen+memcpy to copy the url path.
Ref: https://curl.se/mail/lib-2022-02/0006.html
Closes https://github.com/curl/curl/pull/8370
Daniel Stenberg (1 Feb 2022)
- scripts/copyright.pl: fix for handling removed files better
- vxworks: drop support
No changes or fixes in vxworks related code since 2009 leads me to
believe that this doesn't work anymore.
Closes #8362
- [Henrik Holst brought this change]
base64: remove an unnecessary call to strlen
Closes #8369
- tool_getparam: initial --json support
Adds these test cases:
383 - simple single command line option
384 - reading it from stdin
385 - getting two --json options on command line
386 - --next works after --json
Closes #8314
- [Bjarni Ingi Gislason brought this change]
curl_getdate.3: remove pointless .PP line
mandoc: WARNING: skipping paragraph macro: PP empty
Reported-by: Samuel Henrique
Closes #8365
- [Sebastian Sterk brought this change]
multi: grammar fix in comment
After 'must', the verb is used without 'to'. Correct: "must" or "have
to"
Closes #8368
- openldap: fix compiler warning when built without SSL support
openldap.c:841:52: error: unused parameter ‘data’ [-Werror=unused-parameter]
Closes #8367
- [Samuel Henrique brought this change]
CURLSHOPT_LOCKFUNC.3: fix typo "relased" -> "released"
Found when packaging 7.81.0 for Debian.
Closes #8364
- netware: remove support
There are no current users and no Netware related changes done in the
code for over 13 years is a clear sign this is abandoned.
Closes #8358
- CI: move two jobs from Zuul to Circle CI
- openssl-no-verbose
- openssl-no-proxy
Closes #8359
- cirlceci: also run a c-ares job on arm with debug enabled
Closes #8357
- ci: move the OpenSSL + c-ares job from Zuul to Circle CI
Closes #8357
- mailmap: Jan-Piet Mens
- [luminixinc on github brought this change]
multi: remember connection_id before returning connection to pool
Fix a bug that does not require a new CVE as discussed on hackerone.com.
Previously `connection_id` was accessed after returning connection to
the shared pool.
Bug: https://hackerone.com/reports/1463013
Closes #8355
Jay Satiro (31 Jan 2022)
- write-out.d: Fix num_headers formatting
- [Jan-Piet Mens brought this change]
docs: capitalize the name 'Netscape'
Closes https://github.com/curl/curl/pull/8354
Daniel Stenberg (30 Jan 2022)
- RELEASE-NOTES: synced
- [Antoine Pietri brought this change]
docs: grammar proofread, typo fixes
(Partially automated) proofread of most of the documentation, leading to
various typo fixes.
Closes #8353
- urldata: CONN_IS_PROXIED replaces bits.close when proxy can be disabled
To remove run-time checks for such builds.
Closes #8350
- setopt: fix the TLSAUTH #ifdefs for proxy-disabled builds
Closes #8350
- conncache: make conncache_add_bundle return the pointer
Simplifies the logic a little and avoids a ternary operator.
Ref: #8346
Closes #8349
- mailmap: neutric on github
Jay Satiro (30 Jan 2022)
- [neutric on github brought this change]
docs/TheArtOfHttpScripting: fix example POST URL
Closes https://github.com/curl/curl/pull/8352
Daniel Stenberg (28 Jan 2022)
- nss: handshake callback during shutdown has no conn->bundle
The callback gets called because of the call to PR_Recv() done to
attempt to avoid RST on the TCP connection. The conn->bundle pointer is
already cleared at this point so avoid dereferencing it.
Reported-by: Eric Musser
Fixes #8341
Closes #8342
- [Michał Antoniak brought this change]
mbedtls: remove #include <mbedtls/certs.h>
mbedtls/certs.h file contains only certificates example (all definitions
is beginning by mbedtls_test_*). None of them is used so we can avoid
include the file.
Closes #8343
- [Michał Antoniak brought this change]
mbedtls: enable use of mbedtls without CRL support
Closes #8344
- [Bernhard Walle brought this change]
configure: set CURL_LIBRARY_PATH for nghttp2
To execute the test program, we might need the library path so that the
lib is found at runtime.
Closes #8340
Jay Satiro (28 Jan 2022)
- schannel: restore debug message in schannel_connect_step2
This is a follow-up to recent commit 2218c3a which removed the debug
message to avoid an unused variable warning. The message has been
reworked to avoid the warning.
Ref: https://github.com/curl/curl/pull/8320#issuecomment-1022957904
Closes https://github.com/curl/curl/pull/8336
- test3021: disable all msys2 path transformation
- Disable all MSYS2 path transformation in test3021 and test3022.
Prior to this change path transformation in those tests was disabled
only for arguments that start with forward slashes. However arguments
that are in base64 contain forward slashes at any position and caused
unwanted translations.
== Info: Denied establishing ssh session: mismatch sha256 fingerprint.
Remote +/EYG2YDzDGm6yiwepEMSuExgRRMoTi8Di1UN3kixZw= is not equal to
+C:/msys64/EYG2YDzDGm6yiwepEMSuExgRRMoTi8Di1UN3kixZw
In the above example an argument containing a base64 sha256 fingerprint
was passed to curl after MSYS2 translated +/ into +C:/msys64/, and then
the fingerprint didn't match what was expected.
Ref: https://www.msys2.org/wiki/Porting/
Fixes https://github.com/curl/curl/issues/8084
Closes https://github.com/curl/curl/pull/8325
Daniel Stenberg (27 Jan 2022)
- CI: move scan-build job from Zuul to Azure Pipelines
Closes #8338
Marcel Raad (27 Jan 2022)
- openssl: fix `ctx_option_t` for OpenSSL v3+
The options have been changed to `uint64_t` in
https://github.com/openssl/openssl/commit/56bd17830f2d5855b533d923d4e0649d3ed61d11.
Closes https://github.com/curl/curl/pull/8331
Daniel Stenberg (27 Jan 2022)
- CI: move 'distcheck' job from zuul to azure pipelines
Assisted-by: Kushal Das
Closes #8334
- vtls: pass on the right SNI name
The TLS backends convert the host name to SNI name and need to use that.
This involves cutting off any trailing dot and lowercasing.
Co-authored-by: Jay Satiro
Closes #8320
- url: revert the removal of trailing dot from host name
Reverts 5de8d84098db1bd24e (May 2014, shipped in 7.37.0) and the
follow-up changes done afterward.
Keep the dot in names for everything except the SNI to make curl behave
more similar to current browsers. This means 'name' and 'name.' send the
same SNI for different 'Host:' headers.
Updated test 1322 accordingly
Fixes #8290
Reported-by: Charles Cazabon
Closes #8320
- [neutric on github brought this change]
docs/TheArtOfHttpScripting: fix capitalization
Closes #8333
- tests/memanalyze.pl: also count and show "total allocations"
This is the total number of bytes allocated, increasing for new
allocations and never reduced when freed. The existing "Maximum
allocated" is the high water mark.
Closes #8330
- mailmap: spellfix githuh => github
- RELEASE-NOTES: synced
- hostcheck: fixed to not touch used input strings
Avoids the need to clone the strings before check, thus avoiding
mallocs, which for cases where there are many SAN names in a cert could
end up numerous.
Closes #8321
- ngtcp2: adapt to changed end of headers callback proto
Closes #8322
- [Xiaoke Wang brought this change]
openssl: check SSL_get_ex_data to prevent potential NULL dereference
Closes #8268
Jay Satiro (23 Jan 2022)
- md5: check md5_init_func return value
Prior to this change the md5_init_func (my_md5_init) return value was
ignored.
Closes https://github.com/curl/curl/pull/8319
- md5: refactor for standard compliance
- Wrap OpenSSL / wolfSSL MD5 functions instead of taking their function
addresses during static initialization.
Depending on how curl was built the old way may have used a dllimport
function address during static initialization, which is not standard
compliant, resulting in Visual Studio warning C4232 (nonstandard
extension). Instead the function pointers now point to the wrappers
which call the MD5 functions.
This change only affects OpenSSL and wolfSSL because calls to other SSL
libraries' md5 functions were already wrapped. Also sha256.c already
does this for all SSL libraries.
Ref: https://github.com/curl/curl/pull/8298
Closes https://github.com/curl/curl/pull/8318
Daniel Stenberg (21 Jan 2022)
- [Lucas Pardue brought this change]
docs: update IETF links to use datatracker
The tools.ietf.org domain has been deprecated a while now, with the
links being redirected to datatracker.ietf.org.
Rather than make people eat that redirect time, this change switches the
URL to a more canonical source.
Closes #8317
- [Harry Sarson brought this change]
CI: test building wolfssl with --enable-opensslextra
Closes #8315
- [Harry Sarson brought this change]
misc: allow curl to build with wolfssl --enable-opensslextra
put all #include of openssl files behind wolfssl ifdefs so that we can
use the wolfssl/ prefixed include paths. Without these curl only builds
when wolfssl is built with enable-all.
Fixes #8292
Closes #8315
- [Lucas Pardue brought this change]
quiche: change qlog file extension to `.sqlog`
quiche has just switched it's qlog serialization format to JSON-SEQ by
default . The spec says this SHOULD use `.sqlog` extension.
I believe ngtcp2 also supports JSON-SEQ by default as of
https://github.com/ngtcp2/ngtcp2/commit/9baf06fc3f352a1d062b6953ae1de22cae30639d
Let's update curl so that tools know what format we are using!
Closes #8316
Jay Satiro (21 Jan 2022)
- projects: Fix Visual Studio wolfSSL configurations
- Change build-wolfssl.bat to disable SSLv3, enable TLSv1.3, enable
wolfSSL_DES_ecb_encrypt (needed by NTLM) and enable alt cert chains.
- Disable warning C4214 'bit field types other than int'.
- Add include directory wolfssl\wolfssl.
wolfSSL offers OpenSSL API compatibility that libcurl uses, and some
recent change in libcurl included an include file for wolfSSL like
openssl/foo.h, which has a path like wolfssl\wolfssl\openssl\foo.h.
The include directory issue was reported in #8292 but it's currently
unclear whether this type of change is needed for other build systems.
Bug: https://github.com/curl/curl/issues/8292
Reported-by: Harry Sarson
Closes https://github.com/curl/curl/pull/8298
Daniel Stenberg (21 Jan 2022)
- openssl: return error if TLS 1.3 is requested when not supported
Previously curl would just silently ignore it if the necessary defines
are not present at build-time.
Reported-by: Stefan Eissing
Fixes #8309
Closes #8310
- TODO: Passing NOTIFY option to CURLOPT_MAIL_RCPT
Closes #8232
- [Philip H brought this change]
workflows/wolfssl: install impacket
needed Python Package for SMB tests
Closes #8307
- url: make Curl_disconnect return void
1. The function would only ever return CURLE_OK anyway
2. Only one caller actually used the return code
3. Most callers did (void)Curl_disconnect()
Closes #8303
- docs: document HTTP/2 not insisting on TLS 1.2
Both for --http2 and CURLOPT_HTTP_VERSION.
Reported-by: jhoyla on github
Fixes #8235
Closes #8300
- cmdline-opts/gen.pl: fix option matching to improve references
Previously it could mistakenly match partial names when there are
options that start with the same prefix, leading to the wrong references
used.
Closes #8299
- TODO: Less memory massaging with Schannel
- [Patrick Monnerat brought this change]
runtests.pl: disable debuginfod
Valgrind and gdb implement this feature: as this highly slows down tests,
disable it.
Closes #8291
- RELEASE-NOTES: synced
- CURLMOPT_TIMERFUNCTION/DATA.3: fix the examples
... to not call libcurl recursively back.
Closes #8286
- multi: set in_callback for multi interface callbacks
This makes most libcurl functions return error if called from within a
callback using the same multi handle. For example timer or socket
callbacks calling curl_multi_socket_action.
Reported-by: updatede on github
Fixes #8282
Closes #8286
- docs/HISTORY.md: mention alt-svc and HSTS
- misc: remove the final watcom references
Follow-up to bbf8cae44dedc495e6
We removed support for the watcom builds files back in September
2020. This removes all remaining watcom references and ifdefs.
Closes #8287
- misc: remove BeOS code and references
There has not been a mention of this OS in any commit since December
2004 (58f4af7973e3d2). The OS is also long gone.
Closes #8288
- tool_getparam: DNS options that need c-ares now fail without it
Just silently accepting the options and then not having any effect is
not good.
Ref: #8283
Closes #8285
- curl: remove "separators" (when using globbed URLs)
Unless muted (with -s) When doing globbing, curl would output mime-like
separators between the separate transfers. This is not documented
anywhere, surprises users and clobbers the output. Gone now.
Updated test 18 and 1235
Reported-by: jonny112 on github
Bug: https://github.com/curl/curl/discussions/8257
Closes #8278
Jay Satiro (15 Jan 2022)
- [Niels Martignène brought this change]
mbedtls: fix CURLOPT_SSLCERT_BLOB (again)
- Increase the buffer length passed to mbedtls_x509_crt_parse to account
for the null byte appended to the temporary blob.
Follow-up to 867ad1c which uses a null terminated copy of the
certificate blob, because mbedtls_x509_crt_parse requires PEM data
to be null terminated.
Ref: https://github.com/curl/curl/commit/867ad1c#r63439893
Ref: https://github.com/curl/curl/pull/8146
Closes https://github.com/curl/curl/pull/8260
Daniel Stenberg (15 Jan 2022)
- [Alessandro Ghedini brought this change]
quiche: verify the server cert on connect
Similarly to c148f0f551f9bea0e3d0, make quiche correctly acknowledge
`CURLOPT_SSL_VERIFYPEER` and `CURLOPT_SSL_VERIFYHOST`.
Fixes #8173
Closes #8275
- [Ikko Ashimine brought this change]
checksrc: fix typo in comment
enfore -> enforce
Closes #8281
- curl-openssl: remove the OpenSSL headers and library versions check
It is more work to maintain that check than the (any?) benefit it
brings.
Fixes #8279
Reported-by: Satadru Pramanik
Closes #8280
- mqtt: free any leftover when done
Oss-fuzz found an issue when the "sendleftovers" pointer could leak memory.
Fix this by always freeing it (if still assigned) in the done function.
Bug: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=43515
Closes #8274
- formdata: avoid size_t => long typecast overflows
Typically a problem for platforms with 32 bit long and 64 bit size_t
Reported-by: Fabian Yamaguchi
Bug: https://hackerone.com/reports/1444539
Closes #8272
- RELEASE-NOTES: synced
bump next release to become 7.82.0
Marcel Raad (13 Jan 2022)
- build: enable -Warith-conversion
This makes the behavior consistent between GCC 10 and earlier versions.
Closes https://github.com/curl/curl/pull/8271
- build: fix -Wenum-conversion handling
Don't enable that warning when warnings are disabled.
Also add it to CMake.
Closes https://github.com/curl/curl/pull/8271
- appveyor: use VS 2017 image for the autotools builds
The newer images don't have all required MSYS2 packages.
Fixes https://github.com/curl/curl/issues/8248
Closes https://github.com/curl/curl/pull/8265
- appveyor: update images from VS 2019 to 2022
Closes https://github.com/curl/curl/pull/8265
Daniel Stenberg (12 Jan 2022)
- [Michał Antoniak brought this change]
mbedtls: return CURLcode result instead of a mbedtls error code
... when a certificate fails to be loaded from a blob
Closes #8266
- curl_multi_socket.3: remove callback and typical usage descriptions
1. The callback is better described in the option for setting it. Having
it in a single place reduces the risk that one of them is wrong.
2. The "typical usage" is wrong since the functions described in this
man page are both deprecated so they cannot be used in any "typical" way
anymore.
Closes #8262
- curl-functions.m4: revert DYLD_LIBRARY_PATH tricks in CURL_RUN_IFELSE
Mostly reverts ba0657c343f, but now instead just run the plain macro on
darwin. The approach as used on other platforms is simply not necessary
on macOS.
Fixes #8229
Reported-by: Ryan Schmidt
Closes #8247
- [Patrick Monnerat brought this change]
openldap: implement SASL authentication
As credentials can be quite different depending on the mechanism used,
there are no default mechanisms for LDAP and simple bind with a DN is
then used.
The caller has to provide mechanism(s) using CURLOPT_LOGIN_OPTIONS to
enable SASL authentication and disable simple bind.
Closes #8152
Jay Satiro (10 Jan 2022)
- [Cameron Will brought this change]
CURLOPT_RESOLVE.3: change example port to 443
83cc966 changed documentation from using http to https. However,
CURLOPT_RESOLVE being set to port 80 in the documentation means that it
isn't valid for the new URL. Update to 443.
Closes https://github.com/curl/curl/pull/8258
Daniel Stenberg (10 Jan 2022)
- [Fabian Keil brought this change]
test374: gif data without new line at the end
Closes #8239
- [Fabian Keil brought this change]
runtests.pl: support the nonewline attribute for the data part
Added to FILEFORMAT
Closes #8239
- [Patrick Monnerat brought this change]
curl tool: erase some more sensitive command line arguments
As the ps command may reveal sensitive command line info, obfuscate
options --tlsuser, --tlspasswd, --proxy-tlsuser, --proxy-tlspassword and
--oauth2-bearer arguments.
Reported-by: Stephen Boost <s.booth@epcc.ed.ac.uk>
Closes #7964
- mesalink: remove support
Mesalink has ceased development. We can no longer encourage use of it.
It seems to be continued under the name TabbySSL, but no attempts have
(yet) been to make curl support it.
Fixes #8188
Closes #8191
- ldap: return CURLE_URL_MALFORMAT for bad URL
For consistency, use the same return code for URL malformats,
independently of what scheme that is used. Previously this would return
CURLE_LDAP_INVALID_URL, but starting now that error cannot be returned.
Closes #8170
- docs/cmdline-opts: add "mutexed" options for more http versions
Update four http version man page sections.
Closes #8254
- [Stephen M. Coakley brought this change]
rustls: add CURLOPT_CAINFO_BLOB support
Add support for `CURLOPT_CAINFO_BLOB` `CURLOPT_PROXY_CAINFO_BLOB` to the
rustls TLS backend. Multiple certificates in a single PEM string are
supported just like OpenSSL does with this option.
This is compatible at least with rustls-ffi 0.8+ which is our new
minimum version anyway.
I was able to build and run this on Windows, pulling trusted certs from
the system and then add them to rustls by setting
`CURLOPT_CAINFO_BLOB`. Handy!
Closes #8255
- scripts/copyright.pl: ignore missing files
- RELEASE-NOTES: synced
- data/DISABLED: disable test 313 for wolfssl builds
It was previously disabled only in the CI jobs yaml
Closes #8252
- runtests: make 'wolfssl' a testable feature
Closes #8252
- GHA: install stunnel in the medbtls + wolfssl CI jobs
Closes #8252
- CI: move the rustls CI job to GHA from Zuul
Closes #8251
- DISABLE: disable a dozen tests in the rustls build
Disables tests that don't yet work with the rustls backend.
Fixes #8004
Closes #8250
- runtests: make 'rustls' a testable feature
- remote-header-name.d: clarify
- it strips off the path from the server provided name
- it saves in current directory or --output-dir
Ref: https://curl.se/mail/archive-2022-01/0032.html
Closes #8249
- url: given a user in the URL, find pwd for that user in netrc
Add test 380 and 381 to verify, edited test 133
Reported-by: Manfred Schwarb
Fixes #8241
Closes #8243
- [Niels Martignène brought this change]
mbedtls: Fix ssl_init error with mbedTLS 3.1.0+
Since mbedTLS 3.1.0, mbedtls_ssl_setup() fails if the provided
config struct is not valid.
mbedtls_ssl_config_defaults() needs to be called before the config
struct is passed to mbedtls_ssl_setup().
Closes #8238
- [Filip Lundgren brought this change]
cmake: fix iOS CMake project generation error
Closes #8244
- ngtcp2: fix declaration of ‘result’ shadows a previous local
Follow-up to 8fbd6feddfa587cfd3
Closes #8245
- openssl.h: avoid including OpenSSL headers here
... by instead using the struct version of the typedef'ed pointer. To
fix build errors when both Schannel and OpenSSL are enabled.
Fixes #8240
Reported-by: Jan Ehrhardt
Closes #8246
- curl_url_set.3: mention when CURLU_ALLOW_SPACE was added
- tool_findfile: free mem properly
Follow-up to 764e4f066d5
Closes #8242
- tool_findfile: check ~/.config/curlrc too
... after the initial checks for .curlrc and if XDG_CONFIG_HOME is not
set, use $HOME and $CURL_HOME to check if ~/.config/curlrc is present.
Add test 436 to verify
Reported-by: Sandro Jaeckel
Fixes #8208
Closes #8213
- runtests: allow client/file to specify multiple directories
... and make sure to mkdir them all
- scripts/copyright.pl: support many provided file names on the cmdline
- [Fabian Keil brought this change]
tests/FILEFORMAT.md: fix typo
- [Fabian Keil brought this change]
Add test373: multiple chunks with binary zeros
- [Fabian Keil brought this change]
Add test372: binary zero in data element
- [Fabian Keil brought this change]
tests/server/getpart.c: properly deal with binary data containing NUL bytes
- [Fabian Keil brought this change]
runtests.pl: properly print the test if it contains binary zeros
- mailmap: Xiaoke Wang
- openssl: copyright year update
Follow-up to 30aea2b1ede
- scripts/copyright.pl: hush unless -v (for verbose) is used
- [Xiaoke Wang brought this change]
openssl: check the return value of BIO_new_mem_buf()
Closes #8233
- examples/multi-app.c: call curl_multi_remove_handle as well
Fixes #8234
Reported-by: Melroy van den Berg
Closes #8236
- COPYING: bump copyright year range
- RELEASE-NOTES: synced
and bump curlver after release
- docs: fix mandoc -T lint formatting complaints
Closes #8228
- next.d. remove .fi/.nf as they are handled by gen.pl
Closes #8228
- gen.pl: terminate "example" sections better
If the example (section that is prefixed with spaces) ends the
description gen.pl would previously miss to output the terminating .fi
Closes #8228
- [Satadru Pramanik brought this change]
curl-functions.m4: fix LIBRARY_PATH adjustment to avoid eval
$$ usage in a m4 file introduces the PID in linux.
Instead, just duplicate previous working code with a case switch.
Fixes #8229
Closes #8230
Version 7.81.0 (5 Jan 2022)
Daniel Stenberg (5 Jan 2022)
- RELEASE-NOTES: synced
curl 7.81.0 release
- THANKS: add names from 7.81.0 release
- curl_multi_init.3: fix the copyright year range
- test719-721: require "proxy" feature present to run
Bug: https://github.com/curl/curl/pull/8223#issuecomment-1005188696
Reported-by: Marc Hörsken
Closes #8226
- test719: require ipv6 support to run
Follow-up to effd2bd7ba2a5fd244
Reported-by: Marc Hörsken
Bug: https://github.com/curl/curl/pull/8217#issuecomment-1004681145
Closes #8223
- test719-721: verify SOCKS details
Using the new verify/socks details
- runtests: add verify/socks check
If used, this data is compared with the data in log/socksd-request.log
which the socksd server logs.
Added to FILEFORMAT.md
- server/socksd: log atyp + address in a separate log
To allow the test suite to verify that the right data arrived
- socks5: use appropriate ATYP for numerical IP address host names
When not resolving the address locallly (known as socks5h).
Add test 719 and 720 to verify.
Reported-by: Peter Piekarski
Fixes #8216
Closes #8217
Jay Satiro (3 Jan 2022)
- curl_multi_init.3: fix EXAMPLE formatting
Daniel Stenberg (3 Jan 2022)
- RELEASE-NOTES: synced
- libtest: avoid "assignment within conditional expression"
In lib530, lib540 and lib582
Closes #8218
- ftp: disable warning 4706 in MSVC
Follow-up to 21248e052d
Disabling "assignment within conditional expression" for MSVC needs to
be done before the function starts, for it to take effect.
Closes #8218
- tool_operate: warn if too many output arguments were found
More output instructions than URLs is likely a user error.
Add test case 371 to verify
Closes #8210
- .github/workflows/mbedtls.yml: bump to mbedtls 3.1.0
Closes #8215
- zuul: remove the mbedtls jobs
Now running as github workflows
Closes #8215
- github/workflows: add mbedtls and mbedtls-clang
Closes #8215
- [Valentin Richter brought this change]
mbedtls: fix private member designations for v3.1.0
"As a last resort, you can access the field foo of a structure bar by
writing bar.MBEDTLS_PRIVATE(foo). Note that you do so at your own risk,
since such code is likely to break in a future minor version of Mbed
TLS." -
https://github.com/ARMmbed/mbedtls/blob/f2d1199edc5834df4297f247f213e614f7782d1d/docs/3.0-migration-guide.md
That future minor version is v3.1.0. I set the >= to == for the version
checks because v3.1.0 is a release, and I am not sure when the private
designation was reverted after v3.0.0.
Closes #8214
- [Valentin Richter brought this change]
cmake: prevent dev warning due to mismatched arg
-- curl version=[7.81.0-DEV]
CMake Warning (dev) at /usr/share/cmake-3.22.1/Modules/FindPackageHandleStandardArgs.cmake:438 (message):
The package name passed to `find_package_handle_standard_args` (MBEDTLS)
does not match the name of the calling package (MbedTLS). This can lead to
problems in calling code that expects `find_package` result variables
(e.g., `_FOUND`) to follow a certain pattern.
Call Stack (most recent call first):
deps/curl/CMake/FindMbedTLS.cmake:31 (find_package_handle_standard_args)
deps/curl/CMakeLists.txt:473 (find_package)
This warning is for project developers. Use -Wno-dev to suppress it.
Closes #8207
- urlapi: if possible, shorten given numerical IPv6 addresses
Extended test 1560 to verify
Closes #8206
- [Michał Antoniak brought this change]
url: reduce ssl backend count for CURL_DISABLE_PROXY builds
Closes #8212
- KNOWN_BUGS: "Trying local ports fails on Windows"
Reported-by: gclinch on github
Closes #8112
- misc: update copyright year range
- zuul: remove the wolfssl even more
Follow-up to 1914465cf180d32b3d
- examples/multi-single.c: remove WAITMS()
As it isn't used.
Reported-by: Melroy van den Berg
Fixes #8200
Closes #8201
- gtls: add gnutls include for the session type
Follow-up to 8fbd6feddfa5 to make it build more universally
- m4/curl-compilers: tell clang -Wno-pointer-bool-conversion
To hush compiler warnings we don't care for: error: address of function
'X' will always evaluate to 'true'
Fixes #8197
Closes #8198
- http_proxy: don't close the socket (too early)
... and double-check in the OpenSSL shutdown that the socket is actually
still there before it is used.
Fixes #8193
Closes #8195
Reported-by: Leszek Kubik
- ngtcp2: verify the server certificate for the gnutls case
Closes #8178
- ngtcp2: verify the server cert on connect (quictls)
Make ngtcp2+quictls correctly acknowledge `CURLOPT_SSL_VERIFYPEER` and
`CURLOPT_SSL_VERIFYHOST`.
The name check now uses a function from lib/vtls/openssl.c which will
need attention for when TLS is not done by OpenSSL or is disabled while
QUIC is enabled.
Possibly the servercert() function in openssl.c should be adjusted to be
able to use for both regular TLS and QUIC.
Ref: #8173
Closes #8178
- zuul: remove the wolfssl build
- github workflow: add wolfssl
Closes #8196
- [Nicolas Sterchele brought this change]
zuul: fix quiche build pointing to wrong Cargo
Fixes #8184
Closes #8189
- checksrc: detect more kinds of NULL comparisons we avoid
Co-authored-by: Jay Satiro
Closes #8180
- RELEASE-NOTES: synced
- mesalink: remove the BACKEND define kludge
Closes #8183
- schannel: remove the BACKEND define kludge
Closes #8182
- gtls: check return code for gnutls_alpn_set_protocols
Closes #8181
- [Stefan Huber brought this change]
README: label the link to the support document
Closes #8185
- docs/HTTP3: describe how to setup a h3 reverse-proxy for testing
Assisted-by: Matt Holt
Closes #8177
- libcurl-multi.3: "SOCKS proxy handshakes" are not blocking
Since 4a4b63daaa0
- [Vladimir Panteleev brought this change]
tests: Add test for CURLOPT_HTTP200ALIASES
- [Vladimir Panteleev brought this change]
http: Fix CURLOPT_HTTP200ALIASES
The httpcode < 100 check was also triggered when none of the fields were
parsed, thus making the if(!nc) block unreachable.
Closes #8171
- RELEASE-NOTES: synced
- language: "email"
Missed three occurrences.
Follow-up to 7a92f86
- nss:set_cipher don't clobber the cipher list
The string is set by the user and needs to remain intact for proper
connection reuse etc.
Reported-by: Eric Musser
Fixes #8160
Closes #8161
- misc: s/e-mail/email
Consistency is king. Following the lead in everything curl.
Closes #8159
- [Tobias Nießen brought this change]
docs: fix typo in OpenSSL 3 build instructions
Closes #8162
- linkcheck.yml: add CI job that checks markdown links
Closes #8158
- RELEASE-PROCEDURE.md: remove ICAL link and old release dates
- BINDINGS.md: "markdown-link-check-disable"
It feels a bit unfortunate to litter an ugly tag for this functionality,
but if we get link scans of all markdown files, this might be worth the
price.
- docs: fix dead links, remove ECH.md
Jay Satiro (16 Dec 2021)
- openssl: define HAVE_OPENSSL_VERSION for OpenSSL 1.1.0+
Prior to this change OpenSSL_version was only detected in configure
builds. For other builds the old version parsing code was used which
would result in incorrect versioning for OpenSSL 3:
Before:
curl 7.80.0 (i386-pc-win32) libcurl/7.80.0 OpenSSL/3.0.0a zlib/1.2.11
WinIDN libssh2/1.9.0
After:
curl 7.80.0 (i386-pc-win32) libcurl/7.80.0 OpenSSL/3.0.1 zlib/1.2.11
WinIDN libssh2/1.9.0
Reported-by: lllaffer@users.noreply.github.com
Fixes https://github.com/curl/curl/issues/8154
Closes https://github.com/curl/curl/pull/8155
Daniel Stenberg (16 Dec 2021)
- [James Fuller brought this change]
docs: add known bugs list to HTTP3.md
Closes #8156
Dan Fandrich (15 Dec 2021)
- BINDINGS: add one from Everything curl and update a link
- libcurl-security.3: mention address and URL mitigations
The new CURLOPT_PREREQFUNCTION callback is another way to sanitize
addresses.
Using the curl_url API is a way to mitigate against attacks relying on
URL parsing differences.
Daniel Stenberg (15 Dec 2021)
- RELEASE-NOTES: synced
- x509asn1: return early on errors
Overhaul to make sure functions that detect errors bail out early with
error rather than trying to continue and risk hiding the problem.
Closes #8147
- [Patrick Monnerat brought this change]
openldap: several minor improvements
- Early check proper LDAP URL syntax. Reject URLs with a userinfo part.
- Use dynamic memory for ldap_init_fd() URL rather than a
stack-allocated buffer.
- Never chase referrals: supporting it would require additional parallel
connections and alternate authentication credentials.
- Do not wait 1 microsecond while polling/reading query response data.
- Store last received server code for retrieval with CURLINFO_RESPONSE_CODE.
Closes #8140
- [Michał Antoniak brought this change]
misc: remove unused doh flags when CURL_DISABLE_DOH is defined
Closes #8148
- mbedtls: fix CURLOPT_SSLCERT_BLOB
The memory passed to mbedTLS for this needs to be null terminated.
Reported-by: Florian Van Heghe
Closes #8146
- asyn-ares: ares_getaddrinfo needs no happy eyeballs timer
Closes #8142
- mailmap: add Yongkang Huang
From #8141
- [Yongkang Huang brought this change]
check ssl_config when re-use proxy connection
- mbedtls: do a separate malloc for ca_info_blob
Since the mbedTLS API requires the data to the null terminated.
Follow-up to 456c53730d21b1fad0c7f72c1817
Fixes #8139
Closes #8145
Marc Hoersken (14 Dec 2021)
- CI: build examples for additional code verification
Some CIs already build them, let's do it on more of them.
Reviewed-by: Daniel Stenberg
Follow up to #7690 and 77311f420a541a0de5b3014e0e40ff8b4205d4af
Replaces #7591
Closes #7922
- docs/examples: workaround broken -Wno-pedantic-ms-format
Avoid CURL_FORMAT_CURL_OFF_T by using unsigned long instead.
Improve size_t to long conversion in imap-append.c example.
Ref: https://github.com/curl/curl/issues/6079
Ref: https://github.com/curl/curl/pull/6082
Assisted-by: Jay Satiro
Reviewed-by: Daniel Stenberg
Preparation of #7922
- tests/data/test302[12]: fix MSYS2 path conversion of hostpubsha256
Ref: https://www.msys2.org/wiki/Porting/#filesystem-namespaces
Reviewed-by: Marcel Raad
Reviewed-by: Jay Satiro
Fixes #8084
Closes #8138
Daniel Stenberg (13 Dec 2021)
- [Patrick Monnerat brought this change]
openldap: simplify ldif generation code
and take care of zero-length values, avoiding conversion to base64
and/or trailing spaces.
Closes #8136
- example/progressfunc: remove code for old libcurls
7.61.0 is over three years old now, remove all #ifdefs for handling
ancient libcurl versions so that the example gets easier to read and
understand
Closes #8137
- [Xiaoke Wang brought this change]
sha256/md5: return errors when init fails
Closes #8133
- TODO: 13.3 Defeat TLS fingerprinting
Closes #8119
- RELEASE-NOTES: synced
- [Patrick Monnerat brought this change]
openldap: process search query response messages one by one
Upon receiving large result sets, this reduces memory consumption and
allows starting to output results while the transfer is still in
progress.
Closes #8101
- hash: lazy-alloc the table in Curl_hash_add()
This makes Curl_hash_init() infallible which saves error paths.
Closes #8132
- multi: cleanup the socket hash when destroying it
Since each socket hash entry may themselves have a hash table in them,
the destroying of the socket hash needs to make sure all the subhashes
are also correctly destroyed to avoid leaking memory.
Fixes #8129
Closes #8131
- test1156: fixup the stdout check for Windows
It is not text mode.
Follow-up to 6f73e68d182
Closes #8134
- test1528: enable for hyper
Closes #8128
- test1527: enable for hyper
Closes #8128
- test1526: enable for hyper
Closes #8128
- test1525: slightly tweaked for hyper
Closes #8128
- test1156: enable for hyper
Minor reorg of the lib1156 code and it works fine for hyper.
Closes #8127
- test661: enable for hyper
Closes #8126
- docs: fix proselint nits
- remove a lot of exclamation marks
- use consistent spaces (1, not 2)
- use better words at some places
Closes #8123
- [RekGRpth brought this change]
BINDINGS.md: add cURL client for PostgreSQL
Closes #8125
- [RekGRpth brought this change]
CURLSHOPT_USERDATA.3: fix copy-paste mistake
Closes #8124
- docs: fix minor nroff format nits
Repairs test 1140
Follow-up to 436cdf82041
- docs/URL-SYNTAX.md: space is not fine in a given URL
- curl_multi_perform/socket_action.3: clarify what errors mean
An error returned from one of these funtions mean that ALL still ongoing
transfers are to be considered failed.
Ref: #8114
Closes #8120
- libcurl-errors.3: add CURLM_ABORTED_BY_CALLBACK
Follow-up to #8089 (2b3dd01)
Closes #8116
- hash: add asserts to help detect bad usage
For example trying to add entries after the hash has been "cleaned up"
Closes #8115
- lib530: abort on curl_multi errors
This makes torture tests run more proper.
Also add an assert to trap situations where it would end up with no
sockets to wait for.
Closes #8121
- FAQ: we never pronounced it "see URL", we say "kurl"
- RELEASE-NOTES: synced
- CURLOPT_RESOLVE.3: minor polish
Minor rephrasing for some explanations.
Put the format strings in stand-alone lines with .nf/.fi to be easier to spot.
Move "added in" to AVAILABILITY
Closed #8110
- test1556: adjust for hyper
Closes #8105
- test1554: adjust for hyper
Closes #8104
- retry-all-errors.d: make the example complete
... as it needs --retry too to work
- TODO: 5.7 Require HTTP version X or higher
Closes #7980
- CURLOPT_STDERR.3: does not work with libcurl as a win32 DLL
This is the exact same limitation already documented for
CURLOPT_WRITEDATA but should be clarified here. It also has a different
work-around.
Reported-by: Stephane Pellegrino
Bug: https://github.com/curl/curl/issues/8102
Closes #8103
- multi: handle errors returned from socket/timer callbacks
The callbacks were partially documented to support this. Now the
behavior is documented and returning error from either of these
callbacks will effectively kill all currently ongoing transfers.
Added test 530 to verify
Reported-by: Marcelo Juchem
Fixes #8083
Closes #8089
- http2:set_transfer_url() return early on OOM
If curl_url() returns NULL this should return early to avoid mistakes -
even if right now the subsequent function invokes are all OK.
Coverity (wrongly) pointed out this as a NULL deref.
Closes #8100
- tool_parsecfg: use correct free() call to free memory
Detected by Coverity. CID 1494642.
Follow-up from 2be1aa619bca
Closes #8099
- tool_operate: fix potential memory-leak
A 'CURLU *' would leak if url_proto() is called with no URL.
Detected by Coverity. CID 1494643.
Follow-up to 18270893abdb19
Closes #8098
- [Patrick Monnerat brought this change]
openldap: implement STARTTLS
As this introduces use of CURLOPT_USE_SSL option for LDAP, also check
this option in ldap.c as it is not supported by this backend.
Closes #8065
- [Jun Tseng brought this change]
curl_easy_unescape.3: call curl_easy_cleanup in example
Closes #8097
- [Jun Tseng brought this change]
curl_easy_escape.3: call curl_easy_cleanup in example
Closes #8097
- tool_listhelp: sync
Follow-up to 172068b76f
- [Damien Walsh brought this change]
request.d: refer to 'method' rather than 'command'
Closes #8094
- RELEASE-NOTES: synced
- writeout: fix %{http_version} for HTTP/3
Output "3" properly when HTTP/3 was used.
Reported-by: Bernat Mut
Fixes #8072
Closes #8092
- urlapi: accept port number zero
This is a regression since 7.62.0 (fb30ac5a2d).
Updated test 1560 accordingly
Reported-by: Brad Fitzpatrick
Fixes #8090
Closes #8091
- [Mark Dodgson brought this change]
lift: ignore is a deprecated config option, use ignoreRules
Closes #8082
- [Alessandro Ghedini brought this change]
HTTP3: update quiche build instructions
The repo repo was re-organized a bit, so the build instructions need to
be updated.
Closes #8076
- CURLMOPT_TIMERFUNCTION.3: call it expire time, not interval
Since we say it is a non-repating timer
- [Florian Van Heghe brought this change]
mbedTLS: include NULL byte in blob data length for CURLOPT_CAINFO_BLOB
Fixes #8079
Closes #8081
Jay Satiro (2 Dec 2021)
- [Wyatt O'Day brought this change]
version_win32: Check build number and platform id
Prior to this change the build number was not checked during version
comparison, and the platform id was supposed to be checked but wasn't.
Checking the build number is required for enabling "evergreen"
Windows 10/11 features (like TLS 1.3).
Ref: https://github.com/curl/curl/pull/7784
Closes https://github.com/curl/curl/pull/7824
Closes https://github.com/curl/curl/pull/7867
- libssh2: fix error message for sha256 mismatch
- On mismatch error show sha256 fingerprint in base64 format.
Prior to this change the fingerprint was mistakenly printed in binary.
Daniel Stenberg (1 Dec 2021)
- [Xiaoke Wang brought this change]
openssl: check the return value of BIO_new()
Closes #8078
Dan Fandrich (30 Nov 2021)
- docs: Update the Reducing Size section
Add many more options that can reduce the size of the binary that were
added since the last update. Update the sample minimal binary size for
version 7.80.0.
- tests: Add some missing keywords to tests
These are needed to skip some tests when configure options have disabled
certain features.
Daniel Stenberg (30 Nov 2021)
- [Florian Van Heghe brought this change]
mbedTLS: add support for CURLOPT_CAINFO_BLOB
Closes #8071
- [Glenn Strauss brought this change]
digest: compute user:realm:pass digest w/o userhash
https://datatracker.ietf.org/doc/html/rfc7616#section-3.4.4
... the client MUST calculate a hash of the username after
any other hash calculation ...
Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
Closes #8066
- config.d: update documentation to match the path search
Assisted-by: Jay Satiro
- tool_findfile: search for a file in the homedir
The homedir() function is now renamed into findfile() and iterates over
all the environment variables trying to access the file in question
until it finds it. Last resort is then getpwuid() if
available. Previously it would first try to find a home directory and if
that was set, insist on checking only that directory for the file. This
now returns the full file name it finds.
The Windows specific checks are now done differently too and in this
order:
1 - %USERPROFILE%
2 - %APPDATA%
3 - %USERPROFILE%\\Application Data
The windows order is modified to match how the Windows 10 ssh tool works
when it searches for .ssh/known_hosts.
Reported-by: jeffrson on github
Co-authored-by: Jay Satiro
Fixes #8033
Closes #8035
- docs: consistent manpage SYNOPSIS
Make all libcurl related options use .nf (no fill) for the SYNOPSIS
section - for consistent look. roffit then renders that section using
<pre> (monospace font) in html for the website.
Extended manpage-syntax (test 1173) with a basic check for it.
Closes #8062
- RELEASE-NOTES: synced
- [Patrick Monnerat brought this change]
openldap: handle connect phase with a state machine
Closes #8054
- docs: address proselint nits
- avoid exclamation marks
- use consistent number of spaces after periods: one
- avoid clichés
- avoid using 'very'
Closes #8060
- [Bruno Baguette brought this change]
FAQ: typo fix : "yout" ➤ "your"
Closes #8059
- [Bruno Baguette brought this change]
docs/INSTALL.md: typo fix : added missing "get" verb
Closes #8058
- insecure.d: detail its use for SFTP and SCP as well
Closes #8056
Viktor Szakats (25 Nov 2021)
- Makefile.m32: rename -winssl option to -schannel and tidy up
- accept `-schannel` as an alternative to `CFG` option `-winssl`
(latter still accepted, but deprecated)
- rename internal variable `WINSSL` to `SCHANNEL`
- make the `CFG` option evaluation shorter, without repeating the option
name
Reviewed-by: Marcel Raad
Reviewed-by: Daniel Stenberg
Closes #8053
Daniel Stenberg (25 Nov 2021)
- KNOWN_BUGS: 5.6 make distclean loops forever
Reported-by: David Bohman
Closes #7716
- KNOWN_BUGS: add one, remove one
- 5.10 SMB tests fail with Python 2
Just use python 3.
+ 5.10 curl hangs on SMB upload over stdin
Closes #7896
- urlapi: provide more detailed return codes
Previously, the return code CURLUE_MALFORMED_INPUT was used for almost
30 different URL format violations. This made it hard for users to
understand why a particular URL was not acceptable. Since the API cannot
point out a specific position within the URL for the problem, this now
instead introduces a number of additional and more fine-grained error
codes to allow the API to return more exactly in what "part" or section
of the URL a problem was detected.
Also bug-fixes curl_url_get() with CURLUPART_ZONEID, which previously
returned CURLUE_OK even if no zoneid existed.
Test cases in 1560 have been adjusted and extended. Tests 1538 and 1559
have been updated.
Updated libcurl-errors.3 and curl_url_strerror() accordingly.
Closes #8049
- urlapi: make Curl_is_absolute_url always use MAX_SCHEME_LEN
Instad of having all callers pass in the maximum length, always use
it. The passed in length is instead used only as the length of the
target buffer for to storing the scheme name in, if used.
Added the scheme max length restriction to the curl_url_set.3 man page.
Follow-up to 45bcb2eaa78c79
Closes #8047
- [Jay Satiro brought this change]
cmake: warn on use of the now deprecated symbols
Follow-up to 9108da2c26d
Closes #8052
- [Kevin Burke brought this change]
tests/CI.md: add more information on CI environments
Fixes #8012
Closes #8022
- cmake: private identifiers use CURL_ instead of CMAKE_ prefix
Since the 'CMAKE_' prefix is reserved for cmake's own private use.
Ref: https://cmake.org/cmake/help/latest/manual/cmake-variables.7.html
Reported-by: Boris Rasin
Fixes #7988
Closes #8044
- urlapi: reject short file URLs
file URLs that are 6 bytes or shorter are not complete. Return
CURLUE_MALFORMED_INPUT for those. Extended test 1560 to verify.
Triggered by #8041
Closes #8042
- curl: improve error message for --head with -J
... it now focuses on the "output of headers" combined with the
--remote-header-name option, as that is actually the problem. Both
--head and --include can output headers.
Reported-by: nimaje on github
Fixes #7987
Closes #8045
- RELEASE-NOTES: synced
- [Stefan Eissing brought this change]
urlapi: cleanup scheme parsing
Makea Curl_is_absolute_url() always leave a defined 'buf' and avoids
copying on urls that do not start with a scheme.
Closes #8043
- tool_operate: only set SSH related libcurl options for SSH URLs
For example, this avoids trying to find and set the known_hosts file (or
warn for its absence) if SFTP or SCP are not used.
Closes #8040
- [Jacob Hoffman-Andrews brought this change]
rustls: remove comment about checking handshaking
The comment is incorrect in two ways:
- It says the check needs to be last, but the check is actually first.
- is_handshaking actually starts out true.
Closes #8038
Marcel Raad (20 Nov 2021)
- openssl: use non-deprecated API to read key parameters
With OpenSSL 3.0, the parameters are read directly from the `EVP_PKEY`
using `EVP_PKEY_get_bn_param`.
Closes https://github.com/curl/curl/pull/7893
- openssl: reduce code duplication
`BN_print`'s `BIGNUM` parameter has been `const` since OpenSSL 0.9.4.
Closes https://github.com/curl/curl/pull/7893
- openssl: remove `RSA_METHOD_FLAG_NO_CHECK` handling if unavailable
The flag has been deprecated without replacement in OpenSSL 3.0.
Closes https://github.com/curl/curl/pull/7893
- openssl: remove usage of deprecated `SSL_get_peer_certificate`
The function name was changed to `SSL_get1_peer_certificate` in OpenSSL
3.0.
Closes https://github.com/curl/curl/pull/7893
Daniel Stenberg (19 Nov 2021)
- page-footer: fix typo
Closes #8036
- http: enable haproxy support for hyper backend
This is done by having native code do the haproxy header output before
hyper issues its request. The little downside with this approach is that
we need the entire Curl_buffer_send() function built, which is otherwise
not used for hyper builds.
If hyper ends up getting native support for the haproxy protocols we can
backpedal on this.
Enables test 1455 and 1456
Closes #8034
- [Bernhard Walle brought this change]
configure: fix runtime-lib detection on macOS
With a non-standard installation of openssl we get this error:
checking run-time libs availability... failed
configure: error: one or more libs available at link-time are not available run-time. Libs used at link-time: -lnghttp2 -lssl -lcrypto -lssl -lcrypto -lz
There's already code to set LD_LIBRARY_PATH on Linux, so set
DYLD_LIBRARY_PATH equivalent on macOS.
Closes #8028
- [Don J Olmstead brought this change]
cmake: don't set _USRDLL on a static Windows build
Closes #8030
- page-footer: document more environment variables
... that curl might use.
Closes #8027
- netrc.d: edit the .netrc example to look nicer
Works nicely thanks to d1828b470f43d
Closes #8025
- tftp: mark protocol as not possible to do over CONNECT
... and make connect_init() refusing trying to tunnel protocols marked
as not working. Avoids a double-free.
Reported-by: Even Rouault
Fixes #8018
Closes #8020
- docs/cmdline-opts: do not say "protocols: all"
Remove the lines saying "protocols: all". It makes the output in the
manpage look funny, and the expectation is probably by default that if
not anything is mentioned about protocols the option apply to them all.
Closes #8021
- curl.1: require "see also" for every documented option
gen.pl now generates a warning if the "See Also" field is not filled in for a
command line option
All command line options now provide one or more related options. 167
"See alsos" added!
Closes #8019
- insecure.d: expand and clarify
Closes #8017
- gen.pl: improve example output format
Treat consecutive lines that start with a space to be "examples". They
are output enclosed by .nf and .fi
Updated form.d to use this new fanciness
Closes #8016
- Revert "form-escape.d: double the back-slashes for proper man page output"
This reverts commit a2d8eac04a4eb1d5a98cf24b4e5cec5cec565d27.
silly me, it was intended to be one backslash!
- form-escape.d: double the back-slashes for proper man page output
- page-footer: add a mention of how to report bugs to the man page
- RELEASE-NOTES: synced
and bump to 7.81.0-DEV
- [Patrick Monnerat brought this change]
mime: use percent-escaping for multipart form field and file names
Until now, form field and file names where escaped using the
backslash-escaping algorithm defined for multipart mails. This commit
replaces this with the percent-escaping method for URLs.
As this may introduce incompatibilities with server-side applications, a
new libcurl option CURLOPT_MIME_OPTIONS with bitmask
CURLMIMEOPT_FORMESCAPE is introduced to revert to legacy use of
backslash-escaping. This is controlled by new cli tool option
--form-escape.
New tests and documentation are provided for this feature.
Reported by: Ryan Sleevi
Fixes #7789
Closes #7805
- [Kevin Burke brought this change]
zuul.d: update rustls-ffi to version 0.8.2
This version fixes errors with ALPN negotiation in rustls, which is
necessary for HTTP/2 support. For more information see the rustls-ffi
changelog.
Closes #8013
- configure: better diagnostics if hyper is built wrong
If hyper is indeed present in the specified directory but couldn't be
used to find the correct symbol, then offer a different error message to
better help the user understand the issue.
Suggested-by: Jacob Hoffman-Andrews
Fixes #8001
Closes #8005
- test1939: require proxy support to run
Follow-up to f0b7099a10d1a
Closes #8011
- test302[12]: run only with the libssh2 backend
... as the others don't support --hostpubsha256
Reported-by: Paul Howarth
Fixes #8009
Closes #8010
- runtests: make the SSH library a testable feature
libssh2, libssh and wolfssh
- [Jacob Hoffman-Andrews brought this change]
rustls: read of zero bytes might be okay
When we're reading out plaintext from rustls' internal buffers, we might
get a read of zero bytes (meaning a clean TCP close, including
close_notify). However, we shouldn't return immediately when that
happens, since we may have already copied out some plaintext bytes.
Break out of the loop when we get a read of zero bytes, and figure out
which path we're dealing with.
Acked-by: Kevin Burke
Closes #8003
- [Jacob Hoffman-Andrews brought this change]
rustls: remove incorrect EOF check
The update to rustls-ffi 0.8.0 changed handling of EOF and close_notify.
From the CHANGELOG:
> Handling of unclean close and the close_notify TLS alert. Mirroring
> upstream changes, a rustls_connection now tracks TCP closed state like
> so: rustls_connection_read_tls considers a 0-length read from its
> callback to mean "TCP stream was closed by peer." If that happens
> before the peer sent close_notify, rustls_connection_read will return
> RUSTLS_RESULT_UNEXPECTED_EOF once the available plaintext bytes are
> exhausted. This is useful to protect against truncation attacks. Note:
> some TLS implementations don't send close_notify. If you are already
> getting length information from your protocol (e.g. Content-Length in
> HTTP) you may choose to ignore UNEXPECTED_EOF so long as the number of
> plaintext bytes was as expected.
That means we don't need to check for unclean EOF in `cr_recv()`,
because `process_new_packets()` will give us an error if appropriate.
Closes #8003
- lib1939: make it endure torture tests
Follow-up to f0b7099a10d1a
Closes #8007
- azure: make the "w/o HTTP/SMTP/IMAP" build disable SSL proper
The configure line would previously depend on a configure mistake using
--without-openssl that is fixed and now this configure line needs
adjusting to use --without-ssl.
Follow-up to b589696f0312d
Closes #8006
- [Jacob Hoffman-Andrews brought this change]
configure: add -lm to configure for rustls build.
Note: The list of libraries that rustc tells us we need to include is
longer, but also includes some more platform-specific libraries that I
am not sure how to effectively incorporate. Adding just -lm seems to
solve an immediate problem, so I'm adding just that.
Closes #8002
- curl_share_setopt.3: refer to CURLSHOPT_USERDATA(3) properly
- curl_share_setopt.3: split out options into their own manpages
CURLSHOPT_LOCKFUNC.3
CURLSHOPT_SHARE.3
CURLSHOPT_UNLOCKFUNC.3
CURLSHOPT_UNSHARE.3
CURLSHOPT_USERDATA.3
Closes #7998
- http_proxy: make Curl_connect_done() work for proxy disabled builds
... by making it an empty macro then.
Follow-up to f0b7099a10d1a
Reported-by: Vincent Grande
Fixes #7995
Closes #7996
- Curl_connect_done: handle being called twice
Follow-up to f0b7099a10d1a7c
When torture testing 1021, it turns out the Curl_connect_done function
might be called twice and that previously then wrongly cleared the HTTP
pointer in the second invoke.
Closes #7999
- [Stan Hu brought this change]
configure: don't enable TLS when --without-* flags are used
Previously specifying `--without-gnutls` would unexpectedly attempt to
compile with GnuTLS, effectively interpreting this as
`--with-gnutls`. This caused a significant amount of confusion when
`libcurl` was built with SSL disabled since GnuTLS wasn't present.
68d89f24 dropped the `--without-*` options from the configure help, but
`AC_ARG_WITH` still defines these flags automatically. As
https://www.gnu.org/software/autoconf/manual/autoconf-2.60/html_node/External-Software.html
describes, the `action-if-given` is called when the user specifies
`--with-*` or `--without-*` options.
To prevent this confusion, we make the `--without` flag do the right
thing by ignoring the value if it set to "no".
Closes #7994
- [Rikard Falkeborn brought this change]
docs/checksrc: Add documentation for STRERROR
Closes #7991
- vtls/rustls: adapt to the updated rustls_version proto
Closes #7956
- [Kevin Burke brought this change]
vtls/rustls: handle RUSTLS_RESULT_PLAINTEXT_EMPTY
Previously we'd return CURLE_READ_ERROR if we received this, instead
of triggering the error handling logic that's present in the next if
block down.
After this change, curl requests to https://go.googlesource.com using
HTTP/2 complete successfully.
Fixes #7949
Closes #7948
- [Kevin Burke brought this change]
zuul: update build environment for rustls-ffi 0.8.0
- [Kevin Burke brought this change]
vtls/rustls: update to compile with rustls-ffi v0.8.0
Some method names, as well as the generated library name, were changed
in a recent refactoring.
Further, change the default configuration instructions to check for
Hyper in either "target/debug" or "target/release" - the latter
contains an optimized build configuration.
Fixes #7947
Closes #7948
- RELEASE-NOTES: synced
and bump the version to 7.80.1
- multi: shut down CONNECT in Curl_detach_connnection
... to prevent a lingering pointer that would lead to a double-free.
Added test 1939 to verify.
Reported-by: Stephen M. Coakley
Fixes #7982
Closes #7986
- curl_easy_cleanup.3: remove from multi handle first
Easy handles that are used by the multi interface should be removed from
the multi handle before they are cleaned up.
Reported-by: Stephen M. Coakley
Ref: #7982
Closes #7983
- url.c: fix the SIGPIPE comment for Curl_close
Closes #7984
Version 7.80.0 (10 Nov 2021)
Daniel Stenberg (10 Nov 2021)
- RELEASE-NOTES: synced
for curl 7.80.0
- THANKS: add contributors from the 7.80.0 cycle
- [Tatsuhiro Tsujikawa brought this change]
ngtcp2: advertise h3 as well as h3-29
Advertise h3 as well as h3-29 since some servers out there require h3
for QUIC v1.
Closes #7979
- [Tatsuhiro Tsujikawa brought this change]
ngtcp2: use QUIC v1 consistently
Since we switched to v1 quic_transport_parameters codepoint in #7960
with quictls, lets use QUIC v1 consistently.
Closes #7979
- [Tatsuhiro Tsujikawa brought this change]
ngtcp2: compile with the latest nghttp3
Closes #7978
Marc Hoersken (9 Nov 2021)
- tests: add Schannel-specific tests and disable unsupported ones
Adds Schannel variants of SSLpinning tests that include the option
--ssl-revoke-best-effort to ignore certificate revocation check
failures which is required due to our custom test CA certificate.
Disable the original variants if the Schannel backend is enabled.
Also skip all IDN tests which are broken while using an msys shell.
This is a step to simplify test exclusions for Windows and MinGW.
Reviewed-by: Jay Satiro
Reviewed-by: Marcel Raad
Reviewed-by: Daniel Stenberg
Closes #7968
Daniel Stenberg (8 Nov 2021)
- docs: NAME fixes in easy option man pages
Closes #7975
- [Roger Young brought this change]
ftp: make the MKD retry to retry once per directory
Reported-by: Roger Young
Fixes #7967
Closes #7976
- tool_operate: reorder code to avoid compiler warning
tool_operate.c(889) : warning C4701: potentially uninitialized local
variable 'per' use
Follow-up to cc71d352651a0d95
Reported-by: Marc Hörsken
Bug: https://github.com/curl/curl/pull/7922#issuecomment-963042676
Closes #7971
- curl_easy_perform.3: add a para about recv and send data
Reported-by: Godwin Stewart
Fixes #7973
Closes #7974
- tool_operate: fclose stream only if fopened
Fixes torture test failures
Follow-up to cc71d352651
Closes #7972
- libcurl-easy.3: language polish
- limit-rate.d: this is average over several seconds
Closes #7970
- docs: reduce/avoid English contractions
You're => You are
Hasn't => Has not
Doesn't => Does not
Don't => Do not
You'll => You will
etc
Closes #7930
- tool_operate: fix torture leaks with etags
Spotted by torture testing 343 344 345 347.
Follow-up from cc71d352651a0
Pointed-out-by: Dan Fandrich
Closes #7969
- [Amaury Denoyelle brought this change]
ngtcp2: support latest QUIC TLS RFC9001
QUIC Transport Parameters Extension has been changed between draft-29
and latest RFC9001. Most notably, its identifier has been updated from
0xffa5 to 0x0039. The version is selected through the QUIC TLS library
via the legacy codepoint.
Disable the usage of legacy codepoint in curl to switch to latest
RFC9001. This is required to be able to keep up with latest QUIC
implementations.
Acked-by: Tatsuhiro Tsujikawa
Closes #7960
- test1173: make manpage-syntax.pl spot \n errors in examples
- man pages: fix backslash-n in examples
... to be proper backslash-backslash-n sequences to render nicely in man
and on website.
Follow-up to 24155569d8a
Reported-by: Sergey Markelov
Fixes https://github.com/curl/curl-www/issues/163
Closes #7962
- scripts/release-notes.pl: use out of repo links verbatim in refs
- tool_operate: a failed etag save now only fails that transfer
When failing to create the output file for saving an etag, only fail
that particular single transfer and allow others to follow.
In a serial transfer setup, if no transfer at all is done due to them
all being skipped because of this error, curl will output an error
message and return exit code 26.
Added test 369 and 370 to verify.
Reported-by: Earnestly on github
Ref: #7942
Closes #7945
- [Kevin Burke brought this change]
.github: retry macos "brew install" command on failure
Previously we saw errors attempting to run "brew install", see
https://github.com/curl/curl/runs/4095721123?check_suite_focus=true for
an example, since this command is idempotent, it is safe to run again.
Closes #7955
- CURLOPT_ALTSVC_CTRL.3: mention conn reuse is preferred
Ref: https://github.com/curl/curl/discussions/7954
Closes #7957
- RELEASE-NOTES: synced
- zuul: pin the quiche build to use an older cmake-rs
The latest cmake-rs assumes cmake's --parallel works. That was added in
cmake 3.12, but a lot of our CI builds run on Ubuntu Bionic which only
has cmake 3.10.
Fixes #7927
Closes #7952
- [Marc Hoersken brought this change]
Revert "src/tool_filetime: disable -Wformat on mingw for this file"
This reverts commit 7c88fe375b15c44d77bccc9ab733b8069d228e6f.
Follow up to #6535 as the pragma is obsolete with warnf
Closes #7941
Jay Satiro (2 Nov 2021)
- schannel: fix memory leak due to failed SSL connection
- Call schannel_shutdown if the SSL connection fails.
Prior to this change schannel_shutdown (which shuts down the SSL
connection as well as memory cleanup) was not called when the SSL
connection failed (eg due to failed handshake).
Co-authored-by: Gisle Vanem
Fixes https://github.com/curl/curl/issues/7877
Closes https://github.com/curl/curl/pull/7878
Daniel Stenberg (2 Nov 2021)
- Curl_updateconninfo: store addresses for QUIC connections too
So that CURLINFO_PRIMARY_IP etc work for HTTP/3 like for other HTTP
versions.
Reported-by: Jerome Mao
Fixes #7939
Closes #7944
- [Sergio Durigan Junior brought this change]
curl.1: fix typos in the manpage
s/transfering/transferring/
s/transfered/transferred/
Signed-off-by: Sergio Durigan Junior <sergiodj@sergiodj.net>
Closes #7937
Marc Hoersken (1 Nov 2021)
- tests/smbserver.py: fix compatibility with impacket 0.9.23+
impacket now performs sanity checks if the requested and to
be served file path actually is inside the real share path.
Ref: https://github.com/SecureAuthCorp/impacket/pull/1066
Fixes #7924
Closes #7935
Daniel Stenberg (1 Nov 2021)
- docs: reduce use of "very"
"Very" should be avoided in most texts. If intensifiers are needed, try
find better words instead.
Closes #7936
- [Tatsuhiro Tsujikawa brought this change]
ngtcp2: specify the missing required callback functions
Closes #7929
- CURLOPT_[PROXY]_SSL_CIPHER_LIST.3: bold instead of quote
Bold the example ciphers instead of using single quotes, which then also
avoids the problem of how to use single quotes when first in a line.
Also rephrased the pages a little.
Reported-by: Sergio Durigan Junior
Ref: #7928
Closes #7934
- gen.pl: replace leading single quotes with \(aq
... and allow single quotes to be used "normally" in the .d files.
Makes the output curl.1 use better nroff.
Reported-by: Sergio Durigan Junior
Ref: #7928
Closes #7933
Marc Hoersken (1 Nov 2021)
- tests: kill some test servers afterwards to avoid locked logfiles
Reviewed-by: Daniel Stenberg
Closes #7925
Daniel Stenberg (1 Nov 2021)
- smooth-gtk-thread.c: enhance the mutex lock use
Reported-by: ryancaicse on github
Fixes #7926
Closes #7931
Marc Hoersken (31 Oct 2021)
- CI/runtests.pl: restore -u flag, but remove it from CI runs
This makes it possible to use -u again for local testing,
but removes the flag from CI config files and make targets.
Reviewed-by: Daniel Stenberg
Partially reverts #7841
Closes #7921
Daniel Stenberg (29 Oct 2021)
- [Jonathan Cardoso Machado brought this change]
CURLOPT_HSTSWRITEFUNCTION.3: using CURLOPT_HSTS_CTRL is required
Closes #7923
- [Axel Morawietz brought this change]
imap: display quota information
Show response to "GETQUOTAROOT INBOX" command.
Closes #6973
- RELEASE-NOTES: synced
- [Boris Rasin brought this change]
cmake: fix error getting LOCATION property on non-imported target
Closes #7885
- [Xiaoke Wang brought this change]
url: check the return value of curl_url()
Closes #7917
- [Roy Li brought this change]
configure.ac: replace krb5-config with pkg-config
The rationale is that custom *-config tools don't work well when
cross-compiling or using sysroots (such as when using Yocto project) and
require custom fixing for each of them; pkg-config on the other hand
works similarly everywhere.
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Closes #7916
- test1160: edited to work with hyper
Closes #7912
- data/DISABLED: enable tests that now work with hyper
Closes #7911
- test559: add 'HTTP' in keywords
Makes it run fine with hyper
Closes #7911
- test552: updated to work with hyper
Closes #7911
Marc Hoersken (27 Oct 2021)
- github: fix incomplete permission to label PRs for Hacktoberfest
Unfortunately the GitHub API requires a token with write permission
for both issues and pull-requests to edit labels on even just PRs.
Follow up to #7897
Daniel Stenberg (27 Oct 2021)
- opt-manpages: use 'Added in' instead of 'Since'
Closes #7913
Marc Hoersken (27 Oct 2021)
- github: fix missing permission to label PRs for Hacktoberfest
Follow up to #7897
Test references to see if permissions are now sufficient:
Closes #7832
Closes #7897
- CI: more use of test-ci make target and verbose output
Replace test-nonflaky with test-ci and enable verbose output
in all remaining CIs except Zuul which is customized a lot.
Reviewed-by: Daniel Stenberg
Reviewed-by: Jay Satiro
Follow up to #7785
Closes #7832
- github: add support for Hacktoberfest using labels
Automatically add hacktoberfest-accepted label to PRs opened between
September 30th and November 1st once a commit with a close reference
to it is pushed onto the master branch.
With this workflow we can participate in Hacktoberfest while not
relying on GitHub to identify PRs as merged due to our rebasing.
Requires hacktoberfest-accepted labels to exist for PRs on the
participating repository. Also requires hacktoberfest topic on
the participating repository to avoid applying to forked repos.
Reviewed-by: Daniel Stenberg
Fixes #7865
Closes #7897
Daniel Stenberg (27 Oct 2021)
- http: reject HTTP response codes < 100
... which then also includes negative ones as test 1430 uses.
This makes native + hyper backend act identically on this and therefore
test 1430 can now be enabled when building with hyper. Adjust test 1431
as well.
Closes #7909
- [Kerem Kat brought this change]
docs: fix typo in CURLOPT_TRAILERFUNCTION example
Closes #7910
- docs/HYPER: remove some remaining issues, add HTTP/0.9 limitation
- configure: when hyper is selected, deselect nghttp2
Closes #7908
- [Patrick Monnerat brought this change]
sendf: accept zero-length data in Curl_client_write()
Historically, Curl_client_write() used a length value of 0 as a marker
for a null-terminated data string. This feature has been removed in
commit f4b85d2. To detect leftover uses of the feature, a DEBUGASSERT
statement rejecting a length with value 0 was introduced, effectively
precluding use of this function with zero-length data.
The current commit removes the DEBUGASSERT and makes the function to
return immediately if length is 0.
A direct effect is to fix trying to output a zero-length distinguished
name in openldap.
Another DEBUGASSERT statement is also rephrased for better readability.
Closes #7898
- hyper: disable test 1294 since hyper doesn't allow such crazy headers
Closes #7905
- c-hyper: make CURLOPT_SUPPRESS_CONNECT_HEADERS work
Verified by the enabled test 1288
Closes #7905
- test1287: make work on hyper
Closes #7905
- test1266/1267: disabled on hyper: no HTTP/0.9 support
Closes #7905
Viktor Szakats (25 Oct 2021)
- Makefile.m32: fix to not require OpenSSL with -libssh2 or -rtmp options
Previously, -libssh2/-rtmp options assumed that OpenSSL is also enabled
(and then failed with an error when not finding expected OpenSSL headers),
but this isn't necessarly true, e.g. when building both libssh2 and curl
against Schannel. This patch makes sure to only enable the OpenSSL backend
with -libssh2/-rtmp, when there was no SSL option explicitly selected.
- Re-implement the logic as a single block of script.
- Also fix an indentation while there.
Assisted-by: Jay Satiro
Closes #7895
Daniel Stenberg (25 Oct 2021)
- docs: consistent use of "Added in"
Make them all say "Added in [version]" without using 'curl' or 'libcurl'
in that phrase.
- man pages: require all to use the same section header order
This is the same order we already enforce among the options' man pages:
consistency is good. Add lots of previously missing examples.
Adjust the manpage-syntax script for this purpose, used in test 1173.
Closes #7904
- [David Hu brought this change]
docs/HTTP3: improve build instructions
1. If writing to a system path if the command is not prefixed with
`sudo` it will cause a permission denied error
2. The patched OpenSSL branch has been updated to `openssl-3.0.0+quic`
to match upstream OpenSSL version.
3. We should not disable GnuTLS docs.
Updated some commands about `make install`
Closes #7842
- [Ricardo Martins brought this change]
CMake: restore support for SecureTransport on iOS
Restore support for building curl for iOS with SecureTransport enabled.
Closes #7501
- tests: enable more tests with hyper
Adjusted 1144, 1164 and 1176.
Closes #7900
- docs: provide "RETURN VALUE" section for more func manpages
Three were missing, one used a non-standard name for the header.
Closes #7902
Jay Satiro (25 Oct 2021)
- curl_multi_socket_action.3: add a "RETURN VALUE" section
.. because it may not be immediately clear to the user what
curl_multi_socket_action returns.
Ref: https://curl.se/mail/lib-2021-10/0035.html
Closes https://github.com/curl/curl/pull/7901
Daniel Stenberg (24 Oct 2021)
- RELEASE-NOTES: synced
- [Samuel Henrique brought this change]
tests: use python3 in test 1451
This is a continuation of commit ec91b5a69000bea0794bbb3 in which
changing this test was missed. There are no other python2 leftovers
now.
Based on a Debian patch originally written by Alessandro Ghedini
<ghedo@debian.org>
Closes #7899
- [Eddie Lumpkin brought this change]
lib: fixing comment spelling typos in lib files
Closes #7894
Signed-off-by: ewlumpkin <ewlumpkin@gmail.com>
- openssl: if verifypeer is not requested, skip the CA loading
It was previously done mostly to show a match/non-match in the verbose
output even when verification was not asked for. This change skips the
loading of the CA certs unless verifypeer is set to save memory and CPU.
Closes #7892
- curl-confopts.m4: remove --enable/disable-hidden-symbols
These configure options have been saying "deprecated" since 9e24b9c7af
(April 2012). It was about time we remove them.
Closes #7891
- c-hyper: don't abort CONNECT responses early when auth-in-progress
... and make sure to stop ignoring the body once the CONNECT is done.
This should make test 206 work proper again and not be flaky.
Closes #7889
- hyper: does not support disabling CURLOPT_HTTP_TRANSFER_DECODING
Simply because hyper doesn't have this ability. Mentioned in docs now.
Skip test 326 then
Closes #7889
- test262: don't attempt with hyper
This test verifies that curl works with binary zeroes in HTTP response
headers and hyper refuses such. They're not kosher http.
Closes #7889
- c-hyper: make test 217 run
Closes #7889
- DISABLED: enable test 209+213 for hyper
Follow-up to 823d3ab855c
Closes #7889
- test207: accept a different error code for hyper
It returns HYPERE_UNEXPECTED_EOF for this case which we convert to the
somewhat generic CURLE_RECV_ERROR.
Closes #7889
- [Érico Nogueira brought this change]
INSTALL: update symbol hiding option
--enable-hidden-symbols was deprecated in
9e24b9c7afbcb81120af4cf3f6cdee49a06d8224.
Closes #7890
- http_proxy: multiple CONNECT with hyper done better
Enabled test 206
Closes #7888
- hyper: pass the CONNECT line to the debug callback
Closes #7887
- mailmap: Malik Idrees Hasan Khan
Jay Satiro (21 Oct 2021)
- [Malik Idrees Hasan Khan brought this change]
build: fix typos
Closes https://github.com/curl/curl/pull/7886
- URL-SYNTAX: add IMAP UID SEARCH example
- Explain the difference between IMAP search via URL (which returns
message sequence numbers) and IMAP search via custom request (which
can return UID numbers if prefixed with UID, eg "UID SEARCH ...").
Bug: https://github.com/curl/curl/issues/7626
Reported-by: orycho@users.noreply.github.com
Ref: https://github.com/curl/curl/issues/2789
Closes https://github.com/curl/curl/pull/7881
Daniel Stenberg (20 Oct 2021)
- manpage: adjust the asterisk in some SYNOPSIS sections
Closes #7884
- curl_multi_perform.3: polish wording
- simplify the example by using curl_multi_poll
- mention curl_multi_add_handle in the text
- cut out the description of pre-7.20.0 return code behavior - that version
is now more than eleven years old and is basically no longer out there
- adjust the "typical usage" to mention curl_multi_poll
Closes #7883
- docs/THANKS: removed on request
- FAQ: polish the explanation of libcurl
- curl_easy_perform.3: minor wording tweak
- [Erik Stenlund brought this change]
mime: mention CURL_DISABLE_MIME in comment
CURL_DISABLE_MIME is not mentioned in the comment describing the if else
preprocessor directive.
Closes #7882
- tls: remove newline from three infof() calls
Follow-up to e7416cf
Reported-by: billionai on github
Fixes #7879
Closes #7880
- RELEASE-NOTES: synced
- curl_gssapi: fix build warnings by removing const
Follow-up to 20e980f85b0ea6
In #7875 these inits were modified but I get two warnings that these new
typecasts are necessary for.
Closes #7876
- [Bo Anderson brought this change]
curl_gssapi: fix link error on macOS Monterey
Fixes #7657
Closes #7875
- test1185: verify checksrc
Closes #7866
- checksrc: improve the SPACESEMICOLON error message
and adjust the MULTISPACE one to use plural
Closes #7866
- url: set "k->size" -1 at start of request
The size of the transfer is unknown at that point.
Fixes #7871
Closes #7872
Daniel Gustafsson (18 Oct 2021)
- doh: remove experimental code for DoH with GET
The code for sending DoH requests with GET was never enabled in a way
such that it could be used or tested. As there haven't been requests
for this feature, and since it at this is effectively dead, remove it
and favor reimplementing the feature in case anyone is interested.
Closes #7870
Reviewed-by: Daniel Stenberg <daniel@haxx.se>
Daniel Stenberg (18 Oct 2021)
- cirrus: remove FreeBSD 11.4 from the matrix
It has reached End-Of-Life and causes some LDAP CI issues.
Closes #7869
- cirrus: switch to openldap24-client
... as it seems openldap-client doesn't exist anymore.
Reported-by: Jay Satiro
Fixes #7868
Closes #7869
- checksrc: ignore preprocessor lines
In order to check the actual code better, checksrc now ignores
everything that look like preprocessor instructions. It also means
that code in macros are now longer checked.
Note that some rules then still don't need to be followed when code is
exactly below a cpp instruction.
Removes two checksrc exceptions we needed previously because of
preprocessor lines being checked.
Reported-by: Marcel Raad
Fixes #7863
Closes #7864
- urlapi: skip a strlen(), pass in zero
... to let curl_easy_escape() itself do the strlen. This avoids a (false
positive) Coverity warning and it avoids us having to store the strlen()
return value in an int variable.
Reviewed-by: Daniel Gustafsson
Closes #7862
- misc: update copyright years
- examples/htmltidy: correct wrong printf() use
... and update the includes to match how current htmltidy wants them
used.
Reported-by: Stathis Kapnidis
Fixes #7860
Closes #7861
Jay Satiro (15 Oct 2021)
- http: set content length earlier
- Make content length (ie download size) accessible to the user in the
header callback, but only after all headers have been processed (ie
only in the final call to the header callback).
Background:
For a long time the content length could be retrieved in the header
callback via CURLINFO_CONTENT_LENGTH_DOWNLOAD_T as soon as it was parsed
by curl.
Changes were made in 8a16e54 (precedes 7.79.0) to ignore content length
if any transfer encoding is used. A side effect of that was that
content length was not set by libcurl until after the header callback
was called the final time, because until all headers are processed it
cannot be determined if content length is valid.
This change keeps the same intention --all headers must be processed--
but now the content length is available before the final call to the
header function that indicates all headers have been processed (ie
a blank header).
Bug: https://github.com/curl/curl/commit/8a16e54#r57374914
Reported-by: sergio-nsk@users.noreply.github.com
Co-authored-by: Daniel Stenberg
Fixes https://github.com/curl/curl/issues/7804
Closes https://github.com/curl/curl/pull/7803
Daniel Stenberg (15 Oct 2021)
- [Abhinav Singh brought this change]
aws-sigv4: make signature work when post data is binary
User sets the post fields size for binary data. Hence, we should not be
using strlen on it.
Added test 1937 and 1938 to verify.
Closes #7844
- [a1346054 brought this change]
MacOSX-Framework: remove redundant ';'
Closes #7859
- RELEASE-NOTES: synced
- openssl: with OpenSSL 1.1.0+ a failed RAND_status means goaway
One reason we know it can fail is if a provider is used that doesn't do
a proper job or is wrongly configured.
Reported-by: Michael Baentsch
Fixes #7840
Closes #7856
Marcel Raad (14 Oct 2021)
- [Ryan Mast brought this change]
cmake: add CURL_ENABLE_SSL option and make CMAKE_USE_* SSL backend options depend on it
Closes https://github.com/curl/curl/pull/7822
Daniel Stenberg (14 Oct 2021)
- http: remove assert that breaks hyper
Reported-by: Jay Satiro
Fixes #7852
Closes #7855
- http_proxy: fix one more result assign for hyper
and remove the bad assert again, since it was run even with no error!
Closes #7854
Jay Satiro (14 Oct 2021)
- sws: fix memory leak on exit
- Free the allocated http request struct on cleanup.
Prior to this change if sws was built with leak sanitizer it would
report a memory leak error during testing.
Closes https://github.com/curl/curl/pull/7849
Daniel Stenberg (14 Oct 2021)
- c-hyper: make Curl_http propagate errors better
Pass on better return codes when errors occur within Curl_http instead
of insisting that CURLE_OUT_OF_MEMORY is the only possible one.
Pointed-out-by: Jay Satiro
Closes #7851
- http_proxy: make hyper CONNECT() return the correct error code
For every 'goto error', make sure the result variable holds the error
code for what went wrong.
Reported-by: Rafał Mikrut
Fixes #7825
Closes #7846
- docs/Makefile.am: repair 'make html'
by removing index.html which isn't around anymore
Closes #7853
- [Борис Верховский brought this change]
curl: correct grammar in generated libcurl code
Closes #7802
- tests: disable test 2043
It uses revoked.badssl.com which now is expired and therefor this now
permafails. We should not use external sites for tests, this test should
be converted to use our own infra.
Closes #7845
- runtests: split out ignored tests
Report ignore tests separately from the actual fails.
Don't exit non-zero if test servers couldn't get killed.
Assisted-by: Jay Satiro
Fixes #7818
Closes #7841
- http2: make getsock not wait for write if there's no remote window
While uploading, check for remote window availability in the getsock
function so that we don't wait for a writable socket if no data can be
sent.
Reported-by: Steini2000 on github
Fixes #7821
Closes #7839
- test368: verify dash is appended for "-r [num]"
Follow-up to 8758a26f8878
- [Борис Верховский brought this change]
curl: actually append "-" to --range without number only
Closes #7837
- RELEASE-NOTES: synced
- urlapi: URL decode percent-encoded host names
The host name is stored decoded and can be encoded when used to extract
the full URL. By default when extracting the URL, the host name will not
be URL encoded to work as similar as possible as before. When not URL
encoding the host name, the '%' character will however still be encoded.
Getting the URL with the CURLU_URLENCODE flag set will percent encode
the host name part.
As a bonus, setting the host name part with curl_url_set() no longer
accepts a name that contains space, CR or LF.
Test 1560 has been extended to verify percent encodings.
Reported-by: Noam Moshe
Reported-by: Sharon Brizinov
Reported-by: Raul Onitza-Klugman
Reported-by: Kirill Efimov
Fixes #7830
Closes #7834
Marc Hoersken (8 Oct 2021)
- CI/makefiles: introduce dedicated test target
Make it easy to use the same set of test flags
throughout all current and future CI builds.
Reviewed-by: Jay Satiro
Follow up to #7690
Closes #7785
Daniel Stenberg (8 Oct 2021)
- maketgz: redirect updatemanpages.pl output to /dev/null
- CURLOPT_HTTPHEADER.3: add descripion for specific headers
Settting Host: or Transfer-Encoding: chunked actually have special
meanings to libcurl. This change tries to document them
Closes #7829
- c-hyper: use hyper_request_set_uri_parts to make h2 better
and make sure to not send Host: over h2.
Fixes #7679
Reported-by: David Cook
Closes #7827
- [Michael Afanasiev brought this change]
curl-openssl.m4: modify library order for openssl linking
lcrypto may depend on lz, and configure corrently fails with when
statically linking as the order is "-lz -lcrypto". This commit switches
the order to "-lcrypto -lz".
Closes #7826
Marcel Raad (7 Oct 2021)
- sha256: use high-level EVP interface for OpenSSL
Available since OpenSSL 0.9.7. The low-level SHA256 interface is
deprecated in OpenSSL v3, and its usage was discouraged even before.
Closes https://github.com/curl/curl/pull/7808
- curl_ntlm_core: use OpenSSL only if DES is available
This selects another SSL backend then if available, or otherwise at
least gives a meaningful error message.
Closes https://github.com/curl/curl/pull/7808
- md5: fix compilation with OpenSSL 3.0 API
Only use OpenSSL's MD5 code if it's available.
Also fix wolfSSL build with `NO_MD5`, in which case neither the
wolfSSL/OpenSSL implementation nor the fallback implementation was
used.
Closes https://github.com/curl/curl/pull/7808
Daniel Stenberg (7 Oct 2021)
- print_category: printf %*s needs an int argument
... not a size_t!
Detected by Coverity: CID 1492331.
Closes #7823
Jay Satiro (7 Oct 2021)
- version_win32: use actual version instead of manifested version
- Use RtlVerifyVersionInfo instead of VerifyVersionInfo, when possible.
Later versions of Windows have normal version functions that compare and
return versions based on the way the application is manifested, instead
of the actual version of Windows the application is running on. We
prefer the actual version of Windows so we'll now call the Rtl variant
of version functions (RtlVerifyVersionInfo) which does a proper
comparison of the actual version.
Reported-by: Wyatt O'Day
Ref: https://github.com/curl/curl/pull/7727
Fixes https://github.com/curl/curl/issues/7742
Closes https://github.com/curl/curl/pull/7810
Daniel Stenberg (6 Oct 2021)
- RELEASE-NOTES: synced
- http: fix Basic auth with empty name field in URL
Add test 367 to verify.
Reported-by: Rick Lane
Fixes #7819
Closes #7820
- [Jeffrey Tolar brought this change]
CURLOPT_MAXLIFETIME_CONN: maximum allowed lifetime for conn reuse
... and close connections that are too old instead of reusing them.
By default, this behavior is disabled.
Bug: https://curl.se/mail/lib-2021-09/0058.html
Closes #7751
Daniel Gustafsson (6 Oct 2021)
- docs/examples: add missing binaries to gitignore
Commit f65d7889b added getreferrer, and commit ae8e11ed5 multi-legacy,
both of which missed adding .gitignore clauses for the built binaries.
Closes #7817
Reviewed-by: Daniel Stenberg <daniel@haxx.se>
Daniel Stenberg (5 Oct 2021)
- [Josip Medved brought this change]
HTTP3: fix the HTTP/3 Explained book link
Closes #7813
- [Lucas Holt brought this change]
misc: fix a few issues on MidnightBSD
Closes #7812
Daniel Gustafsson (4 Oct 2021)
- [8U61ife brought this change]
tool_main: fix typo in comment
Closes: #7811
Reviewed-by: Daniel Gustafsson <daniel@yesql.se>
Daniel Stenberg (4 Oct 2021)
- [Ryan Mast brought this change]
BINDINGS: URL updates
For cpr, BBHTTP, Eiffel, Harbour, Haskell, Mono, and Rust
Closes #7809
- scripts/delta: hide a git error message we don't care about
fatal: path 'src/tool_listhelp.c' exists on disk, but not in [tag]
- [Patrick Monnerat brought this change]
sasl: binary messages
Capabilities of sasl module are extended to exchange messages in binary
as an alternative to base64.
If http authentication flags have been set, those are used as sasl
default preferred mechanisms.
Closes #6930
- [Hayden Roche brought this change]
wolfssl: use for SHA256, MD4, MD5, and setting DES odd parity
Prior to this commit, OpenSSL could be used for all these functions, but
not wolfSSL. This commit makes it so wolfSSL will be used if USE_WOLFSSL
is defined.
Closes #7806
- scripts/delta: count command line options in the new file
... which makes the shown delta number wrong until next release.
- RELEASE-NOTES: synced
- print_category: print help descriptions aligned
Adjust the description position to make an aligned column when doing
help listings, which is more pleasing to the eye.
Suggested-by: Gisle Vanem
Closes #7792
- lib/mk-ca-bundle.pl: skip certs passed Not Valid After date
With this change applied, the now expired 'DST Root CA X3' cert will no
longer be included in the output.
Details: https://letsencrypt.org/docs/dst-root-ca-x3-expiration-september-2021/
Closes #7801
- tool_listhelp: easier to generate with gen.pl
tool_listhelp.c is now a separate file with only the command line --help
output, exactly as generated by gen.pl. This makes it easier to generate
updates according to what's in the docs/cmdline-opts docs.
cd $srcroot/docs/cmdline-opts
./gen.pl listhelp *.d > $srcroot/src/tool_listhelp.c
With a configure build, this also works:
make -C src listhelp
Closes #7787
- [Anthony Hu brought this change]
wolfssl: allow setting of groups/curves
In particular, the quantum safe KEM and hybrid curves if wolfSSL is
built to support them.
Closes #7728
- [Jan Mazur brought this change]
connnect: use sysaddr_un fron sys/un.h or custom-defined for windows
Closes #7737
Jay Satiro (30 Sep 2021)
- [Rikard Falkeborn brought this change]
hostip: Move allocation to clarify there is no memleak
By just glancing at the code, it looks like there is a memleak if the
call to Curl_inet_pton() fails. Looking closer, it is clear that the
call to Curl_inet_pton() can not fail, so the code will never leak
memory. However, we can make this obvious by moving the allocation
after the if-statement.
Closes https://github.com/curl/curl/pull/7796
Daniel Stenberg (30 Sep 2021)
- gen.pl: make the output date format work better
Follow-up to 15910dfd143dd
The previous strftime format used didn't work correctly on Windows, so
change to %B %d %Y which today looks like "September 29 2021".
Reported-by: Gisle Vanem
Bug: #7782
Closes #7793
- typecheck-gcc.h: add CURLOPT_PREREQDATA awareness
Follow-up to a517378de58358a
To make test 1912 happy again
Closes #7799
Marcel Raad (29 Sep 2021)
- configure: remove `HAVE_WINSOCK_H` definition
It's not used anymore.
Closes https://github.com/curl/curl/pull/7795
- CMake: remove `HAVE_WINSOCK_H` definition
It's not used anymore.
Closes https://github.com/curl/curl/pull/7795
- config: remove `HAVE_WINSOCK_H` definition
It's not used anymore.
Closes https://github.com/curl/curl/pull/7795
- lib: remove `HAVE_WINSOCK_H` usage
WinSock v1 is not supported anymore. Exclusively use `HAVE_WINSOCK2_H`
instead.
Closes https://github.com/curl/curl/pull/7795
Daniel Stenberg (29 Sep 2021)
- easyoptions: add the two new PRE* options
Follow-up to a517378de58358a
Also fix optiontable.pl to do the correct remainder on the entry.
Reported-by: Gisle Vanem
Bug: https://github.com/curl/curl/commit/a517378de58358a85b7cfe9efecb56051268f629#commitcomment-57224830
Closes #7791
- Revert "build: remove checks for WinSock 1"
Due to CI issues
This reverts commit c2ea04f92b00b6271627cb218647527b5a50f2fc.
Closes #7790
Daniel Gustafsson (29 Sep 2021)
- lib: avoid fallthrough cases in switch statements
Commit b5a434f7f0ee4d64857f8592eced5b9007d83620 inhibits the warning
on implicit fallthrough cases, since the current coding of indicating
fallthrough with comments is falling out of fashion with new compilers.
This attempts to make the issue smaller by rewriting fallthroughs to no
longer fallthrough, via either breaking the cases or turning switch
statements into if statements.
lib/content_encoding.c: the fallthrough codepath is simply copied
into the case as it's a single line.
lib/http_ntlm.c: the fallthrough case skips a state in the state-
machine and fast-forwards to NTLMSTATE_LAST. Do this before the
switch statement instead to set up the states that we actually
want.
lib/http_proxy.c: the fallthrough is just falling into exiting the
switch statement which can be done easily enough in the case.
lib/mime.c: switch statement rewritten as if statement.
lib/pop3.c: the fallthrough case skips to the next state in the
statemachine, do this explicitly instead.
lib/urlapi.c: switch statement rewritten as if statement.
lib/vssh/wolfssh.c: the fallthrough cases fast-forwards the state
machine, do this by running another iteration of the switch
statement instead.
lib/vtls/gtls.c: switch statement rewritten as if statement.
lib/vtls/nss.c: the fallthrough codepath is simply copied into the
case as it's a single line. Also twiddle a comment to not be
inside a non-brace if statement.
Closes: #7322
See-also: #7295
Reviewed-by: Daniel Stenberg <daniel@haxx.se>
Marcel Raad (28 Sep 2021)
- config-win32ce: enable WinSock 2
WinSock 2.2 is supported by Windows CE .NET 4.1 (from 2002, out of
support since 2013).
Ref: https://docs.microsoft.com/en-us/previous-versions/windows/embedded/ms899586(v=msdn.10)
Closes https://github.com/curl/curl/pull/7778
- externalsocket: use WinSock 2.2
That's the only version we support.
Closes https://github.com/curl/curl/pull/7778
- build: remove checks for WinSock 1
It's not supported anymore.
Closes https://github.com/curl/curl/pull/7778
Daniel Stenberg (28 Sep 2021)
- scripts/copyright: .muse is .lift now
And update 5 files with old copyright year range
- cmdline-opts: made the 'Added:' field mandatory
Since "too old" versions are no longer included in the generated man
page, this field is now mandatory so that it won't be forgotten and then
not included in the documentation.
Closes #7786
- curl.1: remove mentions of really old version changes
To make the man page more readable, this change removes all references
to changes in support/versions etc that happened before 7.30.0 from the
curl.1 output file. 7.30.0 was released on Apr 12 2013. This particular
limit is a bit arbitrary but was fairly easy to grep for.
It is handled like this: the 'Added' keyword is only used in output if
it refers to 7.30.0 or later. All occurances of "(Added in $VERSION)" in
description will be stripped out if the mentioned $VERSION is from
before 7.30.0. It is therefore important that the "Added in..."
references are always written exactly like that - and on a single line,
not split over two.
This change removes about 80 version number references from curl.1, down
to 138 from 218.
Closes #7786
- RELEASE-NOTES: synced
- tool_cb_prg: make resumed upload progress bar show better
This is a regression that was *probably* injected in the larger progress
bar overhaul in 2018.
Reported-by: beslick5 on github
Fixes #7760
Closes #7777
- gen.pl: insert the current date and version in generated man page
Reported-by: Gisle Vanem
Ref: #7780
Closes #7782
- NTLM: use DES_set_key_unchecked with OpenSSL
... as the previously used function DES_set_key() will in some cases
reject using a key that it deems "weak" which will cause curl to
continue using the unitialized buffer content as key instead.
Assisted-by: Harry Sintonen
Fixes #7779
Closes #7781
Marc Hoersken (27 Sep 2021)
- CI: align make and test flags in various config files
1. Use Makefile target to run tests in autotools builds on AppVeyor.
2. Disable testing of SCP protocol on native Windows environments.
3. Remove redundant parameters -a -p from target test-nonflaky.
4. Don't use -vc parameter which is reserved for debugging.
Replaces #7591
Closes #7690
Daniel Stenberg (27 Sep 2021)
- mailmap: unify Max!
- [Max Dymond brought this change]
CURLOPT_PREREQFUNCTION: add new callback
Triggered before a request is made but after a connection is set up
Changes:
- callback: Update docs and callback for pre-request callback
- Add documentation for CURLOPT_PREREQDATA and CURLOPT_PREREQFUNCTION,
- Add redirect test and callback failure test
- Note that the function may be called multiple times on a redirection
- Disable new 2086 test due to Windows weirdness
Closes #7477
- KNOWN_BUGS: HTTP/2 connections through HTTPS proxy frequently stall
Closes #6936
- TODO: make configure use --cache-file more and better
Closes #7753
- [Sergey Markelov brought this change]
urlapi: support UNC paths in file: URLs on Windows
- file://host.name/path/file.txt is a valid UNC path
\\host.name\path\files.txt to a non-local file transformed into URI
(RFC 8089 Appendix E.3)
- UNC paths on other OSs must be smb: URLs
Closes #7366
- [Gleb Ivanovsky brought this change]
urlapi: add curl_url_strerror()
Add curl_url_strerror() to convert CURLUcode into readable string and
facilitate easier troubleshooting in programs using URL API.
Extend CURLUcode with CURLU_LAST for iteration in unit tests.
Update man pages with a mention of new function.
Update example code and tests with new functionality where it fits.
Closes #7605
- RELEASE-NOTES: synced
- [Mats Lindestam brought this change]
libssh2: add SHA256 fingerprint support
Added support for SHA256 fingerprint in command line curl and in
libcurl.
Closes #7646
- libcurl.rc: switch out the copyright symbol for plain ASCII
Reported-by: Vitaly Varyvdin
Assisted-by: Viktor Szakats
Fixes #7765
Closes #7776
- [Jun-ya Kato brought this change]
ngtcp2: fix QUIC transport parameter version
fix inappropriate version setting for QUIC transport parameters.
this patch keeps curl with ngtcp2 uses QUIC draft version (h3-29).
Closes #7771
- examples/imap-append: fix end-of-data check
Reported-by: Alexander Chuykov
Fixes #7774
Closes #7775
Michael Kaufmann (24 Sep 2021)
- vtls: Fix a memory leak if an SSL session cannot be added to the cache
On connection shutdown, a new TLS session ticket may arrive after the
SSL session cache has already been destructed. In this case, the new
SSL session cannot be added to the SSL session cache.
The callers of Curl_ssl_addsessionid() need to know whether the SSL
session has been added to the cache. If it has not been added, the
reference counter of the SSL session must not be incremented, or memory
used by the SSL session must be freed. This is now possible with the new
output parameter "added" of Curl_ssl_addsessionid().
Fixes #7683
Closes #7752
Daniel Stenberg (24 Sep 2021)
- [Momoka Yamamoto brought this change]
HTTP3.md: use 'autoreconf -fi' instead of buildconf
buildconf is not used since #5853
Closes #7746
- GIT-INFO: rephrase to adapt to s/buildconf/autoreconf
- [h1zzz brought this change]
llist: remove redundant code, branch will not be executed
Closes #7770
- [tlahn brought this change]
HTTP-COOKIES.md: remove duplicate 'each'
Closes #7772
Jay Satiro (24 Sep 2021)
- [Joel Depooter brought this change]
libssh2: Get the version at runtime if possible
Previously this code used a compile time constant, meaning that libcurl
always reported the libssh2 version that libcurl was built with. This
could differ from the libssh2 version actually being used. The new code
uses the CURL_LIBSSH2_VERSION macro, which is defined in ssh.h. The
macro calls the libssh2_version function if it is available, otherwise
it falls back to the compile time version.
Closes https://github.com/curl/curl/pull/7768
- [Joel Depooter brought this change]
schannel: fix typo
Closes https://github.com/curl/curl/pull/7769
Daniel Stenberg (23 Sep 2021)
- cmake: with OpenSSL, define OPENSSL_SUPPRESS_DEPRECATED
To avoid the "... is deprecated" warnings brought by OpenSSL v3.
(We need to address the underlying code at some point of course.)
Assisted-by: Jakub Zakrzewski
Closes #7767
- curl-openssl: pass argument to sed single-quoted
... instead of using an escaped double-quote. This is an attempt to make
this work better with ksh that otherwise would insist on a double
escape!
Reported-by: Randall S. Becker
Fixes #7758
Closes #7764
- RELEASE-NOTES: synced
Bumped curlver to 7.80.0-dev
- [a1346054 brought this change]
misc: fix typos in docs and comments
No user facing output from curl/libcurl is changed by this, just
comments.
Closes #7747
- [Thomas M. DuBuisson brought this change]
ci: update Lift config to match requirements of curl build
Also renamed Muse -> Lift, the new tool name.
Closes #7761
- [Rikard Falkeborn brought this change]
cleanup: constify unmodified static structs
Constify a number of static structs that are never modified. Make them
const to show this.
Closes #7759
Version 7.79.1 (22 Sep 2021)
Daniel Stenberg (22 Sep 2021)
- RELEASE-NOTES: synced
curl 7.79.1 release
- THANKS: added names from the 7.79.1 release
- test897: verify delivery of IMAP post-body header content
The "content" is delivered as "body" by curl, but the envelope continues
after the body and the rest of it should be delivered as header.
The IMAP server can now get 'POSTFETCH' set to include more data to
include after the body and test 897 is done to verify that such "extra"
header data is in fact delivered by curl as header.
Ref: #7284 but fails to reproduce the issue
Closes #7748
- KNOWN_BUGS: connection migration doesn't work
Closes #7695
- RELEASE-NOTES: synced
- http: fix the broken >3 digit response code detection
When the "reason phrase" in the HTTP status line starts with a digit,
that was treated as the forth response code digit and curl would claim
the response to be non-compliant.
Added test 1466 to verify this case.
Regression brought by 5dc594e44f73b17
Reported-by: Glenn de boer
Fixes #7738
Closes #7739
Jay Satiro (17 Sep 2021)
- strerror: use sys_errlist instead of strerror on Windows
- Change Curl_strerror to use sys_errlist[errnum] instead of strerror to
retrieve the error message on Windows.
Windows' strerror writes to a static buffer and is not thread-safe.
Follow-up to 2f0bb86 which removed most instances of strerror in favor
of calling Curl_strerror (which calls strerror_r for other platforms).
Ref: https://github.com/curl/curl/pull/7685
Ref: https://github.com/curl/curl/commit/2f0bb86
Closes https://github.com/curl/curl/pull/7735
Daniel Stenberg (16 Sep 2021)
- dist: provide lib/.checksrc in the tarball
So that debug builds work (checksrc really)
Reported-by: Marcel Raad
Reported-by: tawmoto on github
Fixes #7733
Closes #7734
- TODO: Improve documentation about fork safety
Closes #6968
- hsts: CURLSTS_FAIL from hsts read callback should fail transfer
... and have CURLE_ABORTED_BY_CALLBACK returned.
Extended test 1915 to verify.
Reported-by: Jonathan Cardoso
Fixes #7726
Closes #7729
- test1184: disable
The test should be fine and it works for me repeated when run manually,
but clearly it causes CI failures and it needs more research.
Reported-by: RiderALT on github
Fixes #7725
Closes #7732
- Curl_http2_setup: don't change connection data on repeat invokes
Regression from 3cb8a748670ab88c (releasde in 7.79.0). That change moved
transfer oriented inits to before the check but also erroneously moved a
few connection oriented ones, which causes problems.
Reported-by: Evangelos Foutras
Fixes #7730
Closes #7731
- RELEASE-NOTES: synced
and bump to 7.79.1
Kamil Dudka (16 Sep 2021)
- tests/sshserver.pl: make it work with openssh-8.7p1
... by not using options with no argument where an argument is required:
=== Start of file tests/log/ssh_server.log
curl_sshd_config line 6: no argument after keyword "DenyGroups"
curl_sshd_config line 7: no argument after keyword "AllowGroups"
curl_sshd_config line 10: Deprecated option AuthorizedKeysFile2
curl_sshd_config line 29: Deprecated option KeyRegenerationInterval
curl_sshd_config line 39: Deprecated option RhostsRSAAuthentication
curl_sshd_config line 40: Deprecated option RSAAuthentication
curl_sshd_config line 41: Deprecated option ServerKeyBits
curl_sshd_config line 45: Deprecated option UseLogin
curl_sshd_config line 56: no argument after keyword "AcceptEnv"
curl_sshd_config: terminating, 3 bad configuration options
=== End of file tests/log/ssh_server.log
=== Start of file log/sftp_server.log
curl_sftp_config line 33: Unsupported option "rhostsrsaauthentication"
curl_sftp_config line 34: Unsupported option "rsaauthentication"
curl_sftp_config line 52: no argument after keyword "sendenv"
curl_sftp_config: terminating, 1 bad configuration options
Connection closed.
Connection closed
=== End of file log/sftp_server.log
Closes #7724
Daniel Stenberg (15 Sep 2021)
- hsts: handle unlimited expiry
When setting a blank expire string, meaning unlimited, curl would pass
TIME_T_MAX to getime_r() when creating the output, while on 64 bit
systems such a large value cannot be convetered to a tm struct making
curl to exit the loop with an error instead. It can't be converted
because the year it would represent doesn't fit in the 'int tm_year'
field!
Starting now, unlimited expiry is instead handled differently by using a
human readable expiry date spelled out as "unlimited" instead of trying
to use a distant actual date.
Test 1660 and 1915 have been updated to help verify this change.
Reported-by: Jonathan Cardoso
Fixes #7720
Closes #7721
- curl_multi_fdset: make FD_SET() not operate on sockets out of range
The VALID_SOCK() macro was made to only check for FD_SETSIZE if curl was
built to use select(), even though the curl_multi_fdset() function
always and unconditionally uses FD_SET and needs the check.
Reported-by: 0xee on github
Fixes #7718
Closes #7719
- FAQ: add GOPHERS + curl works on data, not files
Version 7.79.0 (14 Sep 2021)
Daniel Stenberg (14 Sep 2021)
- RELEASE-NOTES: synced
For the 7.79.0 release
- THANKS: add contributors from 7.79.0 release cycle
- FAQ: add two dev related questions
8.1 Why does curl use C89?
8.2 Will curl be rewritten?
Spell-checked-by: Paul Johnson
Closes #7715
- zuul.d/jobs: disable three tests for *-openssl-disable-proxy
... as they mysteriously seem to permfail without being related to
proxy.
Closes #7714
- [Patrick Monnerat brought this change]
ftp,imap,pop3,smtp: reject STARTTLS server response pipelining
If a server pipelines future responses within the STARTTLS response, the
former are preserved in the pingpong cache across TLS negotiation and
used as responses to the encrypted commands.
This fix detects pipelined STARTTLS responses and rejects them with an
error.
CVE-2021-22947
Bug: https://curl.se/docs/CVE-2021-22947.html
- [Patrick Monnerat brought this change]
ftp,imap,pop3: do not ignore --ssl-reqd
In imap and pop3, check if TLS is required even when capabilities
request has failed.
In ftp, ignore preauthentication (230 status of server greeting) if TLS
is required.
Bug: https://curl.se/docs/CVE-2021-22946.html
CVE-2021-22946
- [z2_ on hackerone brought this change]
mqtt: clear the leftovers pointer when sending succeeds
CVE-2021-22945
Bug: https://curl.se/docs/CVE-2021-22945.html
- zuul: bump the rustls job to use v0.7.2
... and add -lm when using a rust library.
Closes #7701
- RELEASE-PROCEDURE: add release dates from now to 8.0.0 in 2023
- SECURITY-PROCESS: tweak a little to match current practices
Closes #7713
- http_proxy: fix the User-Agent inclusion in CONNECT
It should not refer to the uagent string that is allocated and created
for the end server http request, as that pointer may be cleared on
subsequent CONNECT requests.
Added test case 1184 to verify.
Reported-by: T200proX7 on github
Fixes #7705
Closes #7707
- Curl_hsts_loadcb: don't attempt to load if hsts wasn't inited
Reported-by: Jonathan Cardoso
Fixes #7710
Closes #7711
- [Tatsuhiro Tsujikawa brought this change]
ngtcp2: fix build with ngtcp2 and nghttp3
ngtcp2_conn_client_new and nghttp3_conn_client_new are now macros.
Check the wrapped functions instead.
ngtcp2_stream_close callback now takes flags parameter.
Closes #7709
- write-out.d: clarify size_download/upload
They show the number of "body" bytes transfered.
Fixes #7702
Closes #7706
- http2: Curl_http2_setup needs to init stream data in all invokes
Thus function was written to avoid doing multiple connection data
initializations, which is fine, but since it also initiates stream
related data it is crucial that it doesn't skip those even if called
again for the same connection. Solved by moving the stream
initializations before the "doing-it-again" check.
Reported-by: Inho Oh
Fixes #7630
Closes #7692
- url: fix compiler warning in no-verbose builds
Follow-up from 2f0bb864c12
Closes #7700
- non-ascii: fix build errors from strerror fix
Follow-up to 2f0bb864c12
Closes #7697
- parse_args: redo the warnings for --remote-header-name combos
... to avoid the memory leak risk pointed out by scan-build.
Follow-up from 7a3e981781d6c18a
Closes #7698
- ngtcp2: adapt to new size defintions upstream
Reviewed-by: Tatsuhiro Tsujikawa
Closes #7699
- rustls: add strerror.h include
Follow-up to 2f0bb864c12
- docs: the security list is reached at security at curl.se now
Also update the FAQ section a bit to encourage users to rather submit
security issues on hackerone than sending email.
Closes #7689
Marc Hoersken (9 Sep 2021)
- runtests: add option -u to error on server unexpectedly alive
Let's try to actually handle the server unexpectedly alive
case by first making them visible on CI builds as failures.
This is needed to detect issues with killing of the test
servers completely including nested process chains with
multiple PIDs per test server (including bash and perl).
On Windows/cygwin platforms this is especially helpful with
debugging PID mixups due to cygwin using its own PID space.
Reviewed-by: Daniel Stenberg
Closes #7180
Daniel Stenberg (9 Sep 2021)
- opts docs: unify phrasing in NAME header
- avoid writing "set ..." or "enable/disable ..." or "specify ..."
*All* options for curl_easy_setopt() are about setting or enabling
things and most of the existing options didn't use that way of
description.
- start with lowercase letter, unless abbreviation. For consistency.
- Some additional touch-ups
Closes #7688
- strerror.h: remove the #include from files not using it
- lib: don't use strerror()
We have and provide Curl_strerror() internally for a reason: strerror()
is not necessarily thread-safe so we should always try to avoid it.
Extended checksrc to warn for this, but feature the check disabled by
default and only enable it in lib/
Closes #7685
Daniel Gustafsson (8 Sep 2021)
- cirrus: Add FreeBSD 13.0 job and disable sanitizer build
As alluded to the in the now removed comment, a 13.0 image became
available and is now ready to be used.
The sanitizer builds were running on the 12.1 image which since has
been removed from the config, leaving the builds not running at all.
When enabled it turns out that they don't actually work due to very
long timeouts in executing the tests, so keep the disabled for now
but a bit more controlled.
Closes #7592
Daniel Stenberg (8 Sep 2021)
- copyrights: update copyright year ranges
- RELEASE-NOTES: synced
- INTERNALS: c-ares has a new home: c-ares.org
- docs: remove experimental mentions from HSTS and MQTT
Reported-by: Jonathan Cardoso
Bug: https://github.com/curl/curl/pull/6700#issuecomment-913792863
Closes #7681
- [Cao ZhenXiang brought this change]
curl: add warning for incompatible parameters usage
--continue-at - and --remote-header-name are known incompatible parameters
Closes #7674
- [git-bruh brought this change]
examples/*hiperfifo.c: fix calloc arguments to match function proto
Closes #7678
- INTERNALS: bump c-ares requirement to 1.16.0
Since ba904db0705c93 we use ares_getaddrinfo, added in c-ares 1.16.0
- curl: stop retry if Retry-After: is longer than allowed
If Retry-After: specifies a period that is longer than what fits within
--retry-max-time, then stop retrying immediately.
Added test 366 to verify.
Reported-by: Kari Pahula
Fixes #7675
Closes #7676
- [Michał Antoniak brought this change]
mbedtls: avoid using a large buffer on the stack
Use dynamic memory allocation for the buffer used in checking "pinned
public key". The PUB_DER_MAX_BYTES parameter with default settings is
set to a value greater than 2kB.
Co-authored-by: Daniel Stenberg
Closes #7586
- configure: make --disable-hsts work
The AC_ARG_ENABLE() macro itself uses a variable called
'enable_[option]', so when our script also used a variable with that
name for the purpose of storing what the user wants, it also
accidentally made it impossible to switch off the feature with
--disable-hsts. Fix this by renaming our variable.
Reported-by: Michał Antoniak
Fixes #7669
Closes #7672
Jay Satiro (5 Sep 2021)
- config.d: note that curlrc is used even when --config
Bug: https://github.com/curl/curl/pull/7666#issuecomment-912214751
Reported-by: Viktor Szakats
Closes https://github.com/curl/curl/pull/7667
Daniel Stenberg (4 Sep 2021)
- RELEASE-NOTES: synced
- test1173: check references to libcurl options
... that they refer to actual existing libcurl options.
Reviewed-by: Daniel Gustafsson
Closes #7656
- CURLOPT_UNIX_SOCKET_PATH.3: remove nginx reference, add see also
Closes #7656
- opt-docs: verify man page sections + order
In every libcurl option man page there are now 8 mandatory sections that
must use the right name in the correct order and test 1173 verifies
this. Only 14 man pages needed adjustments.
The sections and the order is as follows:
- NAME
- SYNOPSIS
- DESCRIPTION
- PROTOCOLS
- EXAMPLE
- AVAILABILITY
- RETURN VALUE
- SEE ALSO
Reviewed-by: Daniel Gustafsson
Closes #7656
- opt-docs: make sure all man pages have examples
Extended manpage-syntax.pl (run by test 1173) to check that every man
page for a libcurl option has an EXAMPLE section that is more than two
lines. Then fixed all errors it found and added examples.
Reviewed-by: Daniel Gustafsson
Closes #7656
- get.d: provide more useful examples
Closes #7668
- page-header: add GOPHERS, simplify wording in the 1st para
Closes #7665
- connect: get local port + ip also when reusing connections
Regression. In d6a37c23a3c (7.75.0) we removed the duplicated storage
(connection + easy handle), so this info needs be extracted again even
for re-used connections.
Add test 435 to verify
Reported-by: Max Dymond
Fixes #7660
Closes #7662
Marcel Raad (2 Sep 2021)
- multi: fix compiler warning with `CURL_DISABLE_WAKEUP`
`use_wakeup` is unused in this case.
Closes https://github.com/curl/curl/pull/7661
Daniel Stenberg (1 Sep 2021)
- tests: adjust the tftpd output to work with hyper mode
By making them look less like http headers, the hyper mode "tweak"
doesn't interfere.
Enable test 2002 and 2003 in hyper builds (and 1280 which is unrelated
but should be enabled).
Closes #7658
Daniel Gustafsson (1 Sep 2021)
- [Gisle Vanem brought this change]
openssl: annotate SSL3_MT_SUPPLEMENTAL_DATA
This adds support for the previously unhandled supplemental data which
in -v output was printed like:
TLSv1.2 (IN), TLS header, Unknown (23):
These will now be printed with proper annotation:
TLSv1.2 (OUT), TLS header, Supplemental data (23):
Closes #7652
Reviewed-by: Daniel Stenberg <daniel@haxx.se>
Daniel Stenberg (1 Sep 2021)
- curl.1: provide examples for each option
The file format for each option now features a "Example:" header that
can provide one or more examples that get rendered appropriately in the
output. All options MUST have at least one example or gen.pl complains
at build-time.
This fix also does a few other minor format and consistency cleanups.
Closes #7654
- progress: make trspeed avoid floats
and compiler warnings for data conversions.
Reported-by: Michał Antoniak
Fixes #7645
Closes #7653
- test365: verify response with chunked AND Content-Length headers
- http: ignore content-length if any transfer-encoding is used
Fixes #7643
Closes #7649
- RELEASE-NOTES: synced
- Revert "http2: skip immediate parsing of payload following protocol switch"
This reverts commit 455a63c66f188598275e87d32de2c4e8e26b80cb.
Reported-by: Tk Xiong
Fixes #7633
Closes #7648
- KNOWN_BUGS: HTTP/3 doesn't support client certs
Closes #7625
- mailing lists: move from cool.haxx.se to lists.haxx.se
- http_proxy: only wait for writable socket while sending request
Otherwise it would wait socket writability even after the entire CONNECT
request has sent and make curl basically busy-loop while waiting for a
response to come back.
The previous fix attempt in #7484 (c27a70a591a4) was inadequate.
Reported-by: zloi-user on github
Reported-by: Oleguer Llopart
Fixes #7589
Closes #7647
- http: disallow >3-digit response codes
Make the built-in HTTP parser behave similar to hyper and reject any
HTTP response using more than 3 digits for the response code.
Updated test 1432 accordingly.
Enabled test 1432 in the hyper builds.
Closes #7641
- [Tatsuhiro Tsujikawa brought this change]
ngtcp2: stop buffering crypto data
Stop buffering crypto data because libngtcp2 now buffers submitted
crypto data.
Closes #7637
- test1280: CRLFify the response to please hyper
Closes #7639
- tests: enable test 1129 for hyper builds
Closes #7638
- curl: better error message when -O fails to get a good name
Due to how this currently works internally, it needs a working initial
file name to store contents in, so it may still fail even with -J is
used (and thus accepting a name from content-disposition:) if the file
name part of the URL isn't "good enough".
Fixes #7628
Closes #7635
- curl_easy_setopt: tweak the string copy wording
Reported-by: Yaobin Wen
Fixes #7632
Closes #7634
- RELEASE-NOTES: synced
- [Don J Olmstead brought this change]
cmake: sync CURL_DISABLE options
Adds the full listing of CURL_DISABLE options to the CMake build. Moves
all option code, except for CURL_DISABLE_OPENSSL_AUTO_LOA_CONFIG which
resides near OpenSSL configuration, to the same block of code. Also
sorts the options here and in the cmake config header.
Additionally sorted the CURL-DISABLE listing and fixed the
CURL_DISABLE_POP3 option.
Closes #7624
Jay Satiro (25 Aug 2021)
- KNOWN_BUGS: FTPS upload data loss with TLS 1.3
Bug: https://github.com/curl/curl/issues/6149
Reported-by: Bylon2@users.noreply.github.com
Closes https://github.com/curl/curl/pull/7623
Daniel Stenberg (24 Aug 2021)
- cmake: avoid poll() on macOS
... like we do in configure builds. Since poll() on macOS is not
reliable enough.
Reported-by: marc-groundctl
Fixes #7595
Closes #7619
- c-hyper: handle HTTP/1.1 => HTTP/1.0 downgrade on reused connection
Enable test 1074
Closes #7617
- c-hyper: deal with Expect: 100-continue combined with POSTFIELDS
Enable test 1130 and 1131
Closes #7616
- [a1346054 brought this change]
tests: be explicit about using 'python3' instead of 'python'
This fixes running tests in virtualenvs (or on distros) that no longer
have a symlink from python to python2 or python3.
Closes #7602
- [a1346054 brought this change]
scripts: invoke interpreters through /usr/bin/env
Closes #7602
- DISABLED: enable 11 more tests for hyper builds
Closes #7612
- setopt: enable CURLOPT_IGNORE_CONTENT_LENGTH for hyper
Since this option is also used for FTP, it needs to work to set for
applications even if hyper doesn't support it for HTTP. Verified by test
1137.
Updated docs to specify that the option doesn't work for HTTP when using
the hyper backend.
Closes #7614
- test1138: remove trailing space to make work with hyper
Closes #7613
- libcurl-errors.3: clarify two CURLUcode errors
CURLUE_BAD_HANDLE and CURLUE_BAD_PARTPOINTER should be for "bad" or
wrong pointers in a generic sense, not just for NULL pointers.
Reviewed-by: Jay Satiro
Ref: #7605
Closes #7611
Jay Satiro (23 Aug 2021)
- symbols-in-versions: fix CURLSSLBACKEND_QSOSSL last used version
... and also change the 'Removed' column name to 'Last' since that
column is for the last version to contain the symbol.
Closes https://github.com/curl/curl/pull/7609
Daniel Stenberg (23 Aug 2021)
- urlapi.c:seturl: assert URL instead of using if-check
There's no code flow possible where this can happen. The assert makes
sure it also won't be introduced undetected in the future.
Closes #7610
- curl-openssl.m4: show correct output for OpenSSL v3
Using 3.0.0 versions configure should now show this:
checking for OpenSSL headers version... 3.0.0 - 0x300
checking for OpenSSL library version... 3.0.0
checking for OpenSSL headers and library versions matching... yes
This output doesn't actually change what configure generates but is only
"cosmetic".
Reported-by: Randall S. Becker
Fixes #7606
Closes #7608
|