Adding/updating comments and including apps.d/.

Applying a summary of commit 5d09382c82. Also updating nginx-common/purge.
2016-11-10 18:29:38 +00:00 · 2016-11-10 07:27:18 +00:00
1778 changed files with 254736 additions and 169234 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,10 +0,0 @@
-objs/*
-!objs/ndk_*
-.pc/
-.vscode/
-modules/media-framework/
-modules/nginx-srt-module/
-modules/nginx-vod-module/
-Makefile
-*.orig
-*.txt
--- a/.hgtags
+++ b/.hgtags
@ -1,483 +0,0 @@
-551102312e19b704cd22bd7254a9444b9ea14e96 release-0.1.0
-23fb87bddda14ce9faec90f774085634106aded4 release-0.1.1
-295d97d70c698585705345f1a8f92b02e63d6d0d release-0.1.2
-ded1284520cc939ad5ae6ddab39925375e64237d release-0.1.3
-0491b909ef7612d8411f1f59054186c1f3471b52 release-0.1.4
-a88a3e4e158fade0aaa6f3eb25597d5ced2c1075 release-0.1.5
-1f31dc6d33a3a4e65240b08066bf186df9e33b79 release-0.1.6
-5aecc125bc33d81d6214c91d73eb44230a903dde release-0.1.7
-bbd6b0b4a2b15ef8c8f1aaf7b027b6da47303524 release-0.1.8
-2ff194b74f1e60cd04670986973e3b1a6aa3bece release-0.1.9
-31ee1b50354fb829564b81a6f34e8d6ceb2d3f48 release-0.1.10
-8e8f3af115b5b903b2b8f3335de971f18891246f release-0.1.11
-c3c2848fc081e19aec5ffa97e468ad20ddb81df0 release-0.1.12
-ad1e9ebf93bb5ae4c748d471fad2de8a0afc4d2a release-0.1.13
-c5240858380136a67bec261c59b1532560b57885 release-0.1.14
-fd661d14a7fad212e326a7dad6234ea0de992fbf release-0.1.15
-621229427cba1b0af417ff2a101fc4f17a7d93c8 release-0.1.16
-4ebe09b07e3021f1a63b459903ec58f162183b26 release-0.1.17
-31ff3e943e1675a2caf745ba7a981244445d4c98 release-0.1.18
-45a460f82aec80b0f61136aa09f412436d42203a release-0.1.19
-0f836f0288eee4980f57736d50a7a60fa082d8e9 release-0.1.20
-975f62e77f0244f1b631f740be77c72c8f2da1de release-0.1.21
-fc9909c369b2b4716304ac8e38da57b8fb781211 release-0.1.22
-d7c90bb5ce83dab08715e98f9c7b81c7df4b37be release-0.1.23
-64d9afb209da0cd4a917202b7b77e51cc23e2229 release-0.1.24
-d4ea69372b946dc4ec37fc3f5ddd93ff7c3da675 release-0.1.25
-b1648294f6935e993e436fd8a68bca75c74c826d release-0.1.26
-ee66921ecd47a7fa459f70f4a9d660f91f6a1b94 release-0.1.27
-cd3117ad9aab9c58c6f7e677e551e1adbdeaba54 release-0.1.28
-9b8c906f6e63ec2c71cecebfff35819a7d32227d release-0.1.29
-c12967aadd8726daf2d85e3f3e622d89c42db176 release-0.1.30
-fbbf16224844e7d560c00043e8ade8a560415bba release-0.1.31
-417a087c9c4d9abb9b0b9b3f787aff515c43c035 release-0.1.32
-dadfa78d227027348d7f9d1e7b7093d06ba545a0 release-0.1.33
-12234c998d83bfbbaa305273b3dd1b855ca325dc release-0.1.34
-6f00349b98e5f706b82115c6e4dc84456fc0d770 release-0.1.35
-2019117e6b38cc3e89fe4f56a23b271479c627a6 release-0.1.36
-09b42134ac0c42625340f16628e29690a04f8db5 release-0.1.37
-7fa11e5c6e9612ecff5eb58274cc846ae742d1d2 release-0.1.38
-e5d7d0334fdb946133c17523c198800142ac9fe9 release-0.1.39
-c3bd8cdabb8f73e5600a91f198eb7df6fac65e92 release-0.1.40
-d6e48c08d718bf5a9e58c20a37e8ae172bff1139 release-0.1.41
-563ad09abf5042eb41e8ecaf5b4e6c9deaa42731 release-0.1.42
-c9ad0d9c7d59b2fa2a5fe669f1e88debd03e6c04 release-0.1.43
-371c1cee100d7a1b0e6cad4d188e05c98a641ee7 release-0.1.44
-b09ee85d0ac823e36861491eedfc4dfafe282997 release-0.1.45
-511a89da35ada16ae806667d699f9610b4f8499a release-0.2.0
-0148586012ab3dde69b394ec5a389d44bb11c869 release-0.2.1
-818fbd4750b99d14d2736212c939855a11b1f1ef release-0.2.2
-e16a8d574da511622b97d6237d005f40f2cddb30 release-0.2.3
-483cca23060331f2078b1c2984870d80f288ad41 release-0.2.4
-45033d85b30e3f12c407b7cfc518d76e0eda0263 release-0.2.5
-7bd37aef1e7e87858c12b124e253e98558889b50 release-0.2.6
-ecd9c160f25b7a7075dd93383d98a0fc8d8c0a41 release-0.3.0
-c1f965ef97188fd7ef81342dcf8719da18c554d2 release-0.3.1
-e48ebafc69393fc94fecfdf9997c4179fd1ce473 release-0.3.2
-9c2f3ed7a24711d3b42b124d5f831155c8beff95 release-0.3.3
-7c1369d37c7eb0017c28ebcaa0778046f5aafdcc release-0.3.4
-1af2fcb3be8a63796b6b23a488049c92a6bc12f4 release-0.3.5
-174f1e853e1e831b01000aeccfd06a9c8d4d95a2 release-0.3.6
-458b6c3fea65a894c99dd429334a77bb164c7e83 release-0.3.7
-58475592100cb792c125101b6d2d898f5adada30 release-0.3.8
-fcd6fc7ff7f9b132c35193d834e6e7d05026c716 release-0.3.9
-4d9ea73a627a914d364e83e20c58eb1283f4031d release-0.3.10
-4c5c2c55975c1152b5ca5d5d55b32d4dd7945f7a release-0.3.11
-326634fb9d47912ad94221dc2f8fa4bec424d40c release-0.3.12
-4e296b7d25bf62390ca2afb599e395426b94f785 release-0.3.13
-401de5a43ba5a8acdb9c52465193c0ea7354afe7 release-0.3.14
-284cc140593bb16ac71094acd509ab415ff4837d release-0.3.15
-d4e858a5751a7fd08e64586795ed7d336011fbc0 release-0.3.16
-8c0cdd81580eb76d774cfc5724de68e7e5cbbdc2 release-0.3.17
-425af804d968f30eeff01e33b808bc2e8c467f2c release-0.3.18
-ebc68d8ca4962fe3531b7e13444f7ac4395d9c6e release-0.3.19
-9262f520ce214d3d5fd7c842891519336ef85ca6 release-0.3.20
-869b6444d2341a587183859d4df736c7f3381169 release-0.3.21
-77f77f53214a0e3a68fef8226c15532b54f2c365 release-0.3.22
-858700ae46b453ea111b966b6d03f2c21ddcb94e release-0.3.23
-5dac8c7fb71b86aafed8ea352305e7f85759f72e release-0.3.24
-77cdfe394a94a625955e7585e09983b3af9b889b release-0.3.25
-608cf78b24ef7baaf9705e4715a361f26bb16ba9 release-0.3.26
-3f8a2132b93d66ac19bec006205a304a68524a0b release-0.3.27
-c73c5c58c619c22dd3a5a26c91bb0567a62c6930 release-0.3.28
-5ef026a2ac7481f04154f29ab49377bf99aaf96f release-0.3.29
-51b27717f140b71a2e9158807d79da17c888ce4c release-0.3.30
-7a16e281c01f1c7ab3b79c64b43ddb754ea7935e release-0.3.31
-93e85a79757c49d502e42a1cb8264a0f133b0b00 release-0.3.32
-0216fd1471f386168545f772836156761eddec08 release-0.3.33
-fbed40ce7cb4fd7203fecc22a617b9ce5b950fb3 release-0.3.34
-387450de0b4d21652f0b6242a5e26a31e3be8d8c release-0.3.35
-65bf042c0b4f39f18a235464c52f980e9fa24f6b release-0.3.36
-5d2b8078c1c2593b95ec50acfeeafbefa65be344 release-0.3.37
-f971949ffb585d400e0f15508a56232a0f897c80 release-0.3.38
-18268abd340cb351e0c01b9c44e9f8cc05492364 release-0.3.39
-e60fe4cf1d4ea3c34be8c49047c712c6d46c1727 release-0.3.40
-715d243270806d38be776fc3ed826d97514a73d6 release-0.3.41
-5e8fb59c18c19347a5607fb5af075fe1e2925b9a release-0.3.42
-947c6fd27699e0199249ad592151f844c8a900b0 release-0.3.43
-4946078f0a79e6cc952d3e410813aac9b8bda650 release-0.3.44
-95d7da23ea5315a6e9255ce036ed2c51f091f180 release-0.3.45
-1e720b0be7ecd92358da8a60944669fa493e78cd release-0.3.46
-39b7d7b33c918d8f4abc86c4075052d8c19da3c7 release-0.3.47
-7cbef16c71a1f43a07f8141f02e0135c775f0f5b release-0.3.48
-4c8cd5ae5cc100add5c08c252d991b82b1838c6b release-0.3.49
-400711951595aef7cd2ef865b84b31df52b15782 release-0.3.50
-649c9063d0fda23620eaeaf0f6393be0a672ebe7 release-0.3.51
-9079ee4735aefa98165bb2cb26dee4f58d58c1d7 release-0.3.52
-6d5c1535bb9dcd891c5963971f767421a334a728 release-0.3.53
-5fd7a5e990477189c40718c8c3e01002a2c20b81 release-0.3.54
-63a820b0bc6ca629c8e45a069b52d622ddc27a2d release-0.3.55
-562806624c4afb1687cba83bc1852f5d0fecbac3 release-0.3.56
-cec32b3753acf610ac1a6227d14032c1a89d6319 release-0.3.57
-b80f94fa2197b99db5e033fec92e0426d1fe5026 release-0.3.58
-e924670896abe2769ea0fcfd2058b405bed8e8ec release-0.3.59
-921a7ce4baf42fd1091b7e40f89c858c6b23053e release-0.3.60
-df95dcff753a6dc5e94257302aea02c18c7a7c87 release-0.3.61
-7e24168b0853ee7e46c9c7b943ef077dc64f17f5 release-0.4.0
-8183d4ba50f8500465efb27e66dd23f98775dd21 release-0.4.1
-610267a772c7bf911b499d37f66c21ce8f2ebaf7 release-0.4.2
-39dd0b045441e21512e0a6061a03d0df63414d8b release-0.4.3
-5e42c1615f4de0079bd4d8913886d588ce6a295d release-0.4.4
-40266f92b829a870808b3d4ee54c8fccdecbd2d6 release-0.4.5
-56e33c6efee7ff63cdc52bd1cf172bde195079df release-0.4.6
-119bad43bfd493400c57a05848eada2c35a46810 release-0.4.7
-0f404f82a1343cb4e4b277a44e3417385798e5e5 release-0.4.8
-d24a717314365c857b9f283d6072c2a427d5e342 release-0.4.9
-d6f0a00015fdef861fd67fb583b9690638650656 release-0.4.10
-e372368dadd7b2ecd0182b2f1b11db86fc27b2c3 release-0.4.11
-fd57967d850d2361072c72562d1ed03598473478 release-0.4.12
-979045fdcbd20cf7188545c1c589ff240251f890 release-0.4.13
-93c94cfa9f78f0a5740595dde4466ec4fba664f8 release-0.4.14
-589ee12e8d7c2ae5e4f4676bcc7a1279a76f9e8e release-0.5.0
-13416db8a807e5acb4021bc3c581203de57e2f50 release-0.5.1
-06c58edc88831fb31c492a8eddcf2c6056567f18 release-0.5.2
-e2ac5fa41bcba14adbbb722d45c083c30c07bb5c release-0.5.3
-393dbc659df15ccd411680b5c1ce87ed86d4c144 release-0.5.4
-38cc7bd8e04f2c519fd4526c12841a876be353cb release-0.5.5
-6d1fcec2ea79101c756316c015f72e75f601a5ab release-0.5.6
-aed8a9de62456c4b360358bc112ccca32ce02e8d release-0.5.7
-7642f45af67d805452df2667486201c36efaff85 release-0.5.8
-779216610662c3a459935d506f66a9b16b9c9576 release-0.5.9
-9eeb585454f3daa30cf768e95c088a092fe229b9 release-0.5.10
-bb491c8197e38ca10ae63b1f1ecb36bf6fdaf950 release-0.5.11
-613369e08810f36bbcc9734ef1059a03ccbf5e16 release-0.5.12
-bd796ef5c9c9dd34bfac20261b98685e0410122a release-0.5.13
-8a730c49f906d783b47e4b44d735efd083936c64 release-0.5.14
-cb447039152d85e9145139ff2575a6199b9af9d4 release-0.5.15
-64854c7c95d04f838585ca08492823000503fa61 release-0.5.16
-d1ffcf84ea1244f659145c36ff28de6fcdf528b2 release-0.5.17
-796a6e30ca9d29504195c10210dbc8deced0ae83 release-0.5.18
-1f81c711d2a039e1f93b9b515065a2235372d455 release-0.5.19
-8e8f6082654aedb4438c8fca408cfc316c7c5a2a release-0.5.20
-e9551132f7dd40da5719dd5bcf924c86f1436f85 release-0.5.21
-533a252896c4d1cff1586ae42129d610f7497811 release-0.5.22
-f461a49b6c747e0b67f721f2be172902afea5528 release-0.5.23
-2d5ef73671f690b65bf6d9e22e7155f68f484d5a release-0.5.24
-77bf42576050862c268e267ef3e508b145845a25 release-0.5.25
-2aefee4d4ed69eb7567680bf27a2efd212232488 release-0.6.0
-7ac0fe9bec9a2b5f8e191f6fdd6922bfd916a6cb release-0.6.1
-4882735ebc71eeec0fbfe645bdfdb31306872d82 release-0.6.2
-b94731c73d0922f472ff938b9d252ba29020f20c release-0.6.3
-13e649b813d6ccba5db33a61e08ebe09d683cd5b release-0.6.4
-80de622646b0059fd4c553eff47c391bf7503b89 release-0.6.5
-3b05edb2619d5935023b979ee7a9611b61b6c9e5 release-0.6.6
-1dcfd375100c4479611f71efb99271d0a3059215 release-0.6.7
-0228185d4c5772947b842e856ad74cf7f7fd52f3 release-0.6.8
-d1879c52326ecac45c713203670f54220879911e release-0.6.9
-5a80c6ccbe2ad24fa3d4ff6f9fe4a2b07408d19d release-0.6.10
-f88a8b0b39601b19cd740e4db614ab0b5b874686 release-0.6.11
-5557460a7247a1602ae96efd1d0ccf781344cb58 release-0.6.12
-451b02cc770a794cd41363461b446948ae1d8bc8 release-0.6.13
-537b6ef014c4a133e0ab0b7dc817508e0647e315 release-0.6.14
-5e68764f0d6e91a983170fa806e7450a9e9b33fe release-0.6.15
-158aa4e8cc46fcf9504a61469d22daf3476b17bf release-0.6.16
-d8fcca555542619228d9fab89e1665b993f8c3ee release-0.6.17
-60707ebc037086cf004736a0d4979e2a608da033 release-0.6.18
-3c2a99d3a71af846855be35e62edb9a12f363f44 release-0.6.19
-3e0a27f9358ffc1b5249e0ea2311ce7da5c8967e release-0.6.20
-143f4d65b1c875d6563ccb7f653d9157afc72194 release-0.6.21
-95e6160d2b7d0af8ffd1b95a23cadadf8f0b3f6d release-0.6.22
-69a03d5e3b6e6660079ef1ef172db7ac08d8370e release-0.6.23
-3e2a58fb48f1e1a99ebf851e0d47a7034c52ae22 release-0.6.24
-3b8607c05a8bebcfa59235c2126a70d737f0ccf5 release-0.6.25
-07ad5b2606614c4be4ee720c46cf4af126059d31 release-0.6.26
-be531addfabe5214f409d457140c1038af10d199 release-0.6.27
-58f05255d3a345d04baef5cff0ca1ae0ac7ecebb release-0.6.28
-eb2bd21dc8d03f6c94016f04ffb9adaf83a2b606 release-0.6.29
-55408deb3cd171efa9b81d23d7a1dd1ccde0b839 release-0.6.30
-d4288915bba73c4c3c9cf5d39d34e86879eb2b45 release-0.6.31
-0a189588830b8629c4dfea68feb49af36b59e4a9 release-0.7.0
-6ab27a06f3346cf9ec8737f5dbcc82dd4031e30f release-0.7.1
-a07e258cef3b0a0b6e76a6ff4ba4651c5facc85a release-0.7.2
-9992c4583513d2804fc2e7fec860fbc7ab043009 release-0.7.3
-4dc24d50230fbadfc037a414a86390db2de69dd2 release-0.7.4
-9527137b4354a648a229c7169850c7c65272c00d release-0.7.5
-c2f0f7cf306f302254beae512bda18713922375c release-0.7.6
-bbcf6d75556fdcee8bd4aba8f6c27014be9920ee release-0.7.7
-43bde71f0bbe5a33b161760d7f9f980d50386597 release-0.7.8
-769f0dd7081e9011394f264aa22aa66fd79730d8 release-0.7.9
-511edfa732da637f5f0c9476335df7dca994706d release-0.7.10
-0e7023bf6b2461309c29885935443449a41be807 release-0.7.11
-9ad1bd2b21d93902863807528e426862aedee737 release-0.7.12
-d90ea21e24ea35379aef50c5d70564158e110a15 release-0.7.13
-c07d2d20d95c83d804079bbdcecbce4a0c8282f0 release-0.7.14
-0cd7bb051f67eac2b179fb9f9cc988b9ba18ed76 release-0.7.15
-eab2e87deba73ae6abd9cc740e8d4365bed96322 release-0.7.16
-91d7a9eb8ade90e9421d7b1e3c2e47a6bc427876 release-0.7.17
-fc10f7b5cb1305fb930f8ac40b46882d0828d61e release-0.7.18
-9dba9779e37e5969a2d408c792084fd7acfec062 release-0.7.19
-61838d1bcbddc7bc4dd9f30d535573a6fddca8f9 release-0.7.20
-5f665d0fa6a5f6e748157f2ccbc445b2db8125d0 release-0.7.21
-24763afa5efe91e54f00b2ae5b87666eb6c08c3b release-0.7.22
-0562fb355a25266150cbe8c8d4e00f55e3654df3 release-0.7.23
-19c452ecd083550816873a8a31eb3ed9879085e6 release-0.7.24
-46b68faf271d6fdcaaf3ad2c69f6167ea9e9fa28 release-0.7.25
-d04bfca0c7e3ae2e4422bc1d383553139d6f0a19 release-0.7.26
-9425d9c7f8ead95b00a3929a9a5e487e0e3c8499 release-0.7.27
-fbc3e7e8b3ee756568a875f87d8a954a2f9d3bf6 release-0.7.28
-5176dfdf153fc785b18604197d58806f919829ad release-0.7.29
-87e07ccdf0a4ec53458d9d7a4ea66e1239910968 release-0.7.30
-9fddd7e1a7a27f8463867f41a461aad57df461b2 release-0.7.31
-780b2ba1ec6daf6e3773774e26b05b9ff0d5483e release-0.7.32
-83027471a25385b1c671968be761e9aa7a8591a7 release-0.7.33
-1e9a362c3dcee221ca6e34308c483ed93867aca2 release-0.7.34
-c7ee9e15717b54ead5f4a554686e74abe66c6b07 release-0.7.35
-b84548abe9b9d4f4e203f848696e52c8c82c308f release-0.7.36
-3286f0bab8e77dbc7ebb370b1dc379592ccff123 release-0.7.37
-11a4e2ed5b166b9c9f119171aa399a9e3aa4684a release-0.7.38
-f822655d4120629977794c32d3b969343b6c30db release-0.7.39
-8a350e49d2b6751296db6d8e27277ccf63ed412a release-0.7.40
-c4a56c197eeafd71fc1caef7a9d890a330e3c23d release-0.7.41
-a9575a57a5443df39611774cf3840e9088132b0e release-0.7.42
-7503d95d6eadad14c28b2db183ba09848265274b release-0.7.43
-9be652e9114435fc6f1fdec84c0458d56702db91 release-0.7.44
-797e070d480a34b31ddac0d364784773f1bbbcf9 release-0.7.45
-9b5037e7ec7db25875c40f9d1cf20a853388b124 release-0.7.46
-d1d0e6d7ff0ca3c0dd1be1ef1cfff2e3fd0b4e1c release-0.7.47
-9816fb28eda599bfd53940e6d3b6617d1ecb6323 release-0.7.48
-452b9d09df8e3f2fb04b2a33d04d2f3a6436eb34 release-0.7.49
-e4350efa7cf7a0e868c2236a1137de8a33bd8ec6 release-0.7.50
-f51f2bec766c8b6d7e1799d904f18f8ea631bd44 release-0.7.51
-18e39e566781c9c187e2eb62bebd9d669d68f08c release-0.7.52
-b073eaa1dcea296a3488b83d455fab6621a73932 release-0.7.53
-01c6fe6c2a55998434cd3b05dd10ca487ac3fb6c release-0.7.54
-3ed9377e686f2521e6ec15873084381033fb490d release-0.7.55
-a1e44954549c35023b409f728c678be8bf898148 release-0.7.56
-fbb1918a85e38a7becdb1a001dbaf5933f23a919 release-0.7.57
-87f4a49a9cc34a5b11c8784cc5ea89e97b4b2bd8 release-0.7.58
-0c22cb4862c8beb4ee1b9e4627125162a29a5304 release-0.7.59
-82d56c2425ef857cd430b8530a3f9e1127145a67 release-0.8.0
-f4acb784b53cd952559567971b97dde1e818a2b6 release-0.8.1
-b3503597c1a0f0f378afdc5e5e5b85e2c095a4be release-0.8.2
-c98da980514a02ba81c421b25bf91803ffffddf3 release-0.8.3
-db34ec0c53c4b9dec12ffdf70caf89a325ab9577 release-0.8.4
-0914802433b8678ba2cdf91280766f00f4b9b76e release-0.8.5
-ff52ee9e6422f3759f43a442b7ba615595b3a3d4 release-0.8.6
-7607237b4829fff1f60999f4663c50ed9d5182f7 release-0.8.7
-1cef1807bc12cb05ac52fb0e7a0f111d3760b569 release-0.8.8
-a40f8475511d74a468ade29c1505e8986600d7a3 release-0.8.9
-2d9faf2260df6c3e5d4aa1781493c31f27a557d0 release-0.8.10
-d0d61c32331a6505381b5218318f7b69db167ca8 release-0.8.11
-ca7a1c6c798a7eb5b294d4ac3179ec87ecf297d3 release-0.8.12
-81c8277cd8ed55febcb2dd9d9213076f6c0ccb09 release-0.8.13
-3089486a8dc5844b5b6e9f78d536b4b26f7ffa16 release-0.8.14
-d364c2c12dd9723a2dfac3f096f5e55d4cfe6838 release-0.8.15
-52163a1027c3efd6b4c461b60a2ca6266c23e193 release-0.8.16
-06564e9a2d9ec5852132c212e85eda0bf1300307 release-0.8.17
-7aaa959da85e09e29bcac3b1cadec35b0a25b64d release-0.8.18
-4bc73c644329a510da4e96b7241b80ead7772f83 release-0.8.19
-ea3d168fb99c32a5c3545717ecc61e85a375e5dd release-0.8.20
-27951ca037e63dae45ff5b6279124c224ae1255a release-0.8.21
-d56c8b5df517c2bf6e7bc2827b8bf3e08cda90e1 release-0.8.22
-3c6ac062b379b126212cbb27e98a3c8275ef381a release-0.8.23
-89b9173476de14688b1418fbf7df10f91d1719ef release-0.8.24
-aa550cb4159ae0d566006e091fb1c7a888771050 release-0.8.25
-06ce92293f6a65651b08c466f90f55bd69984b98 release-0.8.26
-ea50b0d79ef1d7d901cd0e4dcd7373447849d719 release-0.8.27
-e68b1c35cad86105ff1c5b240f53442f4c36356e release-0.8.28
-78d3582a30afe63fc0adb17c3ac8891a64e47146 release-0.8.29
-9852c5965a3292a1b6127dbb4da9fce4912d898a release-0.8.30
-4f84115914490e572bcbee5069157b7334df2744 release-0.8.31
-59dee6f7f3afeb1fad6ed5983756e48c81ad2a5c release-0.8.32
-a4456378d234c07038456cf32bfe3c651f1d5e82 release-0.8.33
-21cb50799a20575a42f9733342d37a426f79db4d release-0.8.34
-7cb3cb8d78ef7ae63561733ed91fd07933896bc8 release-0.8.35
-aed68639d4eb6afe944b7fb50499c16f7f3f503c release-0.8.36
-265b7fd2ae21c75bbffa5115b83a0123d6c4acb4 release-0.8.37
-fa5f1ca353c0c5aa5415f51d72fd7bbcc02d1ed7 release-0.8.38
-af10bf9d4c6532850aa1f70cdf7504bd109b284c release-0.8.39
-4846ec9f83cb5bc4c8519d5641b35fb9b190430c release-0.8.40
-718b4cb3faf7efe4e0648140f064bf7a92c3f7e8 release-0.8.41
-b5a3065749093282ddd19845e0b77ffc2e54333e release-0.8.42
-34df9fb22fed415cdad52def04095dc6d4b48222 release-0.8.43
-00ec8cd76fb89af27363b76c40d9f88bf4679c3b release-0.8.44
-e16dd52a0d226c23dcae9a11252564a04753bbed release-0.8.45
-f034d9173df0a433e0bbcf5974f12ea9eb9076c0 release-0.8.46
-4434dc967087315efcd0658206a67fe6c85528f3 release-0.8.47
-0b65c962e0cd6783a854877b52c903cb058eec8c release-0.8.48
-a2b7e94b9807e981866bf07e37b715847d1b7120 release-0.8.49
-e7bdb8edc1bab2bc352a9fb6ce765c46575c35bf release-0.8.50
-21dacebd12f65cb57ceb8d2688db5b07fad6e06d release-0.8.51
-67dd7533b99c8945b5b8b5b393504d4e003a1c50 release-0.8.52
-010468d890dbac33a4cae6dfb2017db70721b2fe release-0.8.53
-62b599022a2fa625b526c2ad1711dc6db7d66786 release-0.9.0
-71281dd73b17a0ead5535d531afaee098da723cb release-0.9.1
-16cff36b0e49fc9fdeee13b2e92690286bcc1b3d release-0.9.2
-b7b306325972661117694879d3e22faf4cf0df32 release-0.9.3
-fe671505a8ea86a76f0358b3ec4de84a9037ac2b release-0.9.4
-70542931bc5436d1bbd38f152245d93ac063968d release-0.9.5
-27e2f3b7a3db1819c5d0ba28327ceaba84a13c4e release-0.9.6
-657d05d63915ce2f6c4d763091059f5f85bb10e5 release-0.9.7
-e0fd9f36005923b8f98d1ba1ea583cb7625f318f release-1.0.0
-f8f89eb4e0c27e857ec517d893d4f9a454985084 release-1.0.1
-c50df367648e53d55e80b60a447c9c66caa0d326 release-1.0.2
-80d586db316512b5a9d39f00fe185f7f91523f52 release-1.0.3
-c9c2805ac9245cc48ce6efeba2b4a444f859d6aa release-1.0.4
-fa2c37b1122c2c983b6e91d1188e387d72dde4d6 release-1.0.5
-f31aea5b06654c9163be5acd6d9b7aaf0fdf6b33 release-1.1.0
-44bf95f670656fae01ccb266b3863843ea13d324 release-1.1.1
-da1289482a143dfa016769649bdff636c26f53c8 release-1.1.2
-bac8ba08a6570bac2ecd3bf2ad64b0ac3030c903 release-1.1.3
-911060bc8221d4113a693ae97952a1fa88663ca8 release-1.1.4
-e47531dfabbf8e5f8b8aff9ff353642ea4aa7abb release-1.1.5
-f9ddecfe331462f870a95e4c1c3ba1bb8f19f2d3 release-1.1.6
-378c297bb7459fb99aa9c77decac0d35391a3932 release-1.1.7
-71600ce67510af093d4bc0117a78b3b4678c6b3a release-1.1.8
-482d7d907f1ab92b78084d8b8631ed0eb7dd08f7 release-1.1.9
-c7e65deabf0db5109e8d8f6cf64cd3fb7633a3d1 release-1.1.10
-9590f0cf5aab8e6e0b0c8ae59c70187b2b97d886 release-1.1.11
-ade8fc136430cfc04a8d0885c757968b0987d56c release-1.1.12
-6a6836e65827fd3cb10a406e7bbbe36e0dad8736 release-1.1.13
-6845f4ac909233f5a08ed8a51de137713a888328 release-1.1.14
-2397e9c72f1bc5eac67006e12ad3e33e0ea9ba74 release-1.1.15
-7b7c49639a7bceecabf4963c60b26b65a77d6ce0 release-1.1.16
-f7e1113a9a1648cad122543e7080e895cf2d88f4 release-1.1.17
-2b22743c3079b41233ded0fc35af8aa89bcfab91 release-1.1.18
-0f0b425659e0b26f5bc8ea14a42dbf34de2eaba6 release-1.1.19
-f582d662cc408eb7a132c21f4b298b71d0701abb release-1.2.0
-9ee68d629722f583d43d92271f2eb84281afc630 release-1.3.0
-61b6a3438afef630774e568eefd89c53e3b93287 release-1.3.1
-7ccd50a0a455f2f2d3b241f376e1193ad956196d release-1.2.1
-0000000000000000000000000000000000000000 release-1.2.1
-50107e2d96bbfc2c59e46f889b1a5f68dd10cf19 release-1.3.2
-2c5e1e88c8cf710caf551c5c67eba00443601efe release-1.3.3
-a43447fb82aa03eabcd85352758ae14606a84d35 release-1.3.4
-90f3b4ea7992a7bf9385851a3e77173363091eea release-1.3.5
-3aeb14f88daeb973e4708310daa3dc68ac1200f7 release-1.3.6
-dafd375f1c882b15fa4a9b7aa7c801c55082395e release-1.3.7
-ab7ce0eb4cf78a656750ab1d8e55ef61f7e535ec release-1.3.8
-1b1a9337a7399ad3cdc5e3a2f9fbaaec990271d5 release-1.3.9
-2c053b2572694eb9cd4aed26a498b6cb1f51bbcc release-1.3.10
-36409ac209872ce53019f084e4e07467c5d9d25e release-1.3.11
-560dc55e90c13860a79d8f3e0d67a81c7b0257bb release-1.3.12
-dc195ffe0965b2b9072f8e213fe74ecce38f6773 release-1.3.13
-e04428778567dd4de329bbbe97ad653e22801612 release-1.3.14
-cd84e467c72967b9f5fb4d96bfc708c93edeb634 release-1.3.15
-23159600bdea695db8f9d2890aaf73424303e49c release-1.3.16
-7809529022b83157067e7d1e2fb65d57db5f4d99 release-1.4.0
-48a84bc3ff074a65a63e353b9796ff2b14239699 release-1.5.0
-99eed1a88fc33f32d66e2ec913874dfef3e12fcc release-1.5.1
-5bdca4812974011731e5719a6c398b54f14a6d61 release-1.5.2
-644a079526295aca11c52c46cb81e3754e6ad4ad release-1.5.3
-376a5e7694004048a9d073e4feb81bb54ee3ba91 release-1.5.4
-60e0409b9ec7ee194c6d8102f0656598cc4a6cfe release-1.5.5
-70c5cd3a61cb476c2afb3a61826e59c7cda0b7a7 release-1.5.6
-9ba2542d75bf62a3972278c63561fc2ef5ec573a release-1.5.7
-eaa76f24975948b0ce8be01838d949122d44ed67 release-1.5.8
-5a1759f33b7fa6270e1617c08d7e655b7b127f26 release-1.5.9
-b798fc020e3a84ef68e6c9f47865a319c826d33c release-1.5.10
-f995a10d4c7e9a817157a6ce7b753297ad32897e release-1.5.11
-97b47d95e4449cbde976657cf8cbbc118351ffe0 release-1.5.12
-fd722b890eabc600394349730a093f50dac31639 release-1.5.13
-d161d68df8be32e5cbf72b07db1a707714827803 release-1.7.0
-0351a6d89c3dbcc7a76295024ba6b70e27b9a497 release-1.7.1
-0bd223a546192fdf2e862f33938f4ec2a3b5b283 release-1.7.2
-fe7cd01828d5ca7491059f0690bb4453645eb28b release-1.7.3
-cbb146b120296852e781079d5138b04495bab6df release-1.7.4
-fe129aa02db9001d220f1db7c3c056f79482c111 release-1.7.5
-a8d111bb68847f61d682a3c8792fecb2e52efa2c release-1.7.6
-6d2fbc30f8a7f70136cf08f32d5ff3179d524873 release-1.7.7
-d5ea659b8bab2d6402a2266efa691f705e84001e release-1.7.8
-34b201c1abd1e2d4faeae4650a21574771a03c0e release-1.7.9
-860cfbcc4606ee36d898a9cd0c5ae8858db984d6 release-1.7.10
-2b3b737b5456c05cd63d3d834f4fb4d3776953d0 release-1.7.11
-3ef00a71f56420a9c3e9cec311c9a2109a015d67 release-1.7.12
-53d850fe292f157d2fb999c52788ec1dc53c91ed release-1.9.0
-884a967c369f73ab16ea859670d690fb094d3850 release-1.9.1
-3a32d6e7404a79a0973bcd8d0b83181c5bf66074 release-1.9.2
-e27a215601292872f545a733859e06d01af1017d release-1.9.3
-5cb7e2eed2031e32d2e5422caf9402758c38a6ad release-1.9.4
-942475e10cb47654205ede7ccbe7d568698e665b release-1.9.5
-b78018cfaa2f0ec20494fccb16252daa87c48a31 release-1.9.6
-54117529e40b988590ea2d38aae909b0b191663f release-1.9.7
-1bdc497c81607d854e3edf8b9a3be324c3d136b6 release-1.9.8
-ef107f3ddc237a3007e2769ec04adde0dcf627fa release-1.9.9
-be00ca08e41a69e585b6aff70a725ed6c9e1a876 release-1.9.10
-fe66cff450a95beed36a2515210eb2d7ef62c9d3 release-1.9.11
-ead3907d74f90a14d1646f1b2b56ba01d3d11702 release-1.9.12
-5936b7ed929237f1a73b467f662611cdc0309e51 release-1.9.13
-4106db71cbcb9c8274700199ac17e520902c6c0f release-1.9.14
-13070ecfda67397985f0e986eb9c42ecb46d05b5 release-1.9.15
-271ee30c6791847980cd139d31807541f5e569bf release-1.11.0
-cb783d9cc19761e14e1285d91c38f4b84d0b8756 release-1.11.1
-4d3b3a13a8cf5fc3351a7f167d1c13325e00f21c release-1.11.2
-b83a067949a3384a49fd3d943eb8d0997b31f87b release-1.11.3
-953512ca02c6f63b4fcbbc3e10d0d9835896bf99 release-1.11.4
-5253015a339aaca0a3111473d3e931b6d4752393 release-1.11.5
-5e371426b3bcba4312ce08606194b89b758927d1 release-1.11.6
-5c8f60faf33ca8926473d2da27b4c3c417bd4630 release-1.11.7
-4591da489a30f790def29bc5987f43409b503cae release-1.11.8
-20a45c768e5ed26b740679d0e22045c98727c3cc release-1.11.9
-1ad0999a7ded3d4fb01c7acf8ff57c80b643da7e release-1.11.10
-d8b321a876d6254e9e98795e3b194ef053290354 release-1.11.11
-7f394e433f0003222aa6531931ecc0b24740d5e4 release-1.11.12
-3d0e8655f897959e48cc74e87670bb5492a58871 release-1.11.13
-3671096a45bce570a2afa20b9faf42c7fb0f7e66 release-1.13.0
-539f7893ecb96bee60965528c8958d7eb2f1ce6b release-1.13.1
-5be2b25bdc65775a85f18f68a4be4f58c7384415 release-1.13.2
-8457ce87640f9bfe6221c4ac4466ced20e03bebe release-1.13.3
-bbc642c813c829963ce8197c0ca237ab7601f3d4 release-1.13.4
-0d45b4cf7c2e4e626a5a16e1fe604402ace1cea5 release-1.13.5
-f87da7d9ca02b8ced4caa6c5eb9013ccd47b0117 release-1.13.6
-47cca243d0ed39bf5dcb9859184affc958b79b6f release-1.13.7
-20ca4bcff108d3e66977f4d97508637093492287 release-1.13.8
-fb1212c7eca4c5328fe17d6cd95b010c67336aac release-1.13.9
-31c929e16910c38492581ef474e72fa67c28f124 release-1.13.10
-64179f242cb55fc206bca59de9bfdc4cf5ebcec7 release-1.13.11
-051e5fa03b92b8a564f6b12debd483d267391e82 release-1.13.12
-990b3e885636d763b97ed02d0d2cfc161a4e0c09 release-1.15.0
-4189160cb946bb38d0bc0a452b5eb4cdd8979fb5 release-1.15.1
-b234199c7ed8a156a6bb98f7ff58302c857c954f release-1.15.2
-28b3e17ca7eba1e6a0891afde0e4bc5bcc99c861 release-1.15.3
-49d49835653857daa418e68d6cbfed4958c78fca release-1.15.4
-f062e43d74fc2578bb100a9e82a953efa1eb9e4e release-1.15.5
-2351853ce6867b6166823bdf94333c0a76633c0a release-1.15.6
-051a039ce1c7e09144de4a4846669ec7116cecea release-1.15.7
-ee551e3f6dba336c0d875e266d7d55385f379b42 release-1.15.8
-d2fd76709909767fc727a5b4affcf1dc9ca488a7 release-1.15.9
-75f5c7f628411c79c7044102049f7ab4f7a246e7 release-1.15.10
-5155d0296a5ef9841f035920527ffdb771076b44 release-1.15.11
-0130ca3d58437b3c7c707cdddd813d530c68da9a release-1.15.12
-054c1c46395caff79bb4caf16f40b331f71bb6dd release-1.17.0
-7816bd7dabf6ee86c53c073b90a7143161546e06 release-1.17.1
-2fc9f853a6b7cd29dc84e0af2ed3cf78e0da6ca8 release-1.17.2
-ed4303aa1b31a9aad5440640c0840d9d0af45fed release-1.17.3
-ce2ced3856909f36f8130c99eaa4dbdbae636ddc release-1.17.4
-9af0dddbddb2c368bfedd2801bc100ffad01e19b release-1.17.5
-de68d0d94320cbf033599c6f3ca37e5335c67fd7 release-1.17.6
-e56295fe0ea76bf53b06bffa77a2d3a9a335cb8c release-1.17.7
-fdacd273711ddf20f778c1fb91529ab53979a454 release-1.17.8
-5e8d52bca714d4b85284ddb649d1ba4a3ca978a8 release-1.17.9
-c44970de01474f6f3e01b0adea85ec1d03e3a5f2 release-1.17.10
-cbe6ba650211541310618849168631ce0b788f35 release-1.19.0
-062920e2f3bf871ef7a3d8496edec1b3065faf80 release-1.19.1
-a7b46539f507e6c64efa0efda69ad60b6f4ffbce release-1.19.2
-3cbc2602325f0ac08917a4397d76f5155c34b7b1 release-1.19.3
-dc0cc425fa63a80315f6efb68697cadb6626cdf2 release-1.19.4
-8e5b068f761cd512d10c9671fbde0b568c1fd08b release-1.19.5
-f618488eb769e0ed74ef0d93cd118d2ad79ef94d release-1.19.6
-3fa6e2095a7a51acc630517e1c27a7b7ac41f7b3 release-1.19.7
-8c65d21464aaa5923775f80c32474adc7a320068 release-1.19.8
-da571b8eaf8f30f36c43b3c9b25e01e31f47149c release-1.19.9
-ffcbb9980ee2bad27b4d7b1cd680b14ff47b29aa release-1.19.10
-df34dcc9ac072ffd0945e5a1f3eb7987e8275375 release-1.21.0
-a68ac0677f8553b1f84d357bc9da114731ab5f47 release-1.21.1
-bfbc52374adcbf2f9060afd62de940f6fab3bba5 release-1.21.2
-2217a9c1d0b86026f22700b3c089545db1964f55 release-1.21.3
-39be8a682c58308d9399cddd57e37f9fdb7bdf3e release-1.21.4
-d986378168fd4d70e0121cabac274c560cca9bdf release-1.21.5
-714eb4b2c09e712fb2572a2164ce2bf67638ccac release-1.21.6
-5da2c0902e8e2aa4534008a582a60c61c135960e release-1.23.0
-a63d0a70afea96813ba6667997bc7d68b5863f0d release-1.23.1
-aa901551a7ebad1e8b0f8c11cb44e3424ba29707 release-1.23.2
-ff3afd1ce6a6b65057741df442adfaa71a0e2588 release-1.23.3
-ac779115ed6ee4f3039e9aea414a54e560450ee2 release-1.23.4
-12dcf92b0c2c68552398f19644ce3104459807d7 release-1.25.0
-f8134640e8615448205785cf00b0bc810489b495 release-1.25.1
-1d839f05409d1a50d0f15a2bf36547001f99ae40 release-1.25.2
-294a3d07234f8f65d7b0e0b0e2c5b05c12c5da0a release-1.25.3
-173a0a7dbce569adbb70257c6ec4f0f6bc585009 release-1.25.4
-8618e4d900cc71082fbe7dc72af087937d64faf5 release-1.25.5
-a58202a8c41bf0bd97eef1b946e13105a105520d release-1.26.0
-a63c124e34bcf2d1d1feb8d40ff075103b967c4c release-1.26.1
-e4c5da06073ca24e2ffc5c8f8b8d7833a926356f release-1.26.2
--- a/1781
+++ b/1781
--- a/CHANGES.ru
+++ b/CHANGES.ru
--- a/4
+++ b/4
@ -1,6 +1,6 @@
 /* 
- * Copyright (C) 2002-2021 Igor Sysoev
- * Copyright (C) 2011-2024 Nginx, Inc.
+ * Copyright (C) 2002-2016 Igor Sysoev
+ * Copyright (C) 2011-2016 Nginx, Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/auto/cc/acc
+++ b/auto/cc/acc
@ -12,3 +12,4 @@ CC_TEST_FLAGS="-Ae"

 PCRE_OPT="$PCRE_OPT -Ae"
 ZLIB_OPT="$ZLIB_OPT -Ae"
+MD5_OPT="$MD5_OPT -Ae"
--- a/auto/cc/bcc
+++ b/auto/cc/bcc
@ -62,6 +62,7 @@ ngx_include_opt="-I"
 ngx_objout="-o"
 ngx_binout="-e"
 ngx_objext="obj"
+ngx_binext=".exe"

 ngx_long_start='@&&|
 	'
--- a/auto/cc/clang
+++ b/auto/cc/clang
@ -5,9 +5,8 @@
 # clang


-NGX_CLANG_VER=`$CC -v 2>&1 | grep 'version' 2>&1 \
-                           | sed -n -e 's/^.*clang version \(.*\)/\1/p' \
-                                    -e 's/^.*LLVM version \(.*\)/\1/p'`
+NGX_CLANG_VER=`$CC -v 2>&1 | grep '\(clang\|LLVM\) version' 2>&1 \
+                           | sed -e 's/^.* version \(.*\)/\1/'`

 echo " + clang version: $NGX_CLANG_VER"

@ -67,6 +66,12 @@ else
    PCRE_OPT="$PCRE_OPT -pipe"
 fi

+if [ ".$MD5_OPT" = "." ]; then
+    MD5_OPT="-O2 -pipe $CPU_OPT"
+else
+    MD5_OPT="$MD5_OPT -pipe"
+fi
+
 if [ ".$ZLIB_OPT" = "." ]; then
    ZLIB_OPT="-O2 -pipe $CPU_OPT"
 else
--- a/auto/cc/conf
+++ b/auto/cc/conf
@ -117,7 +117,7 @@ else
            . auto/cc/acc
        ;;

-        msvc)
+        msvc*)
            # MSVC++ 6.0 SP2, MSVC++ Toolkit 2003

            . auto/cc/msvc
@ -178,25 +178,21 @@ if [ "$NGX_PLATFORM" != win32 ]; then
    fi


-    if [ "$NGX_CC_NAME" = "sunc" ]; then
-        echo "checking for gcc builtin atomic operations ... disabled"
-    else
-        ngx_feature="gcc builtin atomic operations"
-        ngx_feature_name=NGX_HAVE_GCC_ATOMIC
-        ngx_feature_run=yes
-        ngx_feature_incs=
-        ngx_feature_path=
-        ngx_feature_libs=
-        ngx_feature_test="long  n = 0;
-                          if (!__sync_bool_compare_and_swap(&n, 0, 1))
-                              return 1;
-                          if (__sync_fetch_and_add(&n, 1) != 1)
-                              return 1;
-                          if (n != 2)
-                              return 1;
-                          __sync_synchronize();"
-        . auto/feature
-    fi
+    ngx_feature="gcc builtin atomic operations"
+    ngx_feature_name=NGX_HAVE_GCC_ATOMIC
+    ngx_feature_run=yes
+    ngx_feature_incs=
+    ngx_feature_path=
+    ngx_feature_libs=
+    ngx_feature_test="long  n = 0;
+                      if (!__sync_bool_compare_and_swap(&n, 0, 1))
+                          return 1;
+                      if (__sync_fetch_and_add(&n, 1) != 1)
+                          return 1;
+                      if (n != 2)
+                          return 1;
+                      __sync_synchronize();"
+    . auto/feature


    if [ "$NGX_CC_NAME" = "ccc" ]; then
@ -213,7 +209,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
                          var(0, buf, \"%d\", 1);
                          if (buf[0] != '1') return 1"
        . auto/feature
-    fi
+     fi


    ngx_feature="gcc variadic macros"
@ -235,7 +231,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
    ngx_feature_incs=
    ngx_feature_path=
    ngx_feature_libs=
-    ngx_feature_test="if (__builtin_bswap64(0)) return 1"
+    ngx_feature_test="__builtin_bswap64(0)"
    . auto/feature


--- a/auto/cc/gcc
+++ b/auto/cc/gcc
@ -128,6 +128,12 @@ else
    PCRE_OPT="$PCRE_OPT $PIPE"
 fi

+if [ ".$MD5_OPT" = "." ]; then
+    MD5_OPT="-O2 -fomit-frame-pointer $PIPE $CPU_OPT"
+else
+    MD5_OPT="$MD5_OPT $PIPE"
+fi
+
 if [ ".$ZLIB_OPT" = "." ]; then
    ZLIB_OPT="-O2 -fomit-frame-pointer $PIPE $CPU_OPT"
 else
@ -145,13 +151,9 @@ CFLAGS="$CFLAGS -Wall -Wpointer-arith"
 #CFLAGS="$CFLAGS -Winline"
 #CFLAGS="$CFLAGS -Wmissing-prototypes"

-case "$NGX_GCC_VER" in
-    2.*)
-        # we have a lot of the unused function arguments
-        CFLAGS="$CFLAGS -Wno-unused"
-    ;;

-    *)
+case "$NGX_GCC_VER" in
+    [3-5].*)
        # we have a lot of the unused function arguments
        CFLAGS="$CFLAGS -Wno-unused-parameter"
        # 4.2.1 shows the warning in wrong places
@ -162,6 +164,11 @@ case "$NGX_GCC_VER" in
            CFLAGS="$CFLAGS -Wno-deprecated-declarations"
        fi
    ;;
+
+    *)
+        # we have a lot of the unused function arguments
+        CFLAGS="$CFLAGS -Wno-unused"
+    ;;
 esac


--- a/auto/cc/icc
+++ b/auto/cc/icc
@ -43,6 +43,10 @@ if [ ".$PCRE_OPT" = "." ]; then
    PCRE_OPT="-O $CPU_OPT"
 fi

+if [ ".$MD5_OPT" = "." ]; then
+    MD5_OPT="-O $CPU_OPT"
+fi
+
 if [ ".$ZLIB_OPT" = "." ]; then
    ZLIB_OPT="-O $CPU_OPT"
 fi
--- a/auto/cc/msvc
+++ b/auto/cc/msvc
@ -11,8 +11,8 @@
 # MSVC 2015 (14.0)                        cl 19.00


-NGX_MSVC_VER=`$NGX_WINE $CC 2>&1 | grep 'C/C++.* [0-9][0-9]*\.[0-9]' 2>&1 \
-                                 | sed -e 's/^.* \([0-9][0-9]*\.[0-9].*\)/\1/'`
+NGX_MSVC_VER=`$NGX_WINE $CC 2>&1 | grep 'Compiler Version' 2>&1 \
+                                 | sed -e 's/^.* Version \(.*\)/\1/'`

 echo " + cl version: $NGX_MSVC_VER"

@ -22,21 +22,6 @@ have=NGX_COMPILER value="\"cl $NGX_MSVC_VER\"" . auto/define
 ngx_msvc_ver=`echo $NGX_MSVC_VER | sed -e 's/^\([0-9]*\).*/\1/'`


-# detect x64 builds
-
-case "$NGX_MSVC_VER" in
-
-    *x64)
-        NGX_MACHINE=amd64
-    ;;
-
-    *)
-        NGX_MACHINE=i386
-    ;;
-
-esac
-
-
 # optimizations

 # maximize speed, equivalent to -Og -Oi -Ot -Oy -Ob2 -Gs -GF -Gy
@ -123,7 +108,7 @@ CORE_LIBS="$CORE_LIBS kernel32.lib user32.lib"
 # msvc under Wine issues
 # C1902: Program database manager mismatch; please check your installation
 if [ -z "$NGX_WINE" ]; then
-   CFLAGS="$CFLAGS -Zi -Fd$NGX_OBJS/nginx.pdb"
+   CFLAGS="$CFLAGS -Zi"
   CORE_LINK="$CORE_LINK -debug"
 fi

@ -157,6 +142,7 @@ ngx_pic_opt=
 ngx_objout="-Fo"
 ngx_binout="-Fe"
 ngx_objext="obj"
+ngx_binext=".exe"

 ngx_long_start='@<<
 	'
--- a/auto/cc/name
+++ b/auto/cc/name
@ -44,11 +44,7 @@ elif `$CC -v 2>&1 | grep 'gcc version' >/dev/null 2>&1`; then
    NGX_CC_NAME=gcc
    echo " + using GNU C compiler"

-elif `$CC -v 2>&1 | grep 'clang version' >/dev/null 2>&1`; then
-    NGX_CC_NAME=clang
-    echo " + using Clang C compiler"
-
-elif `$CC -v 2>&1 | grep 'LLVM version' >/dev/null 2>&1`; then
+elif `$CC -v 2>&1 | grep '\(clang\|LLVM\) version' >/dev/null 2>&1`; then
    NGX_CC_NAME=clang
    echo " + using Clang C compiler"

--- a/auto/cc/owc
+++ b/auto/cc/owc
@ -84,6 +84,7 @@ ngx_include_opt="-i="
 ngx_objout="-fo"
 ngx_binout="-fe="
 ngx_objext="obj"
+ngx_binext=".exe"

 ngx_regex_dirsep='\\'
 ngx_dirsep="\\"
--- a/auto/cc/sunc
+++ b/auto/cc/sunc
@ -8,10 +8,7 @@
 # Sun C 5.9 SunOS_i386 2007/05/03         Sun Studio 12
 # Sun C 5.9 SunOS_sparc 2007/05/03
 # Sun C 5.10 SunOS_i386 2009/06/03        Sun Studio 12.1
-# Sun C 5.11 SunOS_i386 2010/08/13        Oracle Solaris Studio 12.2
-# Sun C 5.12 SunOS_i386 2011/11/16        Oracle Solaris Studio 12.3
-# Sun C 5.13 SunOS_i386 2014/10/20        Oracle Solaris Studio 12.4
-# Sun C 5.14 SunOS_i386 2016/05/31        Oracle Developer Studio 12.5
+# Sun C 5.11 SunOS_i386 2010/08/13        Sun Studio 12.2

 NGX_SUNC_VER=`$CC -V 2>&1 | grep 'Sun C' 2>&1 \
                          | sed -e 's/^.* Sun C \(.*\)/\1/'`
@ -23,10 +20,7 @@ have=NGX_COMPILER value="\"Sun C $NGX_SUNC_VER\"" . auto/define

 cat << END > $NGX_AUTOTEST.c

-int main(void) {
-    printf("%d", __SUNPRO_C);
-    return 0;
-}
+int main() { printf("%d", __SUNPRO_C); }

 END

@ -151,6 +145,10 @@ if [ ".$PCRE_OPT" = "." ]; then
    PCRE_OPT="$ngx_fast $IPO $CPU_OPT"
 fi

+if [ ".$MD5_OPT" = "." ]; then
+    MD5_OPT="$ngx_fast $IPO $CPU_OPT"
+fi
+
 if [ ".$ZLIB_OPT" = "." ]; then
    ZLIB_OPT="$ngx_fast $IPO $CPU_OPT"
 fi
--- a/auto/endianness
+++ b/auto/endianness
@ -15,7 +15,7 @@ END

 cat << END > $NGX_AUTOTEST.c

-int main(void) {
+int main() {
    int i = 0x11223344;
    char *p;

--- a/auto/feature
+++ b/auto/feature
@ -31,7 +31,7 @@ cat << END > $NGX_AUTOTEST.c
 $NGX_INCLUDE_UNISTD_H
 $ngx_feature_incs

-int main(void) {
+int main() {
    $ngx_feature_test;
    return 0;
 }
--- a/auto/include
+++ b/auto/include
@ -20,7 +20,7 @@ cat << END > $NGX_AUTOTEST.c
 $NGX_INCLUDE_SYS_PARAM_H
 #include <$ngx_include>

-int main(void) {
+int main() {
    return 0;
 }

@ -45,6 +45,9 @@ if [ -x $NGX_AUTOTEST ]; then

    eval "NGX_INCLUDE_$ngx_name='#include <$ngx_include>'"

+    #STUB
+    eval "NGX_$ngx_name='#include <$ngx_include>'"
+
 else
    echo " not found"

--- a/auto/init
+++ b/auto/init
@ -48,6 +48,4 @@ default:	build

 clean:
 	rm -rf Makefile $NGX_OBJS
-
-.PHONY:	default clean
 END
--- a/auto/install
+++ b/auto/install
@ -112,7 +112,7 @@ install:	build $NGX_INSTALL_PERL_MODULES
 	test ! -f '\$(DESTDIR)$NGX_SBIN_PATH' \\
 		|| mv '\$(DESTDIR)$NGX_SBIN_PATH' \\
 			'\$(DESTDIR)$NGX_SBIN_PATH.old'
-	cp $NGX_OBJS/nginx$ngx_binext '\$(DESTDIR)$NGX_SBIN_PATH'
+	cp $NGX_OBJS/nginx '\$(DESTDIR)$NGX_SBIN_PATH'

 	test -d '\$(DESTDIR)$NGX_CONF_PREFIX' \\
 		|| mkdir -p '\$(DESTDIR)$NGX_CONF_PREFIX'
@ -215,6 +215,4 @@ upgrade:
 	test -f $NGX_PID_PATH.oldbin

 	kill -QUIT \`cat $NGX_PID_PATH.oldbin\`
-
-.PHONY:	build install modules upgrade
 END
--- a/auto/lib/conf
+++ b/auto/lib/conf
@ -7,7 +7,7 @@ if [ $USE_PCRE = YES -o $PCRE != NONE ]; then
    . auto/lib/pcre/conf

 else
-    if [ $USE_PCRE = DISABLED -a $HTTP = YES -a $HTTP_REWRITE = YES ]; then
+    if [ $USE_PCRE = DISABLED -a $HTTP_REWRITE = YES ]; then

 cat << END

@ -25,6 +25,35 @@ if [ $USE_OPENSSL = YES ]; then
    . auto/lib/openssl/conf
 fi

+if [ $USE_MD5 = YES ]; then
+
+    if [ $USE_OPENSSL = YES ]; then
+        have=NGX_HAVE_OPENSSL_MD5_H . auto/have
+        have=NGX_OPENSSL_MD5 . auto/have
+        have=NGX_HAVE_MD5 . auto/have
+        MD5=YES
+        MD5_LIB=OpenSSL
+
+    else
+        . auto/lib/md5/conf
+    fi
+
+fi
+
+if [ $USE_SHA1 = YES ]; then
+
+    if [ $USE_OPENSSL = YES ]; then
+        have=NGX_HAVE_OPENSSL_SHA1_H . auto/have
+        have=NGX_HAVE_SHA1 . auto/have
+        SHA1=YES
+        SHA1_LIB=OpenSSL
+
+    else
+        . auto/lib/sha1/conf
+    fi
+
+fi
+
 if [ $USE_ZLIB = YES ]; then
    . auto/lib/zlib/conf
 fi
--- a/auto/lib/geoip/conf
+++ b/auto/lib/geoip/conf
@ -64,23 +64,6 @@ if [ $ngx_found = no ]; then
 fi


-if [ $ngx_found = no ]; then
-
-    # Homebrew on Apple Silicon
-
-    ngx_feature="GeoIP library in /opt/homebrew/"
-    ngx_feature_path="/opt/homebrew/include"
-
-    if [ $NGX_RPATH = YES ]; then
-        ngx_feature_libs="-R/opt/homebrew/lib -L/opt/homebrew/lib -lGeoIP"
-    else
-        ngx_feature_libs="-L/opt/homebrew/lib -lGeoIP"
-    fi
-
-    . auto/feature
-fi
-
-
 if [ $ngx_found = yes ]; then

    CORE_INCS="$CORE_INCS $ngx_feature_path"
@ -91,15 +74,17 @@ if [ $ngx_found = yes ]; then

    NGX_LIB_GEOIP=$ngx_feature_libs

-    ngx_feature="GeoIP IPv6 support"
-    ngx_feature_name="NGX_HAVE_GEOIP_V6"
-    ngx_feature_run=no
-    ngx_feature_incs="#include <stdio.h>
-                      #include <GeoIP.h>"
-    #ngx_feature_path=
-    #ngx_feature_libs=
-    ngx_feature_test="printf(\"%d\", GEOIP_CITY_EDITION_REV0_V6);"
-    . auto/feature
+    if [ $NGX_IPV6 = YES ]; then
+        ngx_feature="GeoIP IPv6 support"
+        ngx_feature_name="NGX_HAVE_GEOIP_V6"
+        ngx_feature_run=no
+        ngx_feature_incs="#include <stdio.h>
+                          #include <GeoIP.h>"
+        #ngx_feature_path=
+        #ngx_feature_libs=
+        ngx_feature_test="printf(\"%d\", GEOIP_CITY_EDITION_REV0_V6);"
+        . auto/feature
+    fi

 else

--- a/auto/lib/google-perftools/conf
+++ b/auto/lib/google-perftools/conf
@ -9,8 +9,7 @@
    ngx_feature_incs=
    ngx_feature_path=
    ngx_feature_libs="-lprofiler"
-    ngx_feature_test="void ProfilerStop(void);
-                      ProfilerStop()"
+    ngx_feature_test="ProfilerStop()"
    . auto/feature


@ -46,22 +45,6 @@ if [ $ngx_found = no ]; then
 fi


-if [ $ngx_found = no ]; then
-
-    # Homebrew on Apple Silicon
-
-    ngx_feature="Google perftools in /opt/homebrew/"
-
-    if [ $NGX_RPATH = YES ]; then
-        ngx_feature_libs="-R/opt/homebrew/lib -L/opt/homebrew/lib -lprofiler"
-    else
-        ngx_feature_libs="-L/opt/homebrew/lib -lprofiler"
-    fi
-
-    . auto/feature
-fi
-
-
 if [ $ngx_found = yes ]; then
    CORE_LIBS="$CORE_LIBS $ngx_feature_libs"

--- a/auto/lib/libatomic/conf
+++ b/auto/lib/libatomic/conf
@ -7,8 +7,8 @@ if [ $NGX_LIBATOMIC != YES ]; then

    have=NGX_HAVE_LIBATOMIC . auto/have
    CORE_INCS="$CORE_INCS $NGX_LIBATOMIC/src"
-    LINK_DEPS="$LINK_DEPS $NGX_LIBATOMIC/build/lib/libatomic_ops.a"
-    CORE_LIBS="$CORE_LIBS $NGX_LIBATOMIC/build/lib/libatomic_ops.a"
+    LINK_DEPS="$LINK_DEPS $NGX_LIBATOMIC/src/libatomic_ops.a"
+    CORE_LIBS="$CORE_LIBS $NGX_LIBATOMIC/src/libatomic_ops.a"

 else

@ -19,7 +19,7 @@ else
                      #include <atomic_ops.h>"
    ngx_feature_path=
    ngx_feature_libs="-latomic_ops"
-    ngx_feature_test="AO_t  n = 0;
+    ngx_feature_test="long  n = 0;
                      if (!AO_compare_and_swap(&n, 0, 1))
                          return 1;
                      if (AO_fetch_and_add(&n, 1) != 1)
--- a/auto/lib/libatomic/make
+++ b/auto/lib/libatomic/make
@ -3,19 +3,14 @@
 # Copyright (C) Nginx, Inc.


-    case $NGX_LIBATOMIC in
-        /*) ngx_prefix="$NGX_LIBATOMIC/build" ;;
-        *)  ngx_prefix="$PWD/$NGX_LIBATOMIC/build" ;;
-    esac
-
    cat << END                                            >> $NGX_MAKEFILE

-$NGX_LIBATOMIC/build/lib/libatomic_ops.a:	$NGX_LIBATOMIC/Makefile
-	cd $NGX_LIBATOMIC && \$(MAKE) && \$(MAKE) install
+$NGX_LIBATOMIC/src/libatomic_ops.a:	$NGX_LIBATOMIC/Makefile
+	cd $NGX_LIBATOMIC && \$(MAKE)

 $NGX_LIBATOMIC/Makefile:	$NGX_MAKEFILE
 	cd $NGX_LIBATOMIC \\
 	&& if [ -f Makefile ]; then \$(MAKE) distclean; fi \\
-	&& ./configure --prefix=$ngx_prefix
+	&& ./configure

 END
--- a/auto/lib/libgd/conf
+++ b/auto/lib/libgd/conf
@ -9,8 +9,7 @@
    ngx_feature_incs="#include <gd.h>"
    ngx_feature_path=
    ngx_feature_libs="-lgd"
-    ngx_feature_test="gdImagePtr img = gdImageCreateFromGifPtr(1, NULL);
-                      (void) img"
+    ngx_feature_test="gdImagePtr img = gdImageCreateFromGifPtr(1, NULL);"
    . auto/feature


@ -65,23 +64,6 @@ if [ $ngx_found = no ]; then
 fi


-if [ $ngx_found = no ]; then
-
-    # Homebrew on Apple Silicon
-
-    ngx_feature="GD library in /opt/homebrew/"
-    ngx_feature_path="/opt/homebrew/include"
-
-    if [ $NGX_RPATH = YES ]; then
-        ngx_feature_libs="-R/opt/homebrew/lib -L/opt/homebrew/lib -lgd"
-    else
-        ngx_feature_libs="-L/opt/homebrew/lib -lgd"
-    fi
-
-    . auto/feature
-fi
-
-
 if [ $ngx_found = yes ]; then

    CORE_INCS="$CORE_INCS $ngx_feature_path"
@ -92,12 +74,6 @@ if [ $ngx_found = yes ]; then

    NGX_LIB_LIBGD=$ngx_feature_libs

-    ngx_feature="GD WebP support"
-    ngx_feature_name="NGX_HAVE_GD_WEBP"
-    ngx_feature_test="gdImagePtr img = gdImageCreateFromWebpPtr(1, NULL);
-                      (void) img"
-    . auto/feature
-
 else

 cat << END
--- a/auto/lib/libxslt/conf
+++ b/auto/lib/libxslt/conf
@ -16,8 +16,8 @@
    ngx_feature_libs="-lxml2 -lxslt"
    ngx_feature_test="xmlParserCtxtPtr    ctxt = NULL;
                      xsltStylesheetPtr   sheet = NULL;
-                      xmlDocPtr           doc = NULL;
-                      xmlParseChunk(ctxt, NULL, 0, 0);
+                      xmlDocPtr           doc;
+                      doc = xmlParseChunk(ctxt, NULL, 0, 0);
                      xsltApplyStylesheet(sheet, doc, NULL);"
    . auto/feature

--- a/auto/lib/make
+++ b/auto/lib/make
@ -7,6 +7,14 @@ if [ $PCRE != NONE -a $PCRE != NO -a $PCRE != YES ]; then
    . auto/lib/pcre/make
 fi

+if [ $MD5 != NONE -a $MD5 != NO -a $MD5 != YES ]; then
+    . auto/lib/md5/make
+fi
+
+if [ $SHA1 != NONE -a $SHA1 != NO -a $SHA1 != YES ]; then
+    . auto/lib/sha1/make
+fi
+
 if [ $OPENSSL != NONE -a $OPENSSL != NO -a $OPENSSL != YES ]; then
    . auto/lib/openssl/make
 fi
--- a/auto/lib/md5/conf
+++ b/auto/lib/md5/conf
@ -0,0 +1,103 @@
+
+# Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
+
+
+if [ $MD5 != NONE ]; then
+
+    if grep MD5_Init $MD5/md5.h 2>&1 >/dev/null; then
+        # OpenSSL md5
+        OPENSSL_MD5=YES
+        have=NGX_HAVE_OPENSSL_MD5 . auto/have
+        have=NGX_OPENSSL_MD5 . auto/have
+    else
+        # rsaref md5
+        OPENSSL_MD5=NO
+    fi
+
+    have=NGX_HAVE_MD5 . auto/have
+    CORE_INCS="$CORE_INCS $MD5"
+
+    case "$NGX_CC_NAME" in
+
+        msvc | owc | bcc)
+            LINK_DEPS="$LINK_DEPS $MD5/md5.lib"
+            CORE_LIBS="$CORE_LIBS $MD5/md5.lib"
+        ;;
+
+        icc)
+            LINK_DEPS="$LINK_DEPS $MD5/libmd5.a"
+
+            # to allow -ipo optimization we link with the *.o but not library
+            CORE_LIBS="$CORE_LIBS $MD5/md5_dgst.o"
+
+            if [ $MD5_ASM = YES ]; then
+                CORE_LIBS="$CORE_LIBS $MD5/asm/mx86-elf.o"
+            fi
+        ;;
+
+        *)
+            LINK_DEPS="$LINK_DEPS $MD5/libmd5.a"
+            CORE_LIBS="$CORE_LIBS $MD5/libmd5.a"
+            #CORE_LIBS="$CORE_LIBS -L $MD5 -lmd5"
+        ;;
+
+    esac
+
+else
+
+    if [ "$NGX_PLATFORM" != win32 ]; then
+
+            MD5=NO
+
+            # FreeBSD, Solaris 10
+
+            ngx_feature="md5 in system md library"
+            ngx_feature_name=NGX_HAVE_MD5
+            ngx_feature_run=no
+            ngx_feature_incs="#include <md5.h>"
+            ngx_feature_path=
+            ngx_feature_libs="-lmd"
+            ngx_feature_test="MD5_CTX md5; MD5Init(&md5)"
+            . auto/feature
+
+            ngx_md5_lib="system md"
+
+        if [ $ngx_found = no ]; then
+
+            # Solaris 8/9
+
+            ngx_feature="md5 in system md5 library"
+            ngx_feature_libs="-lmd5"
+            . auto/feature
+
+            ngx_md5_lib="system md5"
+        fi
+
+        if [ $ngx_found = no ]; then
+
+            # OpenSSL crypto library
+
+            ngx_feature="md5 in system OpenSSL crypto library"
+            ngx_feature_name="NGX_OPENSSL_MD5"
+            ngx_feature_incs="#include <openssl/md5.h>"
+            ngx_feature_libs="-lcrypto"
+            ngx_feature_test="MD5_CTX md5; MD5_Init(&md5)"
+            . auto/feature
+
+            ngx_md5_lib="system crypto"
+
+            if [ $ngx_found = yes ]; then
+                have=NGX_HAVE_OPENSSL_MD5_H . auto/have
+                have=NGX_HAVE_MD5 . auto/have
+            fi
+        fi
+
+        if [ $ngx_found = yes ]; then
+            CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
+            MD5=YES
+            MD5_LIB=$ngx_md5_lib
+        fi
+    fi
+
+fi
--- a/auto/lib/md5/make
+++ b/auto/lib/md5/make
@ -0,0 +1,96 @@
+
+# Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
+
+
+case "$NGX_CC_NAME" in
+
+    msvc)
+        ngx_makefile=makefile.msvc
+        ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC MD5_ASM=$MD5_ASM"
+        ngx_md5="MD5=\"$MD5\""
+    ;;
+
+    owc)
+        ngx_makefile=makefile.owc
+        ngx_opt="CPU_OPT=\"$CPU_OPT\""
+        ngx_md5=`echo MD5=\"$MD5\" | sed -e "s/\//$ngx_regex_dirsep/g"`
+    ;;
+
+    bcc)
+        ngx_makefile=makefile.bcc
+        ngx_opt="-DCPU_OPT=\"$CPU_OPT\" -DMD5_ASM=$MD5_ASM"
+        ngx_md5=`echo \-DMD5=\"$MD5\" | sed -e "s/\//$ngx_regex_dirsep/g"`
+    ;;
+
+esac
+
+
+done=NO
+
+
+case "$NGX_PLATFORM" in
+
+    win32)
+        cat << END                                        >> $NGX_MAKEFILE
+
+`echo "$MD5/md5.lib:	$NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"`
+	\$(MAKE) -f auto/lib/md5/$ngx_makefile $ngx_opt $ngx_md5
+
+END
+
+        done=YES
+    ;;
+
+    SunOS:*:i86pc)
+        if [ $MD5_ASM = YES ]; then
+
+            cat << END                                        >> $NGX_MAKEFILE
+
+$MD5/libmd5.a:	$NGX_MAKEFILE
+	cd $MD5 \\
+	&& \$(MAKE) CFLAGS="$MD5_OPT -DSOL -DMD5_ASM -DL_ENDIAN" \\
+		CC="\$(CC)" CPP="\$(CPP)" \\
+		MD5_ASM_OBJ=asm/mx86-sol.o clean libmd5.a
+
+END
+
+            done=YES
+        fi
+    ;;
+
+    # FreeBSD: i386
+    # Linux: i686
+
+    *:i386 | *:i686)
+        if [ $MD5_ASM = YES ]; then
+
+            cat << END                                        >> $NGX_MAKEFILE
+
+$MD5/libmd5.a:	$NGX_MAKEFILE
+	cd $MD5 \\
+	&& \$(MAKE) CFLAGS="$MD5_OPT -DELF -DMD5_ASM -DL_ENDIAN" \\
+		CC="\$(CC)" CPP="\$(CPP)" \\
+		MD5_ASM_OBJ=asm/mx86-elf.o clean libmd5.a
+
+END
+
+            done=YES
+        fi
+    ;;
+
+esac
+
+
+if [ $done = NO ]; then
+
+    cat << END                                                >> $NGX_MAKEFILE
+
+$MD5/libmd5.a:	$NGX_MAKEFILE
+	cd $MD5 \\
+	&& \$(MAKE) CFLAGS="$MD5_OPT" \\
+		CC="\$(CC)" MD5_ASM_OBJ= clean libmd5.a
+
+END
+
+fi
--- a/auto/lib/md5/makefile.bcc
+++ b/auto/lib/md5/makefile.bcc
@ -0,0 +1,22 @@
+
+# Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
+
+
+CFLAGS = -q -O2 -tWM $(CPU_OPT) -DL_ENDIAN
+
+!if "$(MD5_ASM)" == "YES"
+
+md5.lib:
+	cd $(MD5)
+	bcc32 -c $(CFLAGS) -DMD5_ASM md5_dgst.c
+	tlib md5.lib +md5_dgst.obj +"asm\m-win32.obj"
+
+!else
+
+md5.lib:
+	cd $(MD5)
+	bcc32 -c $(CFLAGS) md5_dgst.c
+	tlib md5.lib +md5_dgst.obj
+
+!endif
--- a/auto/lib/md5/makefile.msvc
+++ b/auto/lib/md5/makefile.msvc
@ -0,0 +1,22 @@
+
+# Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
+
+
+CFLAGS = -nologo -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT) -D L_ENDIAN
+
+!IF "$(MD5_ASM)" == "YES"
+
+md5.lib:
+	cd $(MD5)
+	cl -c $(CFLAGS) -D MD5_ASM md5_dgst.c
+	link -lib -out:md5.lib md5_dgst.obj asm/m-win32.obj
+
+!ELSE
+
+md5.lib:
+	cd $(MD5)
+	cl -c $(CFLAGS) md5_dgst.c
+	link -lib -out:md5.lib md5_dgst.obj
+
+!ENDIF
--- a/auto/lib/md5/makefile.owc
+++ b/auto/lib/md5/makefile.owc
@ -0,0 +1,11 @@
+
+# Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
+
+
+CFLAGS = -zq -bt=nt -bm -ot -op -oi -oe -s $(CPU_OPT)
+
+md5.lib:
+	cd $(MD5)
+	wcl386 -c $(CFLAGS) -dL_ENDIAN md5_dgst.c
+	wlib -n md5.lib md5_dgst.obj
--- a/auto/lib/openssl/conf
+++ b/auto/lib/openssl/conf
@ -5,33 +5,18 @@

 if [ $OPENSSL != NONE ]; then

-    have=NGX_OPENSSL . auto/have
-    have=NGX_SSL . auto/have
-
-    have=NGX_OPENSSL_NO_CONFIG . auto/have
-
-    if [ $USE_OPENSSL_QUIC = YES ]; then
-        have=NGX_QUIC . auto/have
-        have=NGX_QUIC_OPENSSL_COMPAT . auto/have
-    fi
-
    case "$CC" in

        cl | bcc32)
+            have=NGX_OPENSSL . auto/have
+            have=NGX_SSL . auto/have
+
            CFLAGS="$CFLAGS -DNO_SYS_TYPES_H"

            CORE_INCS="$CORE_INCS $OPENSSL/openssl/include"
            CORE_DEPS="$CORE_DEPS $OPENSSL/openssl/include/openssl/ssl.h"
-
-            if [ -f $OPENSSL/ms/do_ms.bat ]; then
-                # before OpenSSL 1.1.0
-                CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/ssleay32.lib"
-                CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libeay32.lib"
-            else
-                # OpenSSL 1.1.0+
-                CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libssl.lib"
-                CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libcrypto.lib"
-            fi
+            CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/ssleay32.lib"
+            CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libeay32.lib"

            # libeay32.lib requires gdi32.lib
            CORE_LIBS="$CORE_LIBS gdi32.lib"
@ -40,12 +25,14 @@ if [ $OPENSSL != NONE ]; then
        ;;

        *)
+            have=NGX_OPENSSL . auto/have
+            have=NGX_SSL . auto/have
+
            CORE_INCS="$CORE_INCS $OPENSSL/.openssl/include"
            CORE_DEPS="$CORE_DEPS $OPENSSL/.openssl/include/openssl/ssl.h"
            CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libssl.a"
            CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libcrypto.a"
            CORE_LIBS="$CORE_LIBS $NGX_LIBDL"
-            CORE_LIBS="$CORE_LIBS $NGX_LIBPTHREAD"

            if [ "$NGX_PLATFORM" = win32 ]; then
                CORE_LIBS="$CORE_LIBS -lgdi32 -lcrypt32 -lws2_32"
@ -64,7 +51,7 @@ else
        ngx_feature_run=no
        ngx_feature_incs="#include <openssl/ssl.h>"
        ngx_feature_path=
-        ngx_feature_libs="-lssl -lcrypto $NGX_LIBDL $NGX_LIBPTHREAD"
+        ngx_feature_libs="-lssl -lcrypto $NGX_LIBDL"
        ngx_feature_test="SSL_CTX_set_options(NULL, 0)"
        . auto/feature

@ -76,13 +63,11 @@ else
            ngx_feature_path="/usr/local/include"

            if [ $NGX_RPATH = YES ]; then
-                ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lssl -lcrypto"
+                ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lssl -lcrypto $NGX_LIBDL"
            else
-                ngx_feature_libs="-L/usr/local/lib -lssl -lcrypto"
+                ngx_feature_libs="-L/usr/local/lib -lssl -lcrypto $NGX_LIBDL"
            fi

-            ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD"
-
            . auto/feature
        fi

@ -94,13 +79,11 @@ else
            ngx_feature_path="/usr/pkg/include"

            if [ $NGX_RPATH = YES ]; then
-                ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lssl -lcrypto"
+                ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lssl -lcrypto $NGX_LIBDL"
            else
-                ngx_feature_libs="-L/usr/pkg/lib -lssl -lcrypto"
+                ngx_feature_libs="-L/usr/pkg/lib -lssl -lcrypto $NGX_LIBDL"
            fi

-            ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD"
-
            . auto/feature
        fi

@ -112,31 +95,11 @@ else
            ngx_feature_path="/opt/local/include"

            if [ $NGX_RPATH = YES ]; then
-                ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -lssl -lcrypto"
+                ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -lssl -lcrypto $NGX_LIBDL"
            else
-                ngx_feature_libs="-L/opt/local/lib -lssl -lcrypto"
+                ngx_feature_libs="-L/opt/local/lib -lssl -lcrypto $NGX_LIBDL"
            fi

-            ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD"
-
-            . auto/feature
-        fi
-
-        if [ $ngx_found = no ]; then
-
-            # Homebrew on Apple Silicon
-
-            ngx_feature="OpenSSL library in /opt/homebrew/"
-            ngx_feature_path="/opt/homebrew/include"
-
-            if [ $NGX_RPATH = YES ]; then
-                ngx_feature_libs="-R/opt/homebrew/lib -L/opt/homebrew/lib -lssl -lcrypto"
-            else
-                ngx_feature_libs="-L/opt/homebrew/lib -lssl -lcrypto"
-            fi
-
-            ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD"
-
            . auto/feature
        fi

@ -145,35 +108,6 @@ else
            CORE_INCS="$CORE_INCS $ngx_feature_path"
            CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
            OPENSSL=YES
-
-            if [ $USE_OPENSSL_QUIC = YES ]; then
-
-                ngx_feature="OpenSSL QUIC support"
-                ngx_feature_name="NGX_QUIC"
-                ngx_feature_test="SSL_set_quic_method(NULL, NULL)"
-                . auto/feature
-
-                if [ $ngx_found = no ]; then
-                    have=NGX_QUIC_OPENSSL_COMPAT . auto/have
-
-                    ngx_feature="OpenSSL QUIC compatibility"
-                    ngx_feature_test="SSL_CTX_add_custom_ext(NULL, 0, 0,
-                                                 NULL, NULL, NULL, NULL, NULL)"
-                    . auto/feature
-                fi
-
-                if [ $ngx_found = no ]; then
-cat << END
-
-$0: error: certain modules require OpenSSL QUIC support.
-You can either do not enable the modules, or install the OpenSSL library with
-QUIC support into the system, or build the OpenSSL library with QUIC support
-statically from the source with nginx by using --with-openssl=<path> option.
-
-END
-                        exit 1
-                fi
-            fi
        fi
    fi

--- a/auto/lib/openssl/make
+++ b/auto/lib/openssl/make
@ -7,24 +7,11 @@ case "$CC" in

    cl)

-        case "$NGX_MACHINE" in
-
-            amd64)
-                OPENSSL_TARGET=VC-WIN64A
-            ;;
-
-            *)
-                OPENSSL_TARGET=VC-WIN32
-            ;;
-
-        esac
-
        cat << END                                            >> $NGX_MAKEFILE

 $OPENSSL/openssl/include/openssl/ssl.h:	$NGX_MAKEFILE
 	\$(MAKE) -f auto/lib/openssl/makefile.msvc			\
-		OPENSSL="$OPENSSL" OPENSSL_OPT="$OPENSSL_OPT"		\
-		OPENSSL_TARGET="$OPENSSL_TARGET"
+		OPENSSL="$OPENSSL" OPENSSL_OPT="$OPENSSL_OPT"

 END

@ -64,7 +51,7 @@ END
 $OPENSSL/.openssl/include/openssl/ssl.h:	$NGX_MAKEFILE
 	cd $OPENSSL \\
 	&& if [ -f Makefile ]; then \$(MAKE) clean; fi \\
-	&& ./config --prefix=$ngx_prefix no-shared no-threads $OPENSSL_OPT \\
+	&& ./config --prefix=$ngx_prefix no-shared $OPENSSL_OPT \\
 	&& \$(MAKE) \\
 	&& \$(MAKE) install_sw LIBDIR=lib

--- a/auto/lib/openssl/makefile.msvc
+++ b/auto/lib/openssl/makefile.msvc
@ -6,16 +6,9 @@
 all:
 	cd $(OPENSSL)

-	perl Configure $(OPENSSL_TARGET) no-shared no-threads		\
-		--prefix="%cd%/openssl" 				\
-		--openssldir="%cd%/openssl/ssl" 			\
-		$(OPENSSL_OPT)
+	perl Configure VC-WIN32 no-shared --prefix=openssl $(OPENSSL_OPT)

-	if exist ms\do_ms.bat (						\
-		ms\do_ms						\
-		&& $(MAKE) -f ms\nt.mak					\
-		&& $(MAKE) -f ms\nt.mak install				\
-	) else (							\
-		$(MAKE)							\
-		&& $(MAKE) install_sw					\
-	)
+	ms\do_ms
+
+	$(MAKE) -f ms\nt.mak
+	$(MAKE) -f ms\nt.mak install
--- a/auto/lib/pcre/conf
+++ b/auto/lib/pcre/conf
@ -4,62 +4,87 @@


 if [ $PCRE != NONE ]; then
+    CORE_INCS="$CORE_INCS $PCRE"

-    if [ -f $PCRE/src/pcre2.h.generic ]; then
+    case "$NGX_CC_NAME" in

-        PCRE_LIBRARY=PCRE2
-
-        have=NGX_PCRE . auto/have
-        have=NGX_PCRE2 . auto/have
-
-        if [ "$NGX_PLATFORM" = win32 ]; then
-            have=PCRE2_STATIC . auto/have
-        fi
-
-        CORE_INCS="$CORE_INCS $PCRE/src/"
-        CORE_DEPS="$CORE_DEPS $PCRE/src/pcre2.h"
-
-        case "$NGX_CC_NAME" in
-
-            msvc)
-                LINK_DEPS="$LINK_DEPS $PCRE/src/pcre2-8.lib"
-                CORE_LIBS="$CORE_LIBS $PCRE/src/pcre2-8.lib"
-            ;;
-
-            *)
-                LINK_DEPS="$LINK_DEPS $PCRE/.libs/libpcre2-8.a"
-                CORE_LIBS="$CORE_LIBS $PCRE/.libs/libpcre2-8.a"
-            ;;
-
-        esac
-
-    else
-
-        PCRE_LIBRARY=PCRE
-
-        have=NGX_PCRE . auto/have
-
-        if [ "$NGX_PLATFORM" = win32 ]; then
+        msvc | owc | bcc)
+            have=NGX_PCRE . auto/have
            have=PCRE_STATIC . auto/have
-        fi
+            CORE_DEPS="$CORE_DEPS $PCRE/pcre.h"
+            LINK_DEPS="$LINK_DEPS $PCRE/pcre.lib"
+            CORE_LIBS="$CORE_LIBS $PCRE/pcre.lib"
+        ;;

-        CORE_INCS="$CORE_INCS $PCRE"
-        CORE_DEPS="$CORE_DEPS $PCRE/pcre.h"
+        icc)
+            have=NGX_PCRE . auto/have
+            CORE_DEPS="$CORE_DEPS $PCRE/pcre.h"

-        case "$NGX_CC_NAME" in
+            LINK_DEPS="$LINK_DEPS $PCRE/.libs/libpcre.a"

-            msvc | owc | bcc)
-                LINK_DEPS="$LINK_DEPS $PCRE/pcre.lib"
-                CORE_LIBS="$CORE_LIBS $PCRE/pcre.lib"
-            ;;
+            echo $ngx_n "checking for PCRE library ...$ngx_c"

-            *)
-                LINK_DEPS="$LINK_DEPS $PCRE/.libs/libpcre.a"
-                CORE_LIBS="$CORE_LIBS $PCRE/.libs/libpcre.a"
-            ;;
+            if [ -f $PCRE/pcre.h ]; then
+                ngx_pcre_ver=`grep PCRE_MAJOR $PCRE/pcre.h \
+                              | sed -e 's/^.*PCRE_MAJOR.* \(.*\)$/\1/'`
+
+            else if [ -f $PCRE/configure.in ]; then
+                ngx_pcre_ver=`grep PCRE_MAJOR= $PCRE/configure.in \
+                              | sed -e 's/^.*=\(.*\)$/\1/'`
+
+            else
+                ngx_pcre_ver=`grep pcre_major, $PCRE/configure.ac \
+                              | sed -e 's/^.*pcre_major,.*\[\(.*\)\].*$/\1/'`
+            fi
+            fi
+
+            echo " $ngx_pcre_ver major version found"
+
+            # to allow -ipo optimization we link with the *.o but not library
+
+            case "$ngx_pcre_ver" in
+                4|5)
+                    CORE_LIBS="$CORE_LIBS $PCRE/pcre.o"
+                ;;
+
+                6)
+                    CORE_LIBS="$CORE_LIBS $PCRE/pcre_chartables.o"
+                    CORE_LIBS="$CORE_LIBS $PCRE/pcre_compile.o"
+                    CORE_LIBS="$CORE_LIBS $PCRE/pcre_exec.o"
+                    CORE_LIBS="$CORE_LIBS $PCRE/pcre_fullinfo.o"
+                    CORE_LIBS="$CORE_LIBS $PCRE/pcre_globals.o"
+                    CORE_LIBS="$CORE_LIBS $PCRE/pcre_tables.o"
+                    CORE_LIBS="$CORE_LIBS $PCRE/pcre_try_flipped.o"
+                ;;
+
+                *)
+                    CORE_LIBS="$CORE_LIBS $PCRE/pcre_chartables.o"
+                    CORE_LIBS="$CORE_LIBS $PCRE/pcre_compile.o"
+                    CORE_LIBS="$CORE_LIBS $PCRE/pcre_exec.o"
+                    CORE_LIBS="$CORE_LIBS $PCRE/pcre_fullinfo.o"
+                    CORE_LIBS="$CORE_LIBS $PCRE/pcre_globals.o"
+                    CORE_LIBS="$CORE_LIBS $PCRE/pcre_tables.o"
+                    CORE_LIBS="$CORE_LIBS $PCRE/pcre_try_flipped.o"
+                    CORE_LIBS="$CORE_LIBS $PCRE/pcre_newline.o"
+                ;;
+
+            esac
+        ;;
+
+        *)
+            have=NGX_PCRE . auto/have
+
+            if [ "$NGX_PLATFORM" = win32 ]; then
+                have=PCRE_STATIC . auto/have
+            fi
+
+            CORE_DEPS="$CORE_DEPS $PCRE/pcre.h"
+            LINK_DEPS="$LINK_DEPS $PCRE/.libs/libpcre.a"
+            CORE_LIBS="$CORE_LIBS $PCRE/.libs/libpcre.a"
+        ;;
+
+    esac

-        esac
-    fi

    if [ $PCRE_JIT = YES ]; then
        have=NGX_HAVE_PCRE_JIT . auto/have
@ -69,48 +94,8 @@ if [ $PCRE != NONE ]; then
 else

    if [ "$NGX_PLATFORM" != win32 ]; then
+
        PCRE=NO
-    fi
-
-    if [ $PCRE = NO -a $PCRE2 != DISABLED ]; then
-
-        ngx_feature="PCRE2 library"
-        ngx_feature_name="NGX_PCRE2"
-        ngx_feature_run=no
-        ngx_feature_incs="#define PCRE2_CODE_UNIT_WIDTH 8
-                          #include <pcre2.h>"
-        ngx_feature_path=
-        ngx_feature_libs="-lpcre2-8"
-        ngx_feature_test="pcre2_code *re;
-                          re = pcre2_compile(NULL, 0, 0, NULL, NULL, NULL);
-                          if (re == NULL) return 1"
-        . auto/feature
-
-        if [ $ngx_found = no ]; then
-
-            # pcre2-config
-
-            ngx_pcre2_prefix=`pcre2-config --prefix 2>/dev/null`
-
-            if [ -n "$ngx_pcre2_prefix" ]; then
-                ngx_feature="PCRE2 library in $ngx_pcre2_prefix"
-                ngx_feature_path=`pcre2-config --cflags \
-                                  | sed -n -e 's/.*-I *\([^ ][^ ]*\).*/\1/p'`
-                ngx_feature_libs=`pcre2-config --libs8`
-                . auto/feature
-            fi
-        fi
-
-        if [ $ngx_found = yes ]; then
-            have=NGX_PCRE . auto/have
-            CORE_INCS="$CORE_INCS $ngx_feature_path"
-            CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
-            PCRE=YES
-            PCRE_LIBRARY=PCRE2
-        fi
-    fi
-
-    if [ $PCRE = NO ]; then

        ngx_feature="PCRE library"
        ngx_feature_name="NGX_PCRE"
@ -182,27 +167,10 @@ else
            . auto/feature
        fi

-        if [ $ngx_found = no ]; then
-
-            # Homebrew on Apple Silicon
-
-            ngx_feature="PCRE library in /opt/homebrew/"
-            ngx_feature_path="/opt/homebrew/include"
-
-            if [ $NGX_RPATH = YES ]; then
-                ngx_feature_libs="-R/opt/homebrew/lib -L/opt/homebrew/lib -lpcre"
-            else
-                ngx_feature_libs="-L/opt/homebrew/lib -lpcre"
-            fi
-
-            . auto/feature
-        fi
-
        if [ $ngx_found = yes ]; then
            CORE_INCS="$CORE_INCS $ngx_feature_path"
            CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
            PCRE=YES
-            PCRE_LIBRARY=PCRE
        fi

        if [ $PCRE = YES ]; then
--- a/auto/lib/pcre/make
+++ b/auto/lib/pcre/make
@ -3,139 +3,36 @@
 # Copyright (C) Nginx, Inc.


-if [ $PCRE_LIBRARY = PCRE2 ]; then
+case "$NGX_CC_NAME" in

-    # PCRE2
+    msvc)
+        ngx_makefile=makefile.msvc
+        ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC"
+        ngx_pcre="PCRE=\"$PCRE\""
+    ;;

-    if [ $NGX_CC_NAME = msvc ]; then
+    owc)
+        ngx_makefile=makefile.owc
+        ngx_opt="CPU_OPT=\"$CPU_OPT\""
+        ngx_pcre=`echo PCRE=\"$PCRE\" | sed -e "s/\//$ngx_regex_dirsep/g"`
+    ;;

-        # With PCRE2, it is not possible to compile all sources.
-        # Since list of source files changes between versions, we
-        # test files which might not be present.
+    bcc)
+        ngx_makefile=makefile.bcc
+        ngx_opt="-DCPU_OPT=\"$CPU_OPT\""
+        ngx_pcre=`echo \-DPCRE=\"$PCRE\" | sed -e "s/\//$ngx_regex_dirsep/g"`
+    ;;

-        ngx_pcre_srcs="pcre2_auto_possess.c \
-                       pcre2_chartables.c \
-                       pcre2_compile.c \
-                       pcre2_config.c \
-                       pcre2_context.c \
-                       pcre2_dfa_match.c \
-                       pcre2_error.c \
-                       pcre2_jit_compile.c \
-                       pcre2_maketables.c \
-                       pcre2_match.c \
-                       pcre2_match_data.c \
-                       pcre2_newline.c \
-                       pcre2_ord2utf.c \
-                       pcre2_pattern_info.c \
-                       pcre2_string_utils.c \
-                       pcre2_study.c \
-                       pcre2_substitute.c \
-                       pcre2_substring.c \
-                       pcre2_tables.c \
-                       pcre2_ucd.c \
-                       pcre2_valid_utf.c \
-                       pcre2_xclass.c"
+    *)
+        ngx_makefile=
+    ;;

-        ngx_pcre_test="pcre2_chkdint.c \
-                       pcre2_convert.c \
-                       pcre2_extuni.c \
-                       pcre2_find_bracket.c \
-                       pcre2_script_run.c \
-                       pcre2_serialize.c"
-
-        for ngx_src in $ngx_pcre_test
-        do
-            if [ -f $PCRE/src/$ngx_src ]; then
-                ngx_pcre_srcs="$ngx_pcre_srcs $ngx_src"
-            fi
-        done
-
-        ngx_pcre_objs=`echo $ngx_pcre_srcs \
-            | sed -e "s#\([^ ]*\.\)c#\1$ngx_objext#g"`
-
-        ngx_pcre_srcs=`echo $ngx_pcre_srcs \
-            | sed -e "s/  *\([^ ][^ ]*\)/$ngx_regex_cont\1/g"`
-        ngx_pcre_objs=`echo $ngx_pcre_objs \
-            | sed -e "s/  *\([^ ][^ ]*\)/$ngx_regex_cont\1/g"`
-
-        cat << END                                            >> $NGX_MAKEFILE
-
-PCRE_CFLAGS =	-O2 -Ob1 -Oi -Gs $LIBC $CPU_OPT
-PCRE_FLAGS =	-DHAVE_CONFIG_H -DPCRE2_STATIC -DPCRE2_CODE_UNIT_WIDTH=8 \\
-		-DHAVE_MEMMOVE
-
-PCRE_SRCS =	 $ngx_pcre_srcs
-PCRE_OBJS =	 $ngx_pcre_objs
-
-$PCRE/src/pcre2.h:
-	cd $PCRE/src \\
-	&& copy /y config.h.generic config.h \\
-	&& copy /y pcre2.h.generic pcre2.h \\
-	&& copy /y pcre2_chartables.c.dist pcre2_chartables.c
-
-$PCRE/src/pcre2-8.lib:	$PCRE/src/pcre2.h $NGX_MAKEFILE
-	cd $PCRE/src \\
-	&& cl -nologo -c \$(PCRE_CFLAGS) -I . \$(PCRE_FLAGS) \$(PCRE_SRCS) \\
-	&& link -lib -out:pcre2-8.lib -verbose:lib \$(PCRE_OBJS)
-
-END
-
-    else
-
-        cat << END                                            >> $NGX_MAKEFILE
-
-$PCRE/src/pcre2.h:	$PCRE/Makefile
-
-$PCRE/Makefile:	$NGX_MAKEFILE
-	cd $PCRE \\
-	&& if [ -f Makefile ]; then \$(MAKE) distclean; fi \\
-	&& CC="\$(CC)" CFLAGS="$PCRE_OPT" \\
-	./configure --disable-shared $PCRE_CONF_OPT
-
-$PCRE/.libs/libpcre2-8.a:	$PCRE/Makefile
-	cd $PCRE \\
-	&& \$(MAKE) libpcre2-8.la
-
-END
-
-    fi
+esac


-else
+if [ -n "$ngx_makefile" ]; then

-    # PCRE
-
-    case "$NGX_CC_NAME" in
-
-        msvc)
-            ngx_makefile=makefile.msvc
-            ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC"
-            ngx_pcre="PCRE=\"$PCRE\""
-        ;;
-
-        owc)
-            ngx_makefile=makefile.owc
-            ngx_opt="CPU_OPT=\"$CPU_OPT\""
-            ngx_pcre=`echo PCRE=\"$PCRE\" | sed -e "s/\//$ngx_regex_dirsep/g"`
-        ;;
-
-        bcc)
-            ngx_makefile=makefile.bcc
-            ngx_opt="-DCPU_OPT=\"$CPU_OPT\""
-            ngx_pcre=`echo \-DPCRE=\"$PCRE\" \
-                | sed -e "s/\//$ngx_regex_dirsep/g"`
-        ;;
-
-        *)
-            ngx_makefile=
-        ;;
-
-    esac
-
-
-    if [ -n "$ngx_makefile" ]; then
-
-        cat << END                                            >> $NGX_MAKEFILE
+    cat << END                                                >> $NGX_MAKEFILE

 `echo "$PCRE/pcre.lib:	$PCRE/pcre.h $NGX_MAKEFILE"			\
 	| sed -e "s/\//$ngx_regex_dirsep/g"`
@ -146,9 +43,9 @@ else

 END

-    else
+else

-        cat << END                                            >> $NGX_MAKEFILE
+    cat << END                                                >> $NGX_MAKEFILE

 $PCRE/pcre.h:	$PCRE/Makefile

@ -164,6 +61,4 @@ $PCRE/.libs/libpcre.a:	$PCRE/Makefile

 END

-    fi
-
 fi
--- a/auto/lib/perl/conf
+++ b/auto/lib/perl/conf
@ -12,9 +12,9 @@ NGX_PERL_VER=`$NGX_PERL -v 2>&1 | grep '^This is perl' 2>&1 \
 if test -n "$NGX_PERL_VER"; then
    echo " + perl version: $NGX_PERL_VER"

-    if [ "`$NGX_PERL -e 'use 5.008006; print "OK"'`" != "OK" ]; then
+    if [ "`$NGX_PERL -e 'use 5.006001; print "OK"'`" != "OK" ]; then
        echo
-        echo "$0: error: perl 5.8.6 or higher is required"
+        echo "$0: error: perl 5.6.1 or higher is required"
        echo

        exit 1;
@ -28,10 +28,8 @@ if test -n "$NGX_PERL_VER"; then
        exit 1;
    fi

-    NGX_PM_CFLAGS=`$NGX_PERL -MExtUtils::Embed -e ccopts`
-    NGX_PM_LDFLAGS=`$NGX_PERL -MConfig -e 'print $Config{lddlflags}'`
-
    NGX_PERL_CFLAGS="$CFLAGS `$NGX_PERL -MExtUtils::Embed -e ccopts`"
+    NGX_PM_CFLAGS=`$NGX_PERL -MExtUtils::Embed -e ccopts`

    # gcc 4.1/4.2 warn about unused values in pTHX_
    NGX_PERL_CFLAGS=`echo $NGX_PERL_CFLAGS \
@ -76,7 +74,7 @@ if test -n "$NGX_PERL_VER"; then

 else
    echo
-    echo "$0: error: perl 5.8.6 or higher is required"
+    echo "$0: error: perl 5.6.1 or higher is required"
    echo

    exit 1;
--- a/auto/lib/perl/make
+++ b/auto/lib/perl/make
@ -3,6 +3,9 @@
 # Copyright (C) Nginx, Inc.


+v=`grep 'define NGINX_VERSION' src/core/nginx.h | sed -e 's/^.*"\(.*\)".*/\1/'`
+
+
 cat << END                                                    >> $NGX_MAKEFILE

 $NGX_OBJS/src/http/modules/perl/ngx_http_perl_module.o: \\
@ -24,11 +27,7 @@ $NGX_OBJS/src/http/modules/perl/Makefile: \\
 		src/http/modules/perl/nginx.pm \\
 		src/http/modules/perl/nginx.xs \\
 		src/http/modules/perl/typemap
-	grep 'define NGINX_VERSION' src/core/nginx.h \\
-		| sed -e 's/^.*"\(.*\)".*/\1/' > \\
-		$NGX_OBJS/src/http/modules/perl/version
-	sed "s/%%VERSION%%/\`cat $NGX_OBJS/src/http/modules/perl/version\`/" \\
-		src/http/modules/perl/nginx.pm > \\
+	sed "s/%%VERSION%%/$v/" src/http/modules/perl/nginx.pm > \\
 		$NGX_OBJS/src/http/modules/perl/nginx.pm
 	cp -p src/http/modules/perl/nginx.xs $NGX_OBJS/src/http/modules/perl/
 	cp -p src/http/modules/perl/typemap $NGX_OBJS/src/http/modules/perl/
@ -36,7 +35,6 @@ $NGX_OBJS/src/http/modules/perl/Makefile: \\

 	cd $NGX_OBJS/src/http/modules/perl \\
 		&& NGX_PM_CFLAGS="\$(NGX_PM_CFLAGS) -g $NGX_CC_OPT" \\
-			NGX_PM_LDFLAGS="$NGX_LD_OPT \$(NGX_PM_LDFLAGS)" \\
 			NGX_INCS="$CORE_INCS $NGX_OBJS $HTTP_INCS" \\
 			NGX_DEPS="\$(CORE_DEPS) \$(HTTP_DEPS)" \\
 		$NGX_PERL Makefile.PL \\
--- a/auto/lib/sha1/conf
+++ b/auto/lib/sha1/conf
@ -0,0 +1,79 @@
+
+# Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
+
+
+if [ $SHA1 != NONE ]; then
+
+    have=NGX_HAVE_SHA1 . auto/have
+    CORE_INCS="$CORE_INCS $SHA1"
+
+    case "$NGX_CC_NAME" in
+
+        msvc | owc | bcc)
+            LINK_DEPS="$LINK_DEPS $SHA1/sha1.lib"
+            CORE_LIBS="$CORE_LIBS $SHA1/sha1.lib"
+        ;;
+
+        icc)
+            LINK_DEPS="$LINK_DEPS $SHA1/libsha.a"
+
+            # to allow -ipo optimization we link with the *.o but not library
+            CORE_LIBS="$CORE_LIBS $SHA1/sha1_dgst.o"
+
+            if [ $SHA1_ASM = YES ]; then
+                CORE_LIBS="$CORE_LIBS $SHA1/asm/sx86-elf.o"
+            fi
+        ;;
+
+        *)
+            LINK_DEPS="$LINK_DEPS $SHA1/libsha.a"
+            CORE_LIBS="$CORE_LIBS $SHA1/libsha.a"
+            #CORE_LIBS="$CORE_LIBS -L $SHA1 -lsha"
+        ;;
+
+    esac
+
+else
+
+    if [ "$NGX_PLATFORM" != win32 ]; then
+
+        SHA1=NO
+
+        # FreeBSD
+
+        ngx_feature="sha1 in system md library"
+        ngx_feature_name=NGX_HAVE_SHA1
+        ngx_feature_run=no
+        ngx_feature_incs="#include <sha.h>"
+        ngx_feature_path=
+        ngx_feature_libs="-lmd"
+        ngx_feature_test="SHA_CTX sha1; SHA1_Init(&sha1)"
+        . auto/feature
+
+        ngx_sha1_lib="system md"
+
+        if [ $ngx_found = no ]; then
+
+            # OpenSSL crypto library
+
+            ngx_feature="sha1 in system OpenSSL crypto library"
+            ngx_feature_incs="#include <openssl/sha.h>"
+            ngx_feature_libs="-lcrypto"
+            . auto/feature
+
+            ngx_sha1_lib="system crypto"
+
+            if [ $ngx_found = yes ]; then
+                have=NGX_HAVE_OPENSSL_SHA1_H . auto/have
+            fi
+        fi
+
+        if [ $ngx_found = yes ]; then
+            CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
+            SHA1=YES
+            SHA1_LIB=$ngx_sha1_lib
+        fi
+    fi
+
+fi
--- a/auto/lib/sha1/make
+++ b/auto/lib/sha1/make
@ -0,0 +1,96 @@
+
+# Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
+
+
+case "$NGX_CC_NAME" in
+
+    msvc)
+        ngx_makefile=makefile.msvc
+        ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC SHA1_ASM=$SHA1_ASM"
+        ngx_sha1="SHA1=\"$SHA1\""
+    ;;
+
+    owc)
+        ngx_makefile=makefile.owc
+        ngx_opt="CPU_OPT=\"$CPU_OPT\""
+        ngx_sha1=`echo SHA1=\"$SHA1\" | sed -e "s/\//$ngx_regex_dirsep/g"`
+    ;;
+
+    bcc)
+        ngx_makefile=makefile.bcc
+        ngx_opt="-DCPU_OPT=\"$CPU_OPT\" -DSHA1_ASM=$SHA1_ASM"
+        ngx_sha1=`echo \-DSHA1=\"$SHA1\" | sed -e "s/\//$ngx_regex_dirsep/g"`
+    ;;
+
+esac
+
+
+done=NO
+
+
+case "$NGX_PLATFORM" in
+
+    win32)
+        cat << END                                        >> $NGX_MAKEFILE
+
+`echo "$SHA1/sha1.lib:	$NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"`
+	\$(MAKE) -f auto/lib/sha1/$ngx_makefile $ngx_opt $ngx_sha1
+
+END
+
+        done=YES
+    ;;
+
+    SunOS:*:i86pc)
+        if [ $SHA1_ASM = YES ]; then
+
+            cat << END                                        >> $NGX_MAKEFILE
+
+$SHA1/libsha.a:	$NGX_MAKEFILE
+	cd $SHA1 \\
+	&& \$(MAKE) CFLAGS="$SHA1_OPT -DSOL -DSHA1_ASM -DL_ENDIAN" \\
+		CC="\$(CC)" CPP="\$(CPP)" \\
+		SHA_ASM_OBJ=asm/sx86-sol.o clean libsha.a
+
+END
+
+            done=YES
+        fi
+    ;;
+
+    # FreeBSD: i386
+    # Linux: i686
+
+    *:i386 | *:i686)
+        if [ $SHA1_ASM = YES ]; then
+
+            cat << END                                        >> $NGX_MAKEFILE
+
+$SHA1/libsha.a:	$NGX_MAKEFILE
+	cd $SHA1 \\
+	&& \$(MAKE) CFLAGS="$SHA1_OPT -DELF -DSHA1_ASM -DL_ENDIAN" \\
+		CC="\$(CC)" CPP="\$(CPP)" \\
+		SHA_ASM_OBJ=asm/sx86-elf.o clean libsha.a
+
+END
+
+            done=YES
+        fi
+    ;;
+
+esac
+
+
+if [ $done = NO ]; then
+
+    cat << END                                                >> $NGX_MAKEFILE
+
+$SHA1/libsha.a:	$NGX_MAKEFILE
+	cd $SHA1 \\
+	&& \$(MAKE) CFLAGS="$SHA1_OPT" \\
+		CC="\$(CC)" SHA_ASM_OBJ= clean libsha.a
+
+END
+
+fi
--- a/auto/lib/sha1/makefile.bcc
+++ b/auto/lib/sha1/makefile.bcc
@ -0,0 +1,22 @@
+
+# Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
+
+
+CFLAGS = -q -O2 -tWM $(CPU_OPT) -DL_ENDIAN
+
+!if "$(SHA1_ASM)" == "YES"
+
+sha1.lib:
+	cd $(SHA1)
+	bcc32 -c $(CFLAGS) -DSHA1_ASM sha1dgst.c
+	tlib sha1.lib +sha1dgst.obj +"asm\s-win32.obj"
+
+!else
+
+sha1.lib:
+	cd $(SHA1)
+	bcc32 -c $(CFLAGS) sha1dgst.c
+	tlib sha1.lib +sha1dgst.obj
+
+!endif
--- a/auto/lib/sha1/makefile.msvc
+++ b/auto/lib/sha1/makefile.msvc
@ -0,0 +1,22 @@
+
+# Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
+
+
+CFLAGS = -nologo -O2 -Ob1 -Oi -Gs $(LIBC) $(CPU_OPT) -D L_ENDIAN
+
+!IF "$(SHA1_ASM)" == "YES"
+
+sha1.lib:
+	cd $(SHA1)
+	cl -c $(CFLAGS) -D SHA1_ASM sha1dgst.c
+	link -lib -out:sha1.lib sha1dgst.obj asm/s-win32.obj
+
+!ELSE
+
+sha1.lib:
+	cd $(SHA1)
+	cl -c $(CFLAGS) sha1dgst.c
+	link -lib -out:sha1.lib sha1dgst.obj
+
+!ENDIF
--- a/auto/lib/sha1/makefile.owc
+++ b/auto/lib/sha1/makefile.owc
@ -0,0 +1,11 @@
+
+# Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
+
+
+CFLAGS = -zq -bt=nt -bm -ot -op -oi -oe -s $(CPU_OPT)
+
+sha1.lib:
+	cd $(SHA1)
+	wcl386 -c $(CFLAGS) -dL_ENDIAN sha1dgst.c
+	wlib -n sha1.lib sha1dgst.obj
--- a/auto/lib/test
+++ b/auto/lib/test
@ -0,0 +1,40 @@
+
+# Copyright (C) Igor Sysoev
+# Copyright (C) Nginx, Inc.
+
+
+echo $ngx_n "checking for $ngx_lib ...$ngx_c"
+
+cat << END >> $NGX_AUTOCONF_ERR
+
+----------------------------------------
+checking for $ngx_lib
+
+END
+
+ngx_found=no
+
+cat << END > $NGX_AUTOTEST.c
+
+$ngx_lib_incs
+
+int main() {
+    $ngx_lib_test;
+    return 0;
+}
+
+
+eval "$CC $cc_test_flags $ngx_lib_cflags \
+     -o $NGX_AUTOTEST $NGX_AUTOTEST.c $ngx_libs \
+     >> $NGX_ERR 2>&1"
+
+if [ -x $NGX_AUTOTEST ]; then
+    echo " found"
+
+    ngx_found=yes
+
+else
+    echo " not found"
+fi
+
+rm -rf $NGX_AUTOTEST*
--- a/auto/make
+++ b/auto/make
@ -2,19 +2,13 @@
 # Copyright (C) Igor Sysoev
 # Copyright (C) Nginx, Inc.

-basename_last2() {
-    local basename_1=`basename \`dirname $1\``
-    local basename_2=$(basename "$1")
-    echo $(printf "$basename_1/$basename_2" | sed 's/\.\.\///')
-}

 echo "creating $NGX_MAKEFILE"

 mkdir -p $NGX_OBJS/src/core $NGX_OBJS/src/event $NGX_OBJS/src/event/modules \
-         $NGX_OBJS/src/event/quic \
         $NGX_OBJS/src/os/unix $NGX_OBJS/src/os/win32 \
-         $NGX_OBJS/src/http $NGX_OBJS/src/http/v2 $NGX_OBJS/src/http/v3 \
-         $NGX_OBJS/src/http/modules $NGX_OBJS/src/http/modules/perl \
+         $NGX_OBJS/src/http $NGX_OBJS/src/http/v2 $NGX_OBJS/src/http/modules \
+         $NGX_OBJS/src/http/modules/perl \
         $NGX_OBJS/src/mail \
         $NGX_OBJS/src/stream \
         $NGX_OBJS/src/misc
@ -37,7 +31,6 @@ END
 if test -n "$NGX_PERL_CFLAGS"; then
    echo NGX_PERL_CFLAGS = $NGX_PERL_CFLAGS                   >> $NGX_MAKEFILE
    echo NGX_PM_CFLAGS = $NGX_PM_CFLAGS                       >> $NGX_MAKEFILE
-    echo NGX_PM_LDFLAGS = $NGX_PM_LDFLAGS                     >> $NGX_MAKEFILE
 fi


@ -162,7 +155,7 @@ fi
 ngx_all_srcs="$ngx_all_srcs $MISC_SRCS"


-if test -n "$NGX_ADDON_SRCS$DYNAMIC_MODULES"; then
+if test -n "$NGX_ADDON_SRCS"; then

 cat << END                                                >> $NGX_MAKEFILE

@ -179,7 +172,7 @@ ngx_all_srcs=`echo $ngx_all_srcs | sed -e "s/\//$ngx_regex_dirsep/g"`

 for ngx_src in $NGX_ADDON_SRCS
 do
-    ngx_obj="addon/`basename_last2 \`dirname $ngx_src\``"
+    ngx_obj="addon/`basename \`dirname $ngx_src\``"

    test -d $NGX_OBJS/$ngx_obj || mkdir -p $NGX_OBJS/$ngx_obj

@ -235,7 +228,7 @@ build:	binary modules manpage
 binary:	$NGX_OBJS${ngx_dirsep}nginx$ngx_binext

 $NGX_OBJS${ngx_dirsep}nginx$ngx_binext:	$ngx_deps$ngx_spacer
-	\$(LINK) $ngx_long_start$ngx_binout$NGX_OBJS${ngx_dirsep}nginx$ngx_binext$ngx_long_cont$ngx_objs$ngx_libs$ngx_link$ngx_main_link
+	\$(LINK) $ngx_long_start$ngx_binout$NGX_OBJS${ngx_dirsep}nginx$ngx_long_cont$ngx_objs$ngx_libs$ngx_link$ngx_main_link
 	$ngx_rcc
 $ngx_long_end

@ -319,7 +312,7 @@ $ngx_obj:	\$(CORE_DEPS) \$(HTTP_DEPS)$ngx_cont$ngx_src
 END

        fi
-    done
+     done

 fi

@ -349,7 +342,7 @@ $ngx_obj:	\$(CORE_DEPS) \$(MAIL_DEPS)$ngx_cont$ngx_src
 	$ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX

 END
-    done
+     done

 fi

@ -379,7 +372,7 @@ $ngx_obj:	\$(CORE_DEPS) \$(STREAM_DEPS)$ngx_cont$ngx_src
 	$ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX

 END
-    done
+     done

 fi

@ -405,7 +398,7 @@ $ngx_obj:	\$(CORE_DEPS) $ngx_cont$ngx_src
 	$ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX

 END
-    done
+     done

 fi

@ -418,7 +411,7 @@ if test -n "$NGX_ADDON_SRCS"; then

    for ngx_src in $NGX_ADDON_SRCS
    do
-        ngx_obj="addon/`basename_last2 \`dirname $ngx_src\``"
+        ngx_obj="addon/`basename \`dirname $ngx_src\``"

        ngx_obj=`echo $ngx_obj/\`basename $ngx_src\` \
            | sed -e "s/\//$ngx_regex_dirsep/g"`
@ -437,7 +430,7 @@ $ngx_obj:	\$(ADDON_DEPS)$ngx_cont$ngx_src
 	$ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX

 END
-    done
+     done

 fi

@ -505,10 +498,20 @@ else
    ngx_perl_cc="$ngx_perl_cc \$(ALL_INCS)"
 fi

+ngx_obj_deps="\$(CORE_DEPS)"
+if [ $HTTP != NO ]; then
+    ngx_obj_deps="$ngx_obj_deps \$(HTTP_DEPS)"
+fi
+if [ $MAIL != NO ]; then
+    ngx_obj_deps="$ngx_obj_deps \$(MAIL_DEPS)"
+fi
+if [ $STREAM != NO ]; then
+    ngx_obj_deps="$ngx_obj_deps \$(STREAM_DEPS)"
+fi
+
 for ngx_module in $DYNAMIC_MODULES
 do
    eval ngx_module_srcs="\$${ngx_module}_SRCS"
-    eval ngx_module_shrd="\$${ngx_module}_SHRD"
    eval eval ngx_module_libs="\\\"\$${ngx_module}_LIBS\\\""

    eval ngx_module_modules="\$${ngx_module}_MODULES"
@ -574,14 +577,14 @@ END
        | sed -e "s/\(.*\.\)c/\1$ngx_objext/"`

    ngx_module_objs=
-    for ngx_src in $ngx_module_srcs $ngx_module_shrd
+    for ngx_src in $ngx_module_srcs
    do
        case "$ngx_src" in
            src/*)
                ngx_obj=$ngx_src
                ;;
            *)
-                ngx_obj="addon/`basename_last2 \`dirname $ngx_src\``"
+                ngx_obj="addon/`basename \`dirname $ngx_src\``"
                mkdir -p $NGX_OBJS/$ngx_obj
                ngx_obj="$ngx_obj/`basename $ngx_src`"
                ;;
@ -643,7 +646,7 @@ END
                ngx_obj=`echo $ngx_source | sed -e "s/\//$ngx_regex_dirsep/g"`
                ;;
            *)
-                ngx_obj="addon/`basename_last2 \`dirname $ngx_source\``"
+                ngx_obj="addon/`basename \`dirname $ngx_source\``"
                ngx_obj=`echo $ngx_obj/\`basename $ngx_source\` \
                    | sed -e "s/\//$ngx_regex_dirsep/g"`
                ;;
@ -661,7 +664,7 @@ END

            cat << END                                        >> $NGX_MAKEFILE

-$ngx_obj:	\$(ADDON_DEPS)$ngx_cont$ngx_src
+$ngx_obj:	$ngx_obj_deps$ngx_cont$ngx_src
 	$ngx_perl_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX

 END
@ -669,7 +672,7 @@ END

            cat << END                                        >> $NGX_MAKEFILE

-$ngx_obj:	\$(ADDON_DEPS)$ngx_cont$ngx_src
+$ngx_obj:	$ngx_obj_deps$ngx_cont$ngx_src
 	$ngx_cc$ngx_tab$ngx_objout$ngx_obj$ngx_tab$ngx_src$NGX_AUX

 END
--- a/auto/module
+++ b/auto/module
@ -17,6 +17,7 @@ if [ "$ngx_module_link" = DYNAMIC ]; then
    done

    DYNAMIC_MODULES="$DYNAMIC_MODULES $ngx_module"
+    eval ${ngx_module}_SRCS=\"$ngx_module_srcs\"

    eval ${ngx_module}_MODULES=\"$ngx_module_name\"

@ -30,38 +31,10 @@ if [ "$ngx_module_link" = DYNAMIC ]; then
        eval ${ngx_module}_ORDER=\"$ngx_module_order\"
    fi

-    srcs=
-    shrd=
-    for src in $ngx_module_srcs
-    do
-        found=no
-        for old in $DYNAMIC_MODULES_SRCS
-        do
-            if [ $src = $old ]; then
-                found=yes
-                break
-            fi
-        done
-
-        if [ $found = no ]; then
-            srcs="$srcs $src"
-        else
-            shrd="$shrd $src"
-        fi
-    done
-    eval ${ngx_module}_SRCS=\"$srcs\"
-    eval ${ngx_module}_SHRD=\"$shrd\"
-
-    DYNAMIC_MODULES_SRCS="$DYNAMIC_MODULES_SRCS $srcs"
-
    if test -n "$ngx_module_incs"; then
        CORE_INCS="$CORE_INCS $ngx_module_incs"
    fi

-    if test -n "$ngx_module_deps"; then
-        NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_module_deps"
-    fi
-
    libs=
    for lib in $ngx_module_libs
    do
@ -75,14 +48,10 @@ if [ "$ngx_module_link" = DYNAMIC ]; then
                fi
            ;;

-            PCRE | OPENSSL | ZLIB)
+            PCRE | OPENSSL | MD5 | SHA1 | ZLIB)
                eval USE_${lib}=YES
            ;;

-            MD5 | SHA1)
-                # obsolete
-            ;;
-
            *)
                libs="$libs $lib"
            ;;
@ -110,14 +79,10 @@ elif [ "$ngx_module_link" = YES ]; then
    do
        case $lib in

-            PCRE | OPENSSL | ZLIB | LIBXSLT | LIBGD | PERL | GEOIP)
+            PCRE | OPENSSL | MD5 | SHA1 | ZLIB | LIBXSLT | LIBGD | PERL | GEOIP)
                eval USE_${lib}=YES
            ;;

-            MD5 | SHA1)
-                # obsolete
-            ;;
-
            *)
                CORE_LIBS="$CORE_LIBS $lib"
            ;;
@ -130,24 +95,7 @@ elif [ "$ngx_module_link" = ADDON ]; then
    eval ${ngx_module_type}_MODULES=\"\$${ngx_module_type}_MODULES \
                                      $ngx_module_name\"

-    srcs=
-    for src in $ngx_module_srcs
-    do
-        found=no
-        for old in $NGX_ADDON_SRCS
-        do
-            if [ $src = $old ]; then
-                found=yes
-                break
-            fi
-        done
-
-        if [ $found = no ]; then
-            srcs="$srcs $src"
-        fi
-    done
-
-    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $srcs"
+    NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_module_srcs"

    if test -n "$ngx_module_incs"; then
        eval ${ngx_var}_INCS=\"\$${ngx_var}_INCS $ngx_module_incs\"
@ -161,14 +109,10 @@ elif [ "$ngx_module_link" = ADDON ]; then
    do
        case $lib in

-            PCRE | OPENSSL | ZLIB | LIBXSLT | LIBGD | PERL | GEOIP)
+            PCRE | OPENSSL | MD5 | SHA1 | ZLIB | LIBXSLT | LIBGD | PERL | GEOIP)
                eval USE_${lib}=YES
            ;;

-            MD5 | SHA1)
-                # obsolete
-            ;;
-
            *)
                CORE_LIBS="$CORE_LIBS $lib"
            ;;
--- a/auto/modules
+++ b/auto/modules
--- a/auto/options
+++ b/auto/options
@ -44,8 +44,7 @@ EVENT_POLL=NO
 USE_THREADS=NO

 NGX_FILE_AIO=NO
-
-QUIC_BPF=NO
+NGX_IPV6=NO

 HTTP=YES

@ -61,8 +60,8 @@ HTTP_CHARSET=YES
 HTTP_GZIP=YES
 HTTP_SSL=NO
 HTTP_V2=NO
-HTTP_V3=NO
 HTTP_SSI=YES
+HTTP_POSTPONE=NO
 HTTP_REALIP=NO
 HTTP_XSLT=NO
 HTTP_IMAGE_FILTER=NO
@ -72,7 +71,6 @@ HTTP_DAV=NO
 HTTP_ACCESS=YES
 HTTP_AUTH_BASIC=YES
 HTTP_AUTH_REQUEST=NO
-HTTP_MIRROR=YES
 HTTP_USERID=YES
 HTTP_SLICE=NO
 HTTP_AUTOINDEX=YES
@ -88,7 +86,6 @@ HTTP_PROXY=YES
 HTTP_FASTCGI=YES
 HTTP_UWSGI=YES
 HTTP_SCGI=YES
-HTTP_GRPC=YES
 HTTP_PERL=NO
 HTTP_MEMCACHED=YES
 HTTP_LIMIT_CONN=YES
@ -104,7 +101,6 @@ HTTP_GZIP_STATIC=NO
 HTTP_UPSTREAM_HASH=YES
 HTTP_UPSTREAM_IP_HASH=YES
 HTTP_UPSTREAM_LEAST_CONN=YES
-HTTP_UPSTREAM_RANDOM=YES
 HTTP_UPSTREAM_KEEPALIVE=YES
 HTTP_UPSTREAM_ZONE=YES

@ -119,43 +115,37 @@ MAIL_SMTP=YES

 STREAM=NO
 STREAM_SSL=NO
-STREAM_REALIP=NO
 STREAM_LIMIT_CONN=YES
 STREAM_ACCESS=YES
-STREAM_GEO=YES
-STREAM_GEOIP=NO
-STREAM_MAP=YES
-STREAM_SPLIT_CLIENTS=YES
-STREAM_RETURN=YES
-STREAM_PASS=YES
-STREAM_SET=YES
 STREAM_UPSTREAM_HASH=YES
 STREAM_UPSTREAM_LEAST_CONN=YES
-STREAM_UPSTREAM_RANDOM=YES
 STREAM_UPSTREAM_ZONE=YES
-STREAM_SSL_PREREAD=NO

 DYNAMIC_MODULES=
-DYNAMIC_MODULES_SRCS=

 NGX_ADDONS=
-NGX_ADDON_SRCS=
 NGX_ADDON_DEPS=
 DYNAMIC_ADDONS=

-NGX_COMPAT=NO
-
 USE_PCRE=NO
 PCRE=NONE
 PCRE_OPT=
 PCRE_CONF_OPT=
 PCRE_JIT=NO
-PCRE2=YES

 USE_OPENSSL=NO
-USE_OPENSSL_QUIC=NO
 OPENSSL=NONE

+USE_MD5=NO
+MD5=NONE
+MD5_OPT=
+MD5_ASM=NO
+
+USE_SHA1=NO
+SHA1=NONE
+SHA1_OPT=
+SHA1_ASM=NO
+
 USE_ZLIB=NO
 ZLIB=NONE
 ZLIB_OPT=
@ -171,8 +161,6 @@ USE_GEOIP=NO
 NGX_GOOGLE_PERFTOOLS=NO
 NGX_CPP_TEST=NO

-SO_COOKIE_FOUND=NO
-
 NGX_LIBATOMIC=NO

 NGX_CPU_CACHE_LINE=
@ -217,13 +205,7 @@ do
        --with-threads)                  USE_THREADS=YES            ;;

        --with-file-aio)                 NGX_FILE_AIO=YES           ;;
-
-        --without-quic_bpf_module)       QUIC_BPF=NONE              ;;
-
-        --with-ipv6)
-            NGX_POST_CONF_MSG="$NGX_POST_CONF_MSG
-$0: warning: the \"--with-ipv6\" option is deprecated"
-        ;;
+        --with-ipv6)                     NGX_IPV6=YES               ;;

        --without-http)                  HTTP=NO                    ;;
        --without-http-cache)            HTTP_CACHE=NO              ;;
@ -237,7 +219,6 @@ $0: warning: the \"--with-ipv6\" option is deprecated"

        --with-http_ssl_module)          HTTP_SSL=YES               ;;
        --with-http_v2_module)           HTTP_V2=YES                ;;
-        --with-http_v3_module)           HTTP_V3=YES                ;;
        --with-http_realip_module)       HTTP_REALIP=YES            ;;
        --with-http_addition_module)     HTTP_ADDITION=YES          ;;
        --with-http_xslt_module)         HTTP_XSLT=YES              ;;
@ -266,7 +247,6 @@ $0: warning: the \"--with-ipv6\" option is deprecated"
        --without-http_userid_module)    HTTP_USERID=NO             ;;
        --without-http_access_module)    HTTP_ACCESS=NO             ;;
        --without-http_auth_basic_module) HTTP_AUTH_BASIC=NO        ;;
-        --without-http_mirror_module)    HTTP_MIRROR=NO             ;;
        --without-http_autoindex_module) HTTP_AUTOINDEX=NO          ;;
        --without-http_status_module)    HTTP_STATUS=NO             ;;
        --without-http_geo_module)       HTTP_GEO=NO                ;;
@ -278,7 +258,6 @@ $0: warning: the \"--with-ipv6\" option is deprecated"
        --without-http_fastcgi_module)   HTTP_FASTCGI=NO            ;;
        --without-http_uwsgi_module)     HTTP_UWSGI=NO              ;;
        --without-http_scgi_module)      HTTP_SCGI=NO               ;;
-        --without-http_grpc_module)      HTTP_GRPC=NO               ;;
        --without-http_memcached_module) HTTP_MEMCACHED=NO          ;;
        --without-http_limit_conn_module) HTTP_LIMIT_CONN=NO        ;;
        --without-http_limit_req_module) HTTP_LIMIT_REQ=NO         ;;
@ -288,8 +267,6 @@ $0: warning: the \"--with-ipv6\" option is deprecated"
        --without-http_upstream_ip_hash_module) HTTP_UPSTREAM_IP_HASH=NO ;;
        --without-http_upstream_least_conn_module)
                                         HTTP_UPSTREAM_LEAST_CONN=NO ;;
-        --without-http_upstream_random_module)
-                                         HTTP_UPSTREAM_RANDOM=NO    ;;
        --without-http_upstream_keepalive_module) HTTP_UPSTREAM_KEEPALIVE=NO ;;
        --without-http_upstream_zone_module) HTTP_UPSTREAM_ZONE=NO  ;;

@ -324,28 +301,13 @@ use the \"--with-mail_ssl_module\" option instead"
        --with-stream)                   STREAM=YES                 ;;
        --with-stream=dynamic)           STREAM=DYNAMIC             ;;
        --with-stream_ssl_module)        STREAM_SSL=YES             ;;
-        --with-stream_realip_module)     STREAM_REALIP=YES          ;;
-        --with-stream_geoip_module)      STREAM_GEOIP=YES           ;;
-        --with-stream_geoip_module=dynamic)
-                                         STREAM_GEOIP=DYNAMIC       ;;
-        --with-stream_ssl_preread_module)
-                                         STREAM_SSL_PREREAD=YES     ;;
        --without-stream_limit_conn_module)
                                         STREAM_LIMIT_CONN=NO       ;;
        --without-stream_access_module)  STREAM_ACCESS=NO           ;;
-        --without-stream_geo_module)     STREAM_GEO=NO              ;;
-        --without-stream_map_module)     STREAM_MAP=NO              ;;
-        --without-stream_split_clients_module)
-                                         STREAM_SPLIT_CLIENTS=NO    ;;
-        --without-stream_return_module)  STREAM_RETURN=NO           ;;
-        --without-stream_pass_module)    STREAM_PASS=NO             ;;
-        --without-stream_set_module)     STREAM_SET=NO              ;;
        --without-stream_upstream_hash_module)
                                         STREAM_UPSTREAM_HASH=NO    ;;
        --without-stream_upstream_least_conn_module)
                                         STREAM_UPSTREAM_LEAST_CONN=NO ;;
-        --without-stream_upstream_random_module)
-                                         STREAM_UPSTREAM_RANDOM=NO  ;;
        --without-stream_upstream_zone_module)
                                         STREAM_UPSTREAM_ZONE=NO    ;;

@ -355,8 +317,6 @@ use the \"--with-mail_ssl_module\" option instead"
        --add-module=*)                  NGX_ADDONS="$NGX_ADDONS $value" ;;
        --add-dynamic-module=*)          DYNAMIC_ADDONS="$DYNAMIC_ADDONS $value" ;;

-        --with-compat)                   NGX_COMPAT=YES             ;;
-
        --with-cc=*)                     CC="$value"                ;;
        --with-cpp=*)                    CPP="$value"               ;;
        --with-cc-opt=*)                 NGX_CC_OPT="$value"        ;;
@ -369,36 +329,17 @@ use the \"--with-mail_ssl_module\" option instead"
        --with-pcre=*)                   PCRE="$value"              ;;
        --with-pcre-opt=*)               PCRE_OPT="$value"          ;;
        --with-pcre-jit)                 PCRE_JIT=YES               ;;
-        --without-pcre2)                 PCRE2=DISABLED             ;;

        --with-openssl=*)                OPENSSL="$value"           ;;
        --with-openssl-opt=*)            OPENSSL_OPT="$value"       ;;

-        --with-md5=*)
-            NGX_POST_CONF_MSG="$NGX_POST_CONF_MSG
-$0: warning: the \"--with-md5\" option is deprecated"
-        ;;
-        --with-md5-opt=*)
-            NGX_POST_CONF_MSG="$NGX_POST_CONF_MSG
-$0: warning: the \"--with-md5-opt\" option is deprecated"
-        ;;
-        --with-md5-asm)
-            NGX_POST_CONF_MSG="$NGX_POST_CONF_MSG
-$0: warning: the \"--with-md5-asm\" option is deprecated"
-        ;;
+        --with-md5=*)                    MD5="$value"               ;;
+        --with-md5-opt=*)                MD5_OPT="$value"           ;;
+        --with-md5-asm)                  MD5_ASM=YES                ;;

-        --with-sha1=*)
-            NGX_POST_CONF_MSG="$NGX_POST_CONF_MSG
-$0: warning: the \"--with-sha1\" option is deprecated"
-        ;;
-        --with-sha1-opt=*)
-            NGX_POST_CONF_MSG="$NGX_POST_CONF_MSG
-$0: warning: the \"--with-sha1-opt\" option is deprecated"
-        ;;
-        --with-sha1-asm)
-            NGX_POST_CONF_MSG="$NGX_POST_CONF_MSG
-$0: warning: the \"--with-sha1-asm\" option is deprecated"
-        ;;
+        --with-sha1=*)                   SHA1="$value"              ;;
+        --with-sha1-opt=*)               SHA1_OPT="$value"          ;;
+        --with-sha1-asm)                 SHA1_ASM=YES               ;;

        --with-zlib=*)                   ZLIB="$value"              ;;
        --with-zlib-opt=*)               ZLIB_OPT="$value"          ;;
@ -453,12 +394,10 @@ cat << END
  --with-threads                     enable thread pool support

  --with-file-aio                    enable file AIO support
-
-  --without-quic_bpf_module          disable ngx_quic_bpf_module
+  --with-ipv6                        enable IPv6 support

  --with-http_ssl_module             enable ngx_http_ssl_module
  --with-http_v2_module              enable ngx_http_v2_module
-  --with-http_v3_module              enable ngx_http_v3_module
  --with-http_realip_module          enable ngx_http_realip_module
  --with-http_addition_module        enable ngx_http_addition_module
  --with-http_xslt_module            enable ngx_http_xslt_module
@ -487,7 +426,6 @@ cat << END
  --without-http_userid_module       disable ngx_http_userid_module
  --without-http_access_module       disable ngx_http_access_module
  --without-http_auth_basic_module   disable ngx_http_auth_basic_module
-  --without-http_mirror_module       disable ngx_http_mirror_module
  --without-http_autoindex_module    disable ngx_http_autoindex_module
  --without-http_geo_module          disable ngx_http_geo_module
  --without-http_map_module          disable ngx_http_map_module
@ -498,7 +436,6 @@ cat << END
  --without-http_fastcgi_module      disable ngx_http_fastcgi_module
  --without-http_uwsgi_module        disable ngx_http_uwsgi_module
  --without-http_scgi_module         disable ngx_http_scgi_module
-  --without-http_grpc_module         disable ngx_http_grpc_module
  --without-http_memcached_module    disable ngx_http_memcached_module
  --without-http_limit_conn_module   disable ngx_http_limit_conn_module
  --without-http_limit_req_module    disable ngx_http_limit_req_module
@ -510,8 +447,6 @@ cat << END
                                     disable ngx_http_upstream_ip_hash_module
  --without-http_upstream_least_conn_module
                                     disable ngx_http_upstream_least_conn_module
-  --without-http_upstream_random_module
-                                     disable ngx_http_upstream_random_module
  --without-http_upstream_keepalive_module
                                     disable ngx_http_upstream_keepalive_module
  --without-http_upstream_zone_module
@ -547,25 +482,12 @@ cat << END
  --with-stream                      enable TCP/UDP proxy module
  --with-stream=dynamic              enable dynamic TCP/UDP proxy module
  --with-stream_ssl_module           enable ngx_stream_ssl_module
-  --with-stream_realip_module        enable ngx_stream_realip_module
-  --with-stream_geoip_module         enable ngx_stream_geoip_module
-  --with-stream_geoip_module=dynamic enable dynamic ngx_stream_geoip_module
-  --with-stream_ssl_preread_module   enable ngx_stream_ssl_preread_module
  --without-stream_limit_conn_module disable ngx_stream_limit_conn_module
  --without-stream_access_module     disable ngx_stream_access_module
-  --without-stream_geo_module        disable ngx_stream_geo_module
-  --without-stream_map_module        disable ngx_stream_map_module
-  --without-stream_split_clients_module
-                                     disable ngx_stream_split_clients_module
-  --without-stream_return_module     disable ngx_stream_return_module
-  --without-stream_pass_module       disable ngx_stream_pass_module
-  --without-stream_set_module        disable ngx_stream_set_module
  --without-stream_upstream_hash_module
                                     disable ngx_stream_upstream_hash_module
  --without-stream_upstream_least_conn_module
                                     disable ngx_stream_upstream_least_conn_module
-  --without-stream_upstream_random_module
-                                     disable ngx_stream_upstream_random_module
  --without-stream_upstream_zone_module
                                     disable ngx_stream_upstream_zone_module

@ -575,8 +497,6 @@ cat << END
  --add-module=PATH                  enable external module
  --add-dynamic-module=PATH          enable dynamic external module

-  --with-compat                      dynamic modules compatibility
-
  --with-cc=PATH                     set C compiler pathname
  --with-cpp=PATH                    set C preprocessor pathname
  --with-cc-opt=OPTIONS              set additional C compiler options
@ -590,7 +510,14 @@ cat << END
  --with-pcre=DIR                    set path to PCRE library sources
  --with-pcre-opt=OPTIONS            set additional build options for PCRE
  --with-pcre-jit                    build PCRE with JIT compilation support
-  --without-pcre2                    do not use PCRE2 library
+
+  --with-md5=DIR                     set path to md5 library sources
+  --with-md5-opt=OPTIONS             set additional build options for md5
+  --with-md5-asm                     use md5 assembler sources
+
+  --with-sha1=DIR                    set path to sha1 library sources
+  --with-sha1-opt=OPTIONS            set additional build options for sha1
+  --with-sha1-asm                    use sha1 assembler sources

  --with-zlib=DIR                    set path to zlib library sources
  --with-zlib-opt=OPTIONS            set additional build options for zlib
@ -612,6 +539,19 @@ END
 fi


+if [ $HTTP = NO ]; then
+    HTTP_CHARSET=NO
+    HTTP_GZIP=NO
+    HTTP_SSI=NO
+    HTTP_USERID=NO
+    HTTP_ACCESS=NO
+    HTTP_STATUS=NO
+    HTTP_REWRITE=NO
+    HTTP_PROXY=NO
+    HTTP_FASTCGI=NO
+fi
+
+
 if [ ".$NGX_PLATFORM" = ".win32" ]; then
    NGX_WINE=$WINE
 fi
--- a/auto/os/conf
+++ b/auto/os/conf
@ -41,14 +41,6 @@ case "$NGX_PLATFORM" in
 '
    ;;

-    NetBSD:*)
-        CORE_INCS="$UNIX_INCS"
-        CORE_DEPS="$UNIX_DEPS $POSIX_DEPS"
-        CORE_SRCS="$UNIX_SRCS"
-
-        NGX_RPATH=YES
-    ;;
-
    HP-UX:*)
        # HP/UX
        have=NGX_HPUX . auto/have_headers
@ -110,26 +102,6 @@ case "$NGX_MACHINE" in
        NGX_MACH_CACHE_LINE=64
    ;;

-    aarch64 | arm64)
-        have=NGX_ALIGNMENT value=16 . auto/define
-        NGX_MACH_CACHE_LINE=64
-    ;;
-
-    ppc64* | powerpc64*)
-        have=NGX_ALIGNMENT value=16 . auto/define
-        NGX_MACH_CACHE_LINE=128
-    ;;
-
-    riscv64)
-        have=NGX_ALIGNMENT value=16 . auto/define
-        NGX_MACH_CACHE_LINE=64
-    ;;
-
-    s390x)
-        have=NGX_ALIGNMENT value=16 . auto/define
-        NGX_MACH_CACHE_LINE=256
-    ;;
-
    *)
        have=NGX_ALIGNMENT value=16 . auto/define
        NGX_MACH_CACHE_LINE=32
--- a/auto/os/darwin
+++ b/auto/os/darwin
@ -17,9 +17,6 @@ ngx_spacer='
 MAIN_LINK=
 MODULE_LINK="-shared -Wl,-undefined,dynamic_lookup"

-CC_AUX_FLAGS="$CC_AUX_FLAGS -D__APPLE_USE_RFC_3542"
-
-
 # kqueue

 echo " + kqueue found"
@ -89,6 +86,7 @@ ngx_feature_test="int  kq;

 # sendfile()

+CC_AUX_FLAGS="$CC_AUX_FLAGS"
 ngx_feature="sendfile()"
 ngx_feature_name="NGX_HAVE_SENDFILE"
 ngx_feature_run=yes
@ -115,6 +113,6 @@ ngx_feature_run=no
 ngx_feature_incs="#include <libkern/OSAtomic.h>"
 ngx_feature_path=
 ngx_feature_libs=
-ngx_feature_test="int32_t  lock = 0;
-                  if (!OSAtomicCompareAndSwap32Barrier(0, 1, &lock)) return 1"
+ngx_feature_test="int32_t  lock, n;
+                  n = OSAtomicCompareAndSwap32Barrier(0, 1, &lock)"
 . auto/feature
--- a/auto/os/freebsd
+++ b/auto/os/freebsd
@ -44,10 +44,12 @@ if [ $osreldate -gt 300007 ]; then
    CORE_SRCS="$CORE_SRCS $FREEBSD_SENDFILE_SRCS"
 fi

-if [ $osreldate -gt 1100093 ]; then
-    echo " + sendfile()'s SF_NODISKIO found"
+if [ $NGX_FILE_AIO = YES ]; then
+    if [ $osreldate -gt 502103 ]; then
+        echo " + sendfile()'s SF_NODISKIO found"

-    have=NGX_HAVE_SENDFILE_NODISKIO . auto/have
+        have=NGX_HAVE_AIO_SENDFILE . auto/have
+    fi
 fi

 # POSIX semaphores
--- a/auto/os/linux
+++ b/auto/os/linux
@ -44,7 +44,6 @@ ngx_feature_test="int efd = 0;
                  struct epoll_event ee;
                  ee.events = EPOLLIN|EPOLLOUT|EPOLLET;
                  ee.data.ptr = NULL;
-                  (void) ee;
                  efd = epoll_create(100);
                  if (efd == -1) return 1;"
 . auto/feature
@ -70,47 +69,6 @@ if [ $ngx_found = yes ]; then
                      ee.data.ptr = NULL;
                      epoll_ctl(efd, EPOLL_CTL_ADD, fd, &ee)"
    . auto/feature
-
-
-    # EPOLLEXCLUSIVE appeared in Linux 4.5, glibc 2.24
-
-    ngx_feature="EPOLLEXCLUSIVE"
-    ngx_feature_name="NGX_HAVE_EPOLLEXCLUSIVE"
-    ngx_feature_run=no
-    ngx_feature_incs="#include <sys/epoll.h>"
-    ngx_feature_path=
-    ngx_feature_libs=
-    ngx_feature_test="int efd = 0, fd = 0;
-                      struct epoll_event ee;
-                      ee.events = EPOLLIN|EPOLLEXCLUSIVE;
-                      ee.data.ptr = NULL;
-                      epoll_ctl(efd, EPOLL_CTL_ADD, fd, &ee)"
-    . auto/feature
-
-
-    # eventfd()
-
-    ngx_feature="eventfd()"
-    ngx_feature_name="NGX_HAVE_EVENTFD"
-    ngx_feature_run=no
-    ngx_feature_incs="#include <sys/eventfd.h>"
-    ngx_feature_path=
-    ngx_feature_libs=
-    ngx_feature_test="(void) eventfd(0, 0)"
-    . auto/feature
-
-    if [ $ngx_found = yes ]; then
-        have=NGX_HAVE_SYS_EVENTFD_H . auto/have
-    fi
-
-
-    if [ $ngx_found = no ]; then
-
-        ngx_feature="eventfd() (SYS_eventfd)"
-        ngx_feature_incs="#include <sys/syscall.h>"
-        ngx_feature_test="(void) SYS_eventfd"
-        . auto/feature
-    fi
 fi


@ -182,37 +140,17 @@ ngx_feature_test="if (prctl(PR_SET_DUMPABLE, 1, 0, 0, 0) == -1) return 1"
 . auto/feature


-# prctl(PR_SET_KEEPCAPS)
+# sched_setaffinity()

-ngx_feature="prctl(PR_SET_KEEPCAPS)"
-ngx_feature_name="NGX_HAVE_PR_SET_KEEPCAPS"
-ngx_feature_run=yes
-ngx_feature_incs="#include <sys/prctl.h>"
-ngx_feature_path=
-ngx_feature_libs=
-ngx_feature_test="if (prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0) == -1) return 1"
-. auto/feature
-
-
-# capabilities
-
-ngx_feature="capabilities"
-ngx_feature_name="NGX_HAVE_CAPABILITIES"
+ngx_feature="sched_setaffinity()"
+ngx_feature_name="NGX_HAVE_SCHED_SETAFFINITY"
 ngx_feature_run=no
-ngx_feature_incs="#include <linux/capability.h>
-                  #include <sys/syscall.h>"
+ngx_feature_incs="#include <sched.h>"
 ngx_feature_path=
 ngx_feature_libs=
-ngx_feature_test="struct __user_cap_data_struct    data;
-                  struct __user_cap_header_struct  header;
-
-                  header.version = _LINUX_CAPABILITY_VERSION_1;
-                  data.effective = CAP_TO_MASK(CAP_NET_RAW);
-                  data.permitted = 0;
-
-                  (void) header;
-                  (void) data;
-                  (void) SYS_capset"
+ngx_feature_test="cpu_set_t mask;
+                  CPU_ZERO(&mask);
+                  sched_setaffinity(0, sizeof(cpu_set_t), &mask)"
 . auto/feature


@ -228,71 +166,8 @@ ngx_feature_test="struct crypt_data  cd;
                  crypt_r(\"key\", \"salt\", &cd);"
 . auto/feature

-if [ $ngx_found = yes ]; then
-    CRYPT_LIB="-lcrypt"
-fi
-

 ngx_include="sys/vfs.h";     . auto/include


-# BPF sockhash
-
-ngx_feature="BPF sockhash"
-ngx_feature_name="NGX_HAVE_BPF"
-ngx_feature_run=no
-ngx_feature_incs="#include <linux/bpf.h>
-                  #include <sys/syscall.h>"
-ngx_feature_path=
-ngx_feature_libs=
-ngx_feature_test="union bpf_attr attr = { 0 };
-
-                  attr.map_flags = 0;
-                  attr.map_type = BPF_MAP_TYPE_SOCKHASH;
-
-                  syscall(__NR_bpf, 0, &attr, 0);"
-. auto/feature
-
-if [ $ngx_found = yes ]; then
-    CORE_SRCS="$CORE_SRCS src/core/ngx_bpf.c"
-    CORE_DEPS="$CORE_DEPS src/core/ngx_bpf.h"
-
-    if [ $QUIC_BPF != NONE ]; then
-        QUIC_BPF=YES
-    fi
-fi
-
-
-ngx_feature="SO_COOKIE"
-ngx_feature_name="NGX_HAVE_SO_COOKIE"
-ngx_feature_run=no
-ngx_feature_incs="#include <sys/socket.h>
-                  $NGX_INCLUDE_INTTYPES_H"
-ngx_feature_path=
-ngx_feature_libs=
-ngx_feature_test="socklen_t optlen = sizeof(uint64_t);
-                  uint64_t cookie;
-                  getsockopt(0, SOL_SOCKET, SO_COOKIE, &cookie, &optlen)"
-. auto/feature
-
-if [ $ngx_found = yes ]; then
-    SO_COOKIE_FOUND=YES
-fi
-
-
-# UDP segmentation offloading
-
-ngx_feature="UDP_SEGMENT"
-ngx_feature_name="NGX_HAVE_UDP_SEGMENT"
-ngx_feature_run=no
-ngx_feature_incs="#include <sys/socket.h>
-                  #include <netinet/udp.h>"
-ngx_feature_path=
-ngx_feature_libs=
-ngx_feature_test="socklen_t optlen = sizeof(int);
-                  int val;
-                  getsockopt(0, SOL_UDP, UDP_SEGMENT, &val, &optlen)"
-. auto/feature
-
-
 CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
--- a/auto/os/solaris
+++ b/auto/os/solaris
@ -52,7 +52,7 @@ ngx_feature_run=no
 ngx_feature_incs="#include <port.h>"
 ngx_feature_path=
 ngx_feature_libs=
-ngx_feature_test="(void) port_create()"
+ngx_feature_test="int n = port_create()"
 . auto/feature

 if [ $ngx_found = yes ]; then
--- a/auto/os/win32
+++ b/auto/os/win32
@ -11,14 +11,12 @@ CORE_SRCS="$WIN32_SRCS $IOCP_SRCS"
 OS_CONFIG="$WIN32_CONFIG"
 NGX_ICONS="$NGX_WIN32_ICONS"
 SELECT_SRCS=$WIN32_SELECT_SRCS
-POLL_SRCS=$WIN32_POLL_SRCS

 ngx_pic_opt=
-ngx_binext=".exe"

 case "$NGX_CC_NAME" in

-    clang | gcc)
+    gcc)
        CORE_LIBS="$CORE_LIBS -ladvapi32 -lws2_32"
        MAIN_LINK="$MAIN_LINK -Wl,--export-all-symbols"
        MAIN_LINK="$MAIN_LINK -Wl,--out-implib=$NGX_OBJS/libnginx.a"
@ -32,8 +30,15 @@ case "$NGX_CC_NAME" in
 esac

 EVENT_MODULES="$EVENT_MODULES $IOCP_MODULE"
-#EVENT_FOUND=YES
+EVENT_FOUND=YES

-have=NGX_HAVE_INET6 . auto/have
+if [ $EVENT_SELECT = NO ]; then
+    CORE_SRCS="$CORE_SRCS $SELECT_SRCS"
+    EVENT_MODULES="$EVENT_MODULES $SELECT_MODULE"
+fi
+
+if [ $NGX_IPV6 = YES ]; then
+    have=NGX_HAVE_INET6 . auto/have
+fi

 have=NGX_HAVE_IOCP . auto/have
--- a/auto/sources
+++ b/auto/sources
@ -61,7 +61,6 @@ CORE_SRCS="src/core/nginx.c \
           src/core/ngx_crc32.c \
           src/core/ngx_murmurhash.c \
           src/core/ngx_md5.c \
-           src/core/ngx_sha1.c \
           src/core/ngx_rbtree.c \
           src/core/ngx_radix_tree.c \
           src/core/ngx_slab.c \
@ -83,20 +82,18 @@ CORE_SRCS="src/core/nginx.c \

 EVENT_MODULES="ngx_events_module ngx_event_core_module"

-EVENT_INCS="src/event src/event/modules src/event/quic"
+EVENT_INCS="src/event src/event/modules"

 EVENT_DEPS="src/event/ngx_event.h \
            src/event/ngx_event_timer.h \
            src/event/ngx_event_posted.h \
            src/event/ngx_event_connect.h \
-            src/event/ngx_event_pipe.h \
-            src/event/ngx_event_udp.h"
+            src/event/ngx_event_pipe.h"

 EVENT_SRCS="src/event/ngx_event.c \
            src/event/ngx_event_timer.c \
            src/event/ngx_event_posted.c \
            src/event/ngx_event_accept.c \
-            src/event/ngx_event_udp.c \
            src/event/ngx_event_connect.c \
            src/event/ngx_event_pipe.c"

@ -107,7 +104,6 @@ WIN32_SELECT_SRCS=src/event/modules/ngx_win32_select_module.c

 POLL_MODULE=ngx_poll_module
 POLL_SRCS=src/event/modules/ngx_poll_module.c
-WIN32_POLL_SRCS=src/event/modules/ngx_win32_poll_module.c

 KQUEUE_MODULE=ngx_kqueue_module
 KQUEUE_SRCS=src/event/modules/ngx_kqueue_module.c
@ -170,7 +166,6 @@ UNIX_SRCS="$CORE_SRCS $EVENT_SRCS \
            src/os/unix/ngx_send.c \
            src/os/unix/ngx_writev_chain.c \
            src/os/unix/ngx_udp_send.c \
-            src/os/unix/ngx_udp_sendmsg_chain.c \
            src/os/unix/ngx_channel.c \
            src/os/unix/ngx_shmem.c \
            src/os/unix/ngx_process.c \
@ -256,6 +251,3 @@ NGX_WIN32_RC="src/os/win32/nginx.rc"


 HTTP_FILE_CACHE_SRCS=src/http/ngx_http_file_cache.c
-
-HTTP_HUFF_SRCS="src/http/ngx_http_huff_decode.c
-                src/http/ngx_http_huff_encode.c"
--- a/auto/summary
+++ b/auto/summary
@ -16,9 +16,9 @@ if [ $USE_PCRE = DISABLED ]; then

 else
    case $PCRE in
-        YES)   echo "  + using system $PCRE_LIBRARY library" ;;
+        YES)   echo "  + using system PCRE library" ;;
        NONE)  echo "  + PCRE library is not used" ;;
-        *)     echo "  + using $PCRE_LIBRARY library: $PCRE" ;;
+        *)     echo "  + using PCRE library: $PCRE" ;;
    esac
 fi

@ -28,6 +28,20 @@ case $OPENSSL in
    *)     echo "  + using OpenSSL library: $OPENSSL" ;;
 esac

+case $MD5 in
+    YES)   echo "  + md5: using $MD5_LIB library" ;;
+    NONE)  echo "  + md5 library is not used" ;;
+    NO)    echo "  + using builtin md5 code" ;;
+    *)     echo "  + using md5 library: $MD5" ;;
+esac
+
+case $SHA1 in
+    YES)   echo "  + sha1: using $SHA1_LIB library" ;;
+    NONE)  echo "  + sha1 library is not used" ;;
+    NO)    echo "  + sha1 library is not found" ;;
+    *)     echo "  + using sha1 library: $SHA1" ;;
+esac
+
 case $ZLIB in
    YES)   echo "  + using system zlib library" ;;
    NONE)  echo "  + zlib library is not used" ;;
--- a/auto/threads
+++ b/auto/threads
@ -17,5 +17,4 @@ END
    CORE_DEPS="$CORE_DEPS $THREAD_POOL_DEPS"
    CORE_SRCS="$CORE_SRCS $THREAD_POOL_SRCS"
    CORE_LIBS="$CORE_LIBS -lpthread"
-    NGX_LIBPTHREAD="-lpthread"
 fi
--- a/auto/types/sizeof
+++ b/auto/types/sizeof
@ -25,7 +25,7 @@ $NGX_INCLUDE_UNISTD_H
 $NGX_INCLUDE_INTTYPES_H
 $NGX_INCLUDE_AUTO_CONFIG_H

-int main(void) {
+int main() {
    printf("%d", (int) sizeof($ngx_type));
    return 0;
 }
--- a/auto/types/typedef
+++ b/auto/types/typedef
@ -27,7 +27,7 @@ do
 #include <netinet/in.h>
 $NGX_INCLUDE_INTTYPES_H

-int main(void) {
+int main() {
    $ngx_try i = 0;
    return (int) i;
 }
--- a/auto/types/uintptr_t
+++ b/auto/types/uintptr_t
@ -17,9 +17,9 @@ found=no
 cat << END > $NGX_AUTOTEST.c

 #include <sys/types.h>
-$NGX_INCLUDE_INTTYPES_H
+$NGX_INTTYPES_H

-int main(void) {
+int main() {
    uintptr_t i = 0;
    return (int) i;
 }
--- a/auto/unix
+++ b/auto/unix
@ -75,7 +75,7 @@ if test -z "$NGX_KQUEUE_CHECKED"; then
    ngx_feature_incs="#include <sys/event.h>"
    ngx_feature_path=
    ngx_feature_libs=
-    ngx_feature_test="(void) kqueue()"
+    ngx_feature_test="int kq; kq = kqueue()"
    . auto/feature

    if [ $ngx_found = yes ]; then
@ -92,8 +92,7 @@ if test -z "$NGX_KQUEUE_CHECKED"; then
        ngx_feature_path=
        ngx_feature_libs=
        ngx_feature_test="struct kevent  kev;
-                          kev.fflags = NOTE_LOWAT;
-                          (void) kev"
+                          kev.fflags = NOTE_LOWAT;"
        . auto/feature


@ -261,11 +260,11 @@ ngx_feature_run=no
 ngx_feature_incs="#include <dlfcn.h>"
 ngx_feature_path=
 ngx_feature_libs=
-ngx_feature_test="dlopen(NULL, RTLD_NOW | RTLD_GLOBAL); dlsym(NULL, \"\")"
+ngx_feature_test="dlopen(NULL, RTLD_NOW | RTLD_GLOBAL); dlsym(NULL, NULL)"
 . auto/feature


-if [ $ngx_found = no ]; then
+if [ $ngx_found != yes ]; then

    ngx_feature="dlopen() in libdl"
    ngx_feature_libs="-ldl"
@ -288,7 +287,7 @@ ngx_feature_test="sched_yield()"
 . auto/feature


-if [ $ngx_found = no ]; then
+if [ $ngx_found != yes ]; then

    ngx_feature="sched_yield() in librt"
    ngx_feature_libs="-lrt"
@ -300,18 +299,6 @@ if [ $ngx_found = no ]; then
 fi


-ngx_feature="sched_setaffinity()"
-ngx_feature_name="NGX_HAVE_SCHED_SETAFFINITY"
-ngx_feature_run=no
-ngx_feature_incs="#include <sched.h>"
-ngx_feature_path=
-ngx_feature_libs=
-ngx_feature_test="cpu_set_t mask;
-                  CPU_ZERO(&mask);
-                  sched_setaffinity(0, sizeof(cpu_set_t), &mask)"
-. auto/feature
-
-
 ngx_feature="SO_SETFIB"
 ngx_feature_name="NGX_HAVE_SETFIB"
 ngx_feature_run=no
@ -342,57 +329,6 @@ ngx_feature_test="setsockopt(0, SOL_SOCKET, SO_ACCEPTFILTER, NULL, 0)"
 . auto/feature


-# OpenBSD bind to any address for transparent proxying
-
-ngx_feature="SO_BINDANY"
-ngx_feature_name="NGX_HAVE_TRANSPARENT_PROXY"
-ngx_feature_run=no
-ngx_feature_incs="#include <sys/socket.h>"
-ngx_feature_path=
-ngx_feature_libs=
-ngx_feature_test="setsockopt(0, SOL_SOCKET, SO_BINDANY, NULL, 0)"
-. auto/feature
-
-
-# Linux transparent proxying
-
-ngx_feature="IP_TRANSPARENT"
-ngx_feature_name="NGX_HAVE_TRANSPARENT_PROXY"
-ngx_feature_run=no
-ngx_feature_incs="#include <sys/socket.h>
-                  #include <netinet/in.h>"
-ngx_feature_path=
-ngx_feature_libs=
-ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_TRANSPARENT, NULL, 0)"
-. auto/feature
-
-
-# FreeBSD bind to any address for transparent proxying
-
-ngx_feature="IP_BINDANY"
-ngx_feature_name="NGX_HAVE_TRANSPARENT_PROXY"
-ngx_feature_run=no
-ngx_feature_incs="#include <sys/socket.h>
-                  #include <netinet/in.h>"
-ngx_feature_path=
-ngx_feature_libs=
-ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_BINDANY, NULL, 0)"
-. auto/feature
-
-
-# Linux IP_BIND_ADDRESS_NO_PORT
-
-ngx_feature="IP_BIND_ADDRESS_NO_PORT"
-ngx_feature_name="NGX_HAVE_IP_BIND_ADDRESS_NO_PORT"
-ngx_feature_run=no
-ngx_feature_incs="#include <sys/socket.h>
-                  #include <netinet/in.h>"
-ngx_feature_path=
-ngx_feature_libs=
-ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_BIND_ADDRESS_NO_PORT, NULL, 0)"
-. auto/feature
-
-
 # BSD way to get IPv4 datagram destination address

 ngx_feature="IP_RECVDSTADDR"
@ -406,19 +342,6 @@ ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_RECVDSTADDR, NULL, 0)"
 . auto/feature


-# BSD way to set IPv4 datagram source address
-
-ngx_feature="IP_SENDSRCADDR"
-ngx_feature_name="NGX_HAVE_IP_SENDSRCADDR"
-ngx_feature_run=no
-ngx_feature_incs="#include <sys/socket.h>
-                  #include <netinet/in.h>"
-ngx_feature_path=
-ngx_feature_libs=
-ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_SENDSRCADDR, NULL, 0)"
-. auto/feature
-
-
 # Linux way to get IPv4 datagram destination address

 ngx_feature="IP_PKTINFO"
@ -428,10 +351,7 @@ ngx_feature_incs="#include <sys/socket.h>
                  #include <netinet/in.h>"
 ngx_feature_path=
 ngx_feature_libs=
-ngx_feature_test="struct in_pktinfo  pkt;
-                  pkt.ipi_spec_dst.s_addr = INADDR_ANY;
-                  (void) pkt;
-                  setsockopt(0, IPPROTO_IP, IP_PKTINFO, NULL, 0)"
+ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_PKTINFO, NULL, 0)"
 . auto/feature


@ -448,54 +368,6 @@ ngx_feature_test="setsockopt(0, IPPROTO_IPV6, IPV6_RECVPKTINFO, NULL, 0)"
 . auto/feature


-# IP packet fragmentation
-
-ngx_feature="IP_MTU_DISCOVER"
-ngx_feature_name="NGX_HAVE_IP_MTU_DISCOVER"
-ngx_feature_run=no
-ngx_feature_incs="#include <sys/socket.h>
-                  #include <netinet/in.h>"
-ngx_feature_path=
-ngx_feature_libs=
-ngx_feature_test="(void) IP_PMTUDISC_DO;
-                  setsockopt(0, IPPROTO_IP, IP_MTU_DISCOVER, NULL, 0)"
-. auto/feature
-
-
-ngx_feature="IPV6_MTU_DISCOVER"
-ngx_feature_name="NGX_HAVE_IPV6_MTU_DISCOVER"
-ngx_feature_run=no
-ngx_feature_incs="#include <sys/socket.h>
-                  #include <netinet/in.h>"
-ngx_feature_path=
-ngx_feature_libs=
-ngx_feature_test="(void) IPV6_PMTUDISC_DO;
-                  setsockopt(0, IPPROTO_IPV6, IPV6_MTU_DISCOVER, NULL, 0)"
-. auto/feature
-
-
-ngx_feature="IP_DONTFRAG"
-ngx_feature_name="NGX_HAVE_IP_DONTFRAG"
-ngx_feature_run=no
-ngx_feature_incs="#include <sys/socket.h>
-                  #include <netinet/in.h>"
-ngx_feature_path=
-ngx_feature_libs=
-ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_DONTFRAG, NULL, 0)"
-. auto/feature
-
-
-ngx_feature="IPV6_DONTFRAG"
-ngx_feature_name="NGX_HAVE_IPV6_DONTFRAG"
-ngx_feature_run=no
-ngx_feature_incs="#include <sys/socket.h>
-                  #include <netinet/in.h>"
-ngx_feature_path=
-ngx_feature_libs=
-ngx_feature_test="setsockopt(0, IPPROTO_IP, IPV6_DONTFRAG, NULL, 0)"
-. auto/feature
-
-
 ngx_feature="TCP_DEFER_ACCEPT"
 ngx_feature_name="NGX_HAVE_DEFERRED_ACCEPT"
 ngx_feature_run=no
@ -569,9 +441,9 @@ if [ $NGX_FILE_AIO = YES ]; then
    ngx_feature_incs="#include <aio.h>"
    ngx_feature_path=
    ngx_feature_libs=
-    ngx_feature_test="struct aiocb  iocb;
+    ngx_feature_test="int  n; struct aiocb  iocb;
                      iocb.aio_sigevent.sigev_notify = SIGEV_KEVENT;
-                      (void) aio_read(&iocb)"
+                      n = aio_read(&iocb)"
    . auto/feature

    if [ $ngx_found = yes ]; then
@ -591,7 +463,6 @@ if [ $NGX_FILE_AIO = YES ]; then
                          iocb.aio_lio_opcode = IOCB_CMD_PREAD;
                          iocb.aio_flags = IOCB_FLAG_RESFD;
                          iocb.aio_resfd = -1;
-                          (void) iocb;
                          (void) eventfd(0, 0)"
        . auto/feature

@ -607,12 +478,11 @@ if [ $NGX_FILE_AIO = YES ]; then
        ngx_feature="Linux AIO support (SYS_eventfd)"
        ngx_feature_incs="#include <linux/aio_abi.h>
                          #include <sys/syscall.h>"
-        ngx_feature_test="struct iocb  iocb;
+        ngx_feature_test="int  n = SYS_eventfd;
+                          struct iocb  iocb;
                          iocb.aio_lio_opcode = IOCB_CMD_PREAD;
                          iocb.aio_flags = IOCB_FLAG_RESFD;
-                          iocb.aio_resfd = -1;
-                          (void) iocb;
-                          (void) SYS_eventfd"
+                          iocb.aio_resfd = -1;"
        . auto/feature

        if [ $ngx_found = yes ]; then
@ -630,6 +500,29 @@ Currently file AIO is supported on FreeBSD 4.3+ and Linux 2.6.22+ only
 END
        exit 1
    fi
+
+else
+
+    ngx_feature="eventfd()"
+    ngx_feature_name="NGX_HAVE_EVENTFD"
+    ngx_feature_run=no
+    ngx_feature_incs="#include <sys/eventfd.h>"
+    ngx_feature_path=
+    ngx_feature_libs=
+    ngx_feature_test="(void) eventfd(0, 0)"
+    . auto/feature
+
+    if [ $ngx_found = yes ]; then
+        have=NGX_HAVE_SYS_EVENTFD_H . auto/have
+    fi
+
+    if [ $ngx_found = no ]; then
+
+        ngx_feature="eventfd() (SYS_eventfd)"
+        ngx_feature_incs="#include <sys/syscall.h>"
+        ngx_feature_test="int n = SYS_eventfd"
+        . auto/feature
+    fi
 fi


@ -690,18 +583,19 @@ ngx_param=NGX_MAX_TIME_T_VALUE; ngx_value=$ngx_max_value; . auto/types/value
 # syscalls, libc calls and some features


-ngx_feature="AF_INET6"
-ngx_feature_name="NGX_HAVE_INET6"
-ngx_feature_run=no
-ngx_feature_incs="#include <sys/socket.h>
-                  #include <netinet/in.h>
-                  #include <arpa/inet.h>"
-ngx_feature_path=
-ngx_feature_libs=
-ngx_feature_test="struct sockaddr_in6  sin6;
-                  sin6.sin6_family = AF_INET6;
-                  (void) sin6"
-. auto/feature
+if [ $NGX_IPV6 = YES ]; then
+    ngx_feature="AF_INET6"
+    ngx_feature_name="NGX_HAVE_INET6"
+    ngx_feature_run=no
+    ngx_feature_incs="#include <sys/socket.h>
+                      #include <netinet/in.h>
+                      #include <arpa/inet.h>"
+    ngx_feature_path=
+    ngx_feature_libs=
+    ngx_feature_test="struct sockaddr_in6  sin6;
+                      sin6.sin6_family = AF_INET6;"
+    . auto/feature
+fi


 ngx_feature="setproctitle()"
@ -752,33 +646,17 @@ ngx_feature_test="char buf[1]; struct iovec vec[1]; ssize_t n;
 . auto/feature


-# strerrordesc_np(), introduced in glibc 2.32
-
-ngx_feature="strerrordesc_np()"
-ngx_feature_name="NGX_HAVE_STRERRORDESC_NP"
-ngx_feature_run=no
-ngx_feature_incs='#include <string.h>'
+ngx_feature="sys_nerr"
+ngx_feature_name="NGX_SYS_NERR"
+ngx_feature_run=value
+ngx_feature_incs='#include <errno.h>
+                  #include <stdio.h>'
 ngx_feature_path=
 ngx_feature_libs=
-ngx_feature_test="char *p; p = strerrordesc_np(0);
-                  if (p == NULL) return 1"
+ngx_feature_test='printf("%d", sys_nerr);'
 . auto/feature


-if [ $ngx_found = no ]; then
-
-    ngx_feature="sys_nerr"
-    ngx_feature_name="NGX_SYS_NERR"
-    ngx_feature_run=value
-    ngx_feature_incs='#include <errno.h>
-                      #include <stdio.h>'
-    ngx_feature_path=
-    ngx_feature_libs=
-    ngx_feature_test='printf("%d", sys_nerr);'
-    . auto/feature
-fi
-
-
 if [ $ngx_found = no ]; then

    # Cygiwn defines _sys_nerr
@ -794,6 +672,34 @@ if [ $ngx_found = no ]; then
 fi


+if [ $ngx_found = no ]; then
+
+    # Solaris has no sys_nerr
+    ngx_feature='maximum errno'
+    ngx_feature_name=NGX_SYS_NERR
+    ngx_feature_run=value
+    ngx_feature_incs='#include <errno.h>
+                      #include <string.h>
+                      #include <stdio.h>'
+    ngx_feature_path=
+    ngx_feature_libs=
+    ngx_feature_test='int  n;
+                      char *p;
+                      for (n = 1; n < 1000; n++) {
+                          errno = 0;
+                          p = strerror(n);
+                          if (errno == EINVAL
+                              || p == NULL
+                              || strncmp(p, "Unknown error", 13) == 0)
+                          {
+                              break;
+                          }
+                      }
+                      printf("%d", n);'
+    . auto/feature
+fi
+
+
 ngx_feature="localtime_r()"
 ngx_feature_name="NGX_HAVE_LOCALTIME_R"
 ngx_feature_run=no
@ -804,30 +710,6 @@ ngx_feature_test="struct tm t; time_t c=0; localtime_r(&c, &t)"
 . auto/feature


-ngx_feature="clock_gettime(CLOCK_MONOTONIC)"
-ngx_feature_name="NGX_HAVE_CLOCK_MONOTONIC"
-ngx_feature_run=no
-ngx_feature_incs="#include <time.h>"
-ngx_feature_path=
-ngx_feature_libs=
-ngx_feature_test="struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts)"
-. auto/feature
-
-
-if [ $ngx_found = no ]; then
-
-    # Linux before glibc 2.17, notably CentOS 6
-
-    ngx_feature="clock_gettime(CLOCK_MONOTONIC) in librt"
-    ngx_feature_libs="-lrt"
-    . auto/feature
-
-    if [ $ngx_found = yes ]; then
-        CORE_LIBS="$CORE_LIBS -lrt"
-    fi
-fi
-
-
 ngx_feature="posix_memalign()"
 ngx_feature_name="NGX_HAVE_POSIX_MEMALIGN"
 ngx_feature_run=no
@ -914,7 +796,6 @@ if [ $ngx_found = no ]; then

    if [ $ngx_found = yes ]; then
        CORE_LIBS="$CORE_LIBS -lpthread"
-        NGX_LIBPTHREAD="-lpthread"
    fi
 fi

@ -956,18 +837,6 @@ ngx_feature_test="int i = FIONBIO; printf(\"%d\", i)"
 . auto/feature


-ngx_feature="ioctl(FIONREAD)"
-ngx_feature_name="NGX_HAVE_FIONREAD"
-ngx_feature_run=no
-ngx_feature_incs="#include <sys/ioctl.h>
-                  #include <stdio.h>
-                  $NGX_INCLUDE_SYS_FILIO_H"
-ngx_feature_path=
-ngx_feature_libs=
-ngx_feature_test="int i = FIONREAD; printf(\"%d\", i)"
-. auto/feature
-
-
 ngx_feature="struct tm.tm_gmtoff"
 ngx_feature_name="NGX_HAVE_GMTOFF"
 ngx_feature_run=no
@ -1014,16 +883,6 @@ ngx_feature_test="sysconf(_SC_NPROCESSORS_ONLN)"
 . auto/feature


-ngx_feature="sysconf(_SC_LEVEL1_DCACHE_LINESIZE)"
-ngx_feature_name="NGX_HAVE_LEVEL1_DCACHE_LINESIZE"
-ngx_feature_run=no
-ngx_feature_incs=
-ngx_feature_path=
-ngx_feature_libs=
-ngx_feature_test="sysconf(_SC_LEVEL1_DCACHE_LINESIZE)"
-. auto/feature
-
-
 ngx_feature="openat(), fstatat()"
 ngx_feature_name="NGX_HAVE_OPENAT"
 ngx_feature_run=no
--- a/conf/mime.types
+++ b/conf/mime.types
@ -1,99 +1,89 @@

 types {
-    text/html                                        html htm shtml;
-    text/css                                         css;
-    text/xml                                         xml;
-    image/gif                                        gif;
-    image/jpeg                                       jpeg jpg;
-    application/javascript                           js;
-    application/atom+xml                             atom;
-    application/rss+xml                              rss;
+    text/html                             html htm shtml;
+    text/css                              css;
+    text/xml                              xml;
+    image/gif                             gif;
+    image/jpeg                            jpeg jpg;
+    application/javascript                js;
+    application/atom+xml                  atom;
+    application/rss+xml                   rss;

-    text/mathml                                      mml;
-    text/plain                                       txt;
-    text/vnd.sun.j2me.app-descriptor                 jad;
-    text/vnd.wap.wml                                 wml;
-    text/x-component                                 htc;
+    text/mathml                           mml;
+    text/plain                            txt;
+    text/vnd.sun.j2me.app-descriptor      jad;
+    text/vnd.wap.wml                      wml;
+    text/x-component                      htc;

-    image/avif                                       avif;
-    image/png                                        png;
-    image/svg+xml                                    svg svgz;
-    image/tiff                                       tif tiff;
-    image/vnd.wap.wbmp                               wbmp;
-    image/webp                                       webp;
-    image/x-icon                                     ico;
-    image/x-jng                                      jng;
-    image/x-ms-bmp                                   bmp;
+    image/png                             png;
+    image/tiff                            tif tiff;
+    image/vnd.wap.wbmp                    wbmp;
+    image/x-icon                          ico;
+    image/x-jng                           jng;
+    image/x-ms-bmp                        bmp;
+    image/svg+xml                         svg svgz;
+    image/webp                            webp;

-    font/woff                                        woff;
-    font/woff2                                       woff2;
+    application/font-woff                 woff;
+    application/java-archive              jar war ear;
+    application/json                      json;
+    application/mac-binhex40              hqx;
+    application/msword                    doc;
+    application/pdf                       pdf;
+    application/postscript                ps eps ai;
+    application/rtf                       rtf;
+    application/vnd.apple.mpegurl         m3u8;
+    application/vnd.ms-excel              xls;
+    application/vnd.ms-fontobject         eot;
+    application/vnd.ms-powerpoint         ppt;
+    application/vnd.wap.wmlc              wmlc;
+    application/vnd.google-earth.kml+xml  kml;
+    application/vnd.google-earth.kmz      kmz;
+    application/x-7z-compressed           7z;
+    application/x-cocoa                   cco;
+    application/x-java-archive-diff       jardiff;
+    application/x-java-jnlp-file          jnlp;
+    application/x-makeself                run;
+    application/x-perl                    pl pm;
+    application/x-pilot                   prc pdb;
+    application/x-rar-compressed          rar;
+    application/x-redhat-package-manager  rpm;
+    application/x-sea                     sea;
+    application/x-shockwave-flash         swf;
+    application/x-stuffit                 sit;
+    application/x-tcl                     tcl tk;
+    application/x-x509-ca-cert            der pem crt;
+    application/x-xpinstall               xpi;
+    application/xhtml+xml                 xhtml;
+    application/xspf+xml                  xspf;
+    application/zip                       zip;

-    application/java-archive                         jar war ear;
-    application/json                                 json;
-    application/mac-binhex40                         hqx;
-    application/msword                               doc;
-    application/pdf                                  pdf;
-    application/postscript                           ps eps ai;
-    application/rtf                                  rtf;
-    application/vnd.apple.mpegurl                    m3u8;
-    application/vnd.google-earth.kml+xml             kml;
-    application/vnd.google-earth.kmz                 kmz;
-    application/vnd.ms-excel                         xls;
-    application/vnd.ms-fontobject                    eot;
-    application/vnd.ms-powerpoint                    ppt;
-    application/vnd.oasis.opendocument.graphics      odg;
-    application/vnd.oasis.opendocument.presentation  odp;
-    application/vnd.oasis.opendocument.spreadsheet   ods;
-    application/vnd.oasis.opendocument.text          odt;
-    application/vnd.openxmlformats-officedocument.presentationml.presentation
-                                                     pptx;
-    application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
-                                                     xlsx;
-    application/vnd.openxmlformats-officedocument.wordprocessingml.document
-                                                     docx;
-    application/vnd.wap.wmlc                         wmlc;
-    application/wasm                                 wasm;
-    application/x-7z-compressed                      7z;
-    application/x-cocoa                              cco;
-    application/x-java-archive-diff                  jardiff;
-    application/x-java-jnlp-file                     jnlp;
-    application/x-makeself                           run;
-    application/x-perl                               pl pm;
-    application/x-pilot                              prc pdb;
-    application/x-rar-compressed                     rar;
-    application/x-redhat-package-manager             rpm;
-    application/x-sea                                sea;
-    application/x-shockwave-flash                    swf;
-    application/x-stuffit                            sit;
-    application/x-tcl                                tcl tk;
-    application/x-x509-ca-cert                       der pem crt;
-    application/x-xpinstall                          xpi;
-    application/xhtml+xml                            xhtml;
-    application/xspf+xml                             xspf;
-    application/zip                                  zip;
+    application/octet-stream              bin exe dll;
+    application/octet-stream              deb;
+    application/octet-stream              dmg;
+    application/octet-stream              iso img;
+    application/octet-stream              msi msp msm;

-    application/octet-stream                         bin exe dll;
-    application/octet-stream                         deb;
-    application/octet-stream                         dmg;
-    application/octet-stream                         iso img;
-    application/octet-stream                         msi msp msm;
+    application/vnd.openxmlformats-officedocument.wordprocessingml.document    docx;
+    application/vnd.openxmlformats-officedocument.spreadsheetml.sheet          xlsx;
+    application/vnd.openxmlformats-officedocument.presentationml.presentation  pptx;

-    audio/midi                                       mid midi kar;
-    audio/mpeg                                       mp3;
-    audio/ogg                                        ogg;
-    audio/x-m4a                                      m4a;
-    audio/x-realaudio                                ra;
+    audio/midi                            mid midi kar;
+    audio/mpeg                            mp3;
+    audio/ogg                             ogg;
+    audio/x-m4a                           m4a;
+    audio/x-realaudio                     ra;

-    video/3gpp                                       3gpp 3gp;
-    video/mp2t                                       ts;
-    video/mp4                                        mp4;
-    video/mpeg                                       mpeg mpg;
-    video/quicktime                                  mov;
-    video/webm                                       webm;
-    video/x-flv                                      flv;
-    video/x-m4v                                      m4v;
-    video/x-mng                                      mng;
-    video/x-ms-asf                                   asx asf;
-    video/x-ms-wmv                                   wmv;
-    video/x-msvideo                                  avi;
+    video/3gpp                            3gpp 3gp;
+    video/mp2t                            ts;
+    video/mp4                             mp4;
+    video/mpeg                            mpeg mpg;
+    video/quicktime                       mov;
+    video/webm                            webm;
+    video/x-flv                           flv;
+    video/x-m4v                           m4v;
+    video/x-mng                           mng;
+    video/x-ms-asf                        asx asf;
+    video/x-ms-wmv                        wmv;
+    video/x-msvideo                       avi;
 }
--- a/7
+++ b/7
@ -36,7 +36,7 @@ if test -z "$NGX_PLATFORM"; then
    NGX_PLATFORM="$NGX_SYSTEM:$NGX_RELEASE:$NGX_MACHINE";

    case "$NGX_SYSTEM" in
-        MINGW32_* | MINGW64_* | MSYS_*)
+        MINGW32_*)
            NGX_PLATFORM=win32
        ;;
    esac
@ -44,7 +44,6 @@ if test -z "$NGX_PLATFORM"; then
 else
    echo "building for $NGX_PLATFORM"
    NGX_SYSTEM=$NGX_PLATFORM
-    NGX_MACHINE=i386
 fi

 . auto/cc/conf
@ -88,10 +87,6 @@ have=NGX_PID_PATH value="\"$NGX_PID_PATH\"" . auto/define
 have=NGX_LOCK_PATH value="\"$NGX_LOCK_PATH\"" . auto/define
 have=NGX_ERROR_LOG_PATH value="\"$NGX_ERROR_LOG_PATH\"" . auto/define

-if [ ".$NGX_ERROR_LOG_PATH" = "." ]; then
-    have=NGX_ERROR_LOG_STDERR . auto/have
-fi
-
 have=NGX_HTTP_LOG_PATH value="\"$NGX_HTTP_LOG_PATH\"" . auto/define
 have=NGX_HTTP_CLIENT_TEMP_PATH value="\"$NGX_HTTP_CLIENT_TEMP_PATH\""
 . auto/define
--- a/configure.docker.sh
+++ b/configure.docker.sh
@ -1,69 +0,0 @@
-#!/bin/bash
-./configure \
-    --with-cc-opt="-g -O2 -fstack-protector-strong -Wformat -Werror=format-security -fPIC -D_FORTIFY_SOURCE=2 -I/tmp/build/quickjs/" \
-    --with-ld-opt="-Wl,-z,relro -Wl,-z,now -fPIC -L/tmp/build/quickjs/" \
-    --sbin-path=/usr/local/sbin/nginx \
-    --conf-path=/video_server/nginx/nginx.conf \
-    --error-log-path=/var/log/nginx/error.log \
-    --pid-path=/var/run/nginx/nginx.pid \
-    --lock-path=/var/lock/nginx/nginx.lock \
-    --http-log-path=/var/log/nginx/access.log \
-    --http-client-body-temp-path=/tmp/nginx-client-body \
-    --with-compat \
-    --with-debug \
-    --with-pcre-jit \
-    --with-http_ssl_module \
-    --with-http_stub_status_module \
-    --with-http_realip_module \
-    --with-http_auth_request_module \
-    --with-http_v2_module \
-    --with-http_dav_module \
-    --with-http_slice_module \
-    --with-threads \
-    --with-http_addition_module \
-    --with-http_flv_module \
-    --with-http_gunzip_module \
-    --with-http_gzip_static_module \
-    --with-http_mp4_module \
-    --with-http_random_index_module \
-    --with-http_secure_link_module \
-    --with-http_sub_module \
-    --with-mail_ssl_module \
-    --with-stream_ssl_module \
-    --with-stream_ssl_preread_module \
-    --with-stream_realip_module \
-    --with-http_geoip_module=dynamic \
-    --with-http_image_filter_module=dynamic \
-    --with-http_perl_module=dynamic \
-    --with-http_xslt_module=dynamic \
-    --with-mail=dynamic \
-    --with-stream=dynamic \
-    --with-stream_geoip_module=dynamic \
-    --add-module=./modules_deb/libnginx-mod-http-ndk-0.3.4 \
-    --add-dynamic-module=./modules_deb/libnginx-mod-http-brotli-1.0.0~rc \
-    --add-dynamic-module=./modules_deb/libnginx-mod-http-cache-purge-2.5.3 \
-    --add-dynamic-module=./modules_deb/libnginx-mod-http-echo-0.63 \
-    --add-dynamic-module=./modules_deb/libnginx-mod-http-geoip2-3.4 \
-    --add-dynamic-module=./modules_deb/libnginx-mod-http-headers-more-filter-0.38 \
-    --add-dynamic-module=./modules_deb/libnginx-mod-http-memc-0.20 \
-    --add-dynamic-module=./modules_deb/libnginx-mod-http-set-misc-0.33 \
-    --add-dynamic-module=./modules_deb/libnginx-mod-http-srcache-filter-0.33 \
-    --add-dynamic-module=./modules_deb/libnginx-mod-http-subs-filter-0.6.4 \
-    --add-dynamic-module=./modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409 \
-    --add-dynamic-module=./modules_deb/libnginx-mod-nchan-1.3.7+dfsg \
-    --add-dynamic-module=./modules/njs/nginx \
-    --add-dynamic-module=./modules/nginx-vod-module \
-    --add-module=./modules/media-framework/nginx-common \
-    --add-dynamic-module=./modules/nginx-stream-preread-str-module \
-    --add-dynamic-module=./modules/media-framework/nginx-kmp-in-module \
-    --add-dynamic-module=./modules/media-framework/nginx-kmp-out-module \
-    --add-dynamic-module=./modules/media-framework/nginx-rtmp-module \
-    --add-dynamic-module=./modules/media-framework/nginx-rtmp-kmp-module \
-    --add-dynamic-module=./modules/media-framework/nginx-mpegts-module \
-    --add-dynamic-module=./modules/media-framework/nginx-mpegts-kmp-module \
-    --add-dynamic-module=./modules/media-framework/nginx-kmp-cc-module \
-    --add-dynamic-module=./modules/media-framework/nginx-kmp-rtmp-module \
-    --add-dynamic-module=./modules/media-framework/nginx-live-module \
-    --add-dynamic-module=./modules/nginx-srt-module \
-    --add-dynamic-module=./modules/media-framework/nginx-pckg-module \
-    --add-dynamic-module=./modules/nginx-secure-token-module
--- a/configure.sh
+++ b/configure.sh
@ -1,66 +0,0 @@
-#!/bin/bash
-./configure \
-    --with-cc-opt="-g -O2 -fstack-protector-strong -Wformat -Werror=format-security -fPIC -D_FORTIFY_SOURCE=2 -I/usr/local/include/quickjs/" \
-    --with-ld-opt="-Wl,-z,relro -Wl,-z,now -fPIC -L/usr/local/lib/quickjs/" \
-    --prefix=/usr/local/temp/nginx/ \
-    --error-log-path=stderr \
-    --lock-path=/var/lock/nginx.lock \
-    --pid-path=/run/nginx.pid \
-    --with-compat \
-    --with-debug \
-    --with-pcre-jit \
-    --with-http_ssl_module \
-    --with-http_stub_status_module \
-    --with-http_realip_module \
-    --with-http_auth_request_module \
-    --with-http_v2_module \
-    --with-http_dav_module \
-    --with-http_slice_module \
-    --with-threads \
-    --with-http_addition_module \
-    --with-http_flv_module \
-    --with-http_gunzip_module \
-    --with-http_gzip_static_module \
-    --with-http_mp4_module \
-    --with-http_random_index_module \
-    --with-http_secure_link_module \
-    --with-http_sub_module \
-    --with-mail_ssl_module \
-    --with-stream_ssl_module \
-    --with-stream_ssl_preread_module \
-    --with-stream_realip_module \
-    --with-http_geoip_module=dynamic \
-    --with-http_image_filter_module=dynamic \
-    --with-http_perl_module=dynamic \
-    --with-http_xslt_module=dynamic \
-    --with-mail=dynamic \
-    --with-stream=dynamic \
-    --with-stream_geoip_module=dynamic \
-    --add-module=./modules_deb/libnginx-mod-http-ndk-0.3.4 \
-    --add-dynamic-module=./modules_deb/libnginx-mod-http-brotli-1.0.0~rc \
-    --add-dynamic-module=./modules_deb/libnginx-mod-http-cache-purge-2.5.3 \
-    --add-dynamic-module=./modules_deb/libnginx-mod-http-echo-0.63 \
-    --add-dynamic-module=./modules_deb/libnginx-mod-http-geoip2-3.4 \
-    --add-dynamic-module=./modules_deb/libnginx-mod-http-headers-more-filter-0.38 \
-    --add-dynamic-module=./modules_deb/libnginx-mod-http-memc-0.20 \
-    --add-dynamic-module=./modules_deb/libnginx-mod-http-set-misc-0.33 \
-    --add-dynamic-module=./modules_deb/libnginx-mod-http-srcache-filter-0.33 \
-    --add-dynamic-module=./modules_deb/libnginx-mod-http-subs-filter-0.6.4 \
-    --add-dynamic-module=./modules_deb/libnginx-mod-http-upstream-fair-0.0~git20120408.a18b409 \
-    --add-dynamic-module=./modules_deb/libnginx-mod-nchan-1.3.7+dfsg \
-    --add-dynamic-module=./modules/njs/nginx \
-    --add-dynamic-module=./modules/nginx-vod-module \
-    --add-module=./modules/media-framework/nginx-common \
-    --add-dynamic-module=./modules/nginx-stream-preread-str-module \
-    --add-dynamic-module=./modules/media-framework/nginx-kmp-in-module \
-    --add-dynamic-module=./modules/media-framework/nginx-kmp-out-module \
-    --add-dynamic-module=./modules/media-framework/nginx-rtmp-module \
-    --add-dynamic-module=./modules/media-framework/nginx-rtmp-kmp-module \
-    --add-dynamic-module=./modules/media-framework/nginx-mpegts-module \
-    --add-dynamic-module=./modules/media-framework/nginx-mpegts-kmp-module \
-    --add-dynamic-module=./modules/media-framework/nginx-kmp-cc-module \
-    --add-dynamic-module=./modules/media-framework/nginx-kmp-rtmp-module \
-    --add-dynamic-module=./modules/media-framework/nginx-live-module \
-    --add-dynamic-module=./modules/nginx-srt-module \
-    --add-dynamic-module=./modules/media-framework/nginx-pckg-module \
-    --add-dynamic-module=./modules/nginx-secure-token-module
--- a/contrib/unicode2nginx/unicode-to-nginx.pl
+++ b/contrib/unicode2nginx/unicode-to-nginx.pl
@ -10,7 +10,7 @@

 # Needs perl 5.6 or later.

-# Written by Maxim Dounin, mdounin@mdounin.ru
+# Written by Maxim Dounin, mdounin@rambler-co.ru

 ###############################################################################

@ -33,10 +33,7 @@ while (<>) {

 		# Produce UTF-8 sequence from character code;

-		my $un_utf8 = join('',
-			map { sprintf("%02X", $_) }
-			unpack("U0C*", pack("U", hex($un_code)))
-		);
+		my $un_utf8 = join('', map { sprintf("%02X", $_) } unpack("C*", pack("U", hex($un_code))));

 		print "    $cs_code  $un_utf8 ; $un_name\n";

--- a/contrib/vim/ftplugin/nginx.vim
+++ b/contrib/vim/ftplugin/nginx.vim
@ -1 +0,0 @@
-setlocal commentstring=#\ %s
--- a/contrib/vim/syntax/nginx.vim
+++ b/contrib/vim/syntax/nginx.vim
--- a/debian/README.Packaging
+++ b/debian/README.Packaging
@ -1,7 +1,8 @@
 Debian Packaging
 ================

-We use git-buildpackage for packaging.
+We use git-buildpackage for packaging. Our repository can be found at
+git.debian.org:/git/collab-maint/nginx.git.

 Workflow for Unstable
 =====================
@ -13,9 +14,15 @@ Dynamic Modules

 Since v1.9.11 Nginx added dynamic module support. This will sanitize the
 nginx packaging flow in the long term, but there is a lot work to be done
-in order to get there. We gradually convert all modules to dynamic
+in order to get there. We will gradually convert all modules to dynamic
 as they add support for it.

+Currently nginx modules need to be build together with nginx, but this
+will be fixed upstream [0]. Since we already ship 3rd party modules under
+debian/modules/ we will start shipping module packages (libnginx-mod) from
+the same source. Once upstream implements separated building we will
+split each module to a separate source.
+
 [0] https://www.nginx.com/blog/dynamic-modules-nginx-1-9-11/

 Workflow for Experimental
@ -27,7 +34,7 @@ as they lack security support.
 The workflow we use is based on the assumption that packaging work happens on
 origin/master and experimental builds are a trivial patch away from that.

-The direct consequence of treating experimental as a patchset for origin/master
+The direct consequense of treating experimental as a patchset for origin/master
 is that the relevant branches are forced-pushed whenever we release a new
 1.11.x version. In other words, **it is not safe to base your work on the
 experimental branch**.
@ -51,13 +58,20 @@ them.
  are commited (changelog entry etc) and the build is made.

 * upstream-1.11
-  Pushed on every 1.11.x release.
+  Force-pushed on every 1.11.x release.

-  Before a new 1.11.x release origin/upstream is dummy merged (-s ours) into
-  ustream-1.11.  This is a technicallity so we can avoid resolving conflicts
-  when a new 1.10.x release happens between two experimental releases.
+  Before a new 1.11.x release the branch is reset to origin/upstream.
+  This is a technicallity so we can avoid resolving conflicts when a new 1.10.x
+  release happens between two experimental releases.

 Older 1.11.x releases are not referenced by any branch, but they can be found
 by the relevant debian/* tag.

+3rd party experimental workflow
+===============================
+
+As we described, it is better not base you work on our forced-pushed
+experimental branch. A better approach would be to maintain a custom-build
+branch that is rebased to our latest experimental branch (basically git rebase
+--onto the relevant commits should work).

--- a/debian/apport/source_nginx.py
+++ b/debian/apport/source_nginx.py
@ -1,19 +0,0 @@
-'''
-apport package hook for nginx packages
-
-Copyright (c) 2015, Thomas Ward <teward@ubuntu.com>
-'''
-
-import apport.hookutils
-import os
-import subprocess
-
-def add_info(report, ui):
-    if (report['Package'].split()[0] != 'nginx-common'
-        and report['ProblemType'] == 'Package'
-        and os.path.isdir('/run/systemd/system')):
-        report['Journalctl_Nginx.txt'] = apport.hookutils.command_output(
-            ['journalctl', '-xe', '--unit=nginx.service'])
-        report['SystemctlStatusFull_Nginx.txt'] = subprocess.Popen(
-            ['systemctl', '-l', 'status', 'nginx.service'],
-            stdout=subprocess.PIPE).communicate()[0]
--- a/debian/autoscripts/postinst-nginx
+++ b/debian/autoscripts/postinst-nginx
@ -2,25 +2,13 @@ for confpair in #NAMES# ; do
 	from=$(echo $confpair | cut -d: -f1)
 	to=$(echo $confpair | cut -d: -f2)

-	if [ -L /etc/nginx/modules-enabled/$to.removed ]; then
-		rm /etc/nginx/modules-enabled/$to.removed
-		removed_link=true
-	else
-		removed_link=false
-	fi
-
-	# Symlink on
-	# 1) Fresh installations
-	# 2) Reinstalls after automatic removes (preserve admin actions)
-	if [ -z "$2" -o "$removed_link" = "true" ]; then
+	# Symlink on fresh installations
+	if [ -z "$2" ]; then
 		ln -sf /usr/share/nginx/modules-available/$from \
 			/etc/nginx/modules-enabled/$to
 	fi
 done

-if [ "$1" = "configure" ] ; then
-	if which dpkg-trigger >/dev/null 2>&1 ; then
-		dpkg-trigger --no-await nginx-reload
-	fi
-
+if [ -s /run/nginx.pid ]; then
+	nginx -s reload
 fi
--- a/debian/autoscripts/postrm-nginx
+++ b/debian/autoscripts/postrm-nginx
@ -3,26 +3,12 @@ if [ "$1" = "purge" ] ; then
 		from=$(echo $confpair | cut -d: -f1)
 		to=$(echo $confpair | cut -d: -f2)

-		if [ -L /etc/nginx/modules-enabled/$to ]; then
+		if [ -e /etc/nginx/modules-enabled/$to ]; then
 			rm /etc/nginx/modules-enabled/$to
 		fi
-		if [ -L /etc/nginx/modules-enabled/$to.removed ]; then
-			rm /etc/nginx/modules-enabled/$to.removed
-		fi
-	done
-fi
-
-if [ "$1" = "remove" ] ; then
-	for confpair in #NAMES# ; do
-		from=$(echo $confpair | cut -d: -f1)
-		to=$(echo $confpair | cut -d: -f2)
-
-		if [ -L /etc/nginx/modules-enabled/$to ]; then
-			mv /etc/nginx/modules-enabled/$to /etc/nginx/modules-enabled/$to.removed
-		fi
 	done

-        if which dpkg-trigger >/dev/null 2>&1 ; then
-                dpkg-trigger --no-await nginx-reload
+	if [ -s /run/nginx.pid ]; then
+		nginx -s reload
        fi
 fi
--- a/debian/autoscripts/prerm-nginx
+++ b/debian/autoscripts/prerm-nginx
@ -3,8 +3,12 @@ if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then
 		from=$(echo $confpair | cut -d: -f1)
 		to=$(echo $confpair | cut -d: -f2)

-		if [ -L /etc/nginx/modules-enabled/$to ]; then
-			mv /etc/nginx/modules-enabled/$to /etc/nginx/modules-enabled/$to.removed
+		if [ -e /etc/nginx/modules-enabled/$to ]; then
+			rm /etc/nginx/modules-enabled/$to
 		fi
 	done
+
+	if [ -s /run/nginx.pid ]; then
+		nginx -s reload
+	fi
 fi
--- a/debian/changelog
+++ b/debian/changelog
@ -1,853 +1,6 @@
-nginx (1.26.3-3) unstable; urgency=medium
-
-  [ Jan Mojžíš ]
-  * d/changelog: fix whitespace in 1.26.3-2 record
-  * d/control: add libnginx-mod-http-lua dependency for nginx-extras package
-    for riscv64 platform
-
-  [ Thomas Ward ]
-  * d/nginx-common.nginx.service: Add ConditionFileIsExecutable to 
-    SystemD service file, prevents starting of service if nginx is
-    not installed (which can happen if nginx-common is installed 
-    independently from `nginx` itself (Closes: #1098477)
-
- -- Jan Mojžíš <janmojzis@debian.org>  Thu, 15 May 2025 15:31:38 +0200
-
-nginx (1.26.3-2) unstable; urgency=medium
-
-  * Team upload
-  * Upload to unstable
-
- -- Jérémy Lal <kapouer@melix.org>  Fri, 07 Feb 2025 12:53:11 +0100
-
-nginx (1.26.3-1) experimental; urgency=medium
-
-  * Team upload
-  * New upstream version 1.26.3
-
- -- Jérémy Lal <kapouer@melix.org>  Wed, 05 Feb 2025 19:08:02 +0100
-
-nginx (1.26.2-1) experimental; urgency=medium
-
-  * Team upload
-  * New upstream version 1.26.2
-  * Add Sergey Kandaurov <s.kandaurov@f5.com> pgp public key
-  * Drop upstream patches
-
-  [ Jan Mojžíš ]
-  * d/gbp.conf: add upstream-signatures = on
-  * d/{control,copyright}: update my email to "janmojzis@debian.org"
-  * d/copyright: bump my copyright year
-
- -- Jérémy Lal <kapouer@melix.org>  Sun, 02 Feb 2025 21:08:45 +0100
-
-nginx (1.26.0-3) unstable; urgency=medium
-
-  * d/control: Resolve dependency loop between nginx and nginx-common.
-    (Fixes: #1082373)
-
- -- Thomas Ward <teward@ubuntu.com>  Fri, 20 Sep 2024 21:35:42 -0400
-
-nginx (1.26.0-2) unstable; urgency=medium
-
-  [ Jan Mojžíš ]
-  * d/rules: enable QUIC and HTTP/3 module (Closes: 1070488)
-  * d/control: bump Standards-Version: 4.7.0, no changes
-  * d/p/nginx-1.26.1.patch add, backport changes from the nginx 1.26.1 and fix
-    CVE-2024-32760, CVE-2024-31079, CVE-2024-35200, CVE-2024-34161
-  * d/p/CVE-2024-7347.patch add, backport CVE-2024-7347 fix (Closes: 1078971)
-  * d/libnginx-mod.abisubstvars updated comment when ABI needs to be changed
-
-  [ Thomas Ward ]
-  * d/conf/nginx.conf: Update default options for current security
-    practices and standards. SSL protos, disable prefer server
-    ciphers, hide server tokens/versions in responses.
-
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Mon, 19 Aug 2024 18:46:30 +0200
-
-nginx (1.26.0-1) unstable; urgency=medium
-
-  * New upstream version 1.26.0
-  * nginx ABI release: nginx-abi-1.26.0-1 (Closes: 1069997)
-  * d/libnginx-mod.abisubstvars: remove third-party modules version constraints
-  * d/u/signing-key.asc add Roman Arutyunyan’s PGP public key,
-    the key is used to sign the 1.26.0 release
-  * d/p/CVE-2023-44487.patch remove, fixed in upstream
-  * d/ufw/nginx update, add QUICK, thanks Marcus Bointon
-  * d/conf/mime.types add application/xslt+xml, thanks K. Widholm
-  * d/copyright: updated copyright related to new upstream version
-  * d/copyright: bump my copyright year
-  * d/conf/nginx.conf: add worker_cpu_affinity auto (Closes: 1063659)
-  * d/gbp.conf: add sign-tags = True, [pull] track-missing = True,
-    [import-orig] merge-mode = replace
-
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Sun, 05 May 2024 18:48:05 +0200
-
-nginx (1.24.0-2) unstable; urgency=medium
-
-  * d/control added dependency nginx-common to nginx (Closes: 1039905)
-    After nginx installation, the nginx-common package is installed
-    automatically due to its dependencies. The nginx-common package includes
-    the systemd unit, which becomes enabled and activated upon installation.
-    When the nginx is removed, nginx-common package and the systemd unit will
-    remain in the system. Adding a dependency nginx-common to nginx solves
-    this problem.
-  * d/control fixed binNMU safe dependency declaration nginx to nginx-common,
-    nginx is 'any', nginx-common is 'all' -> dependency '= ${source:Version}'
-  * d/rules removed override_dh_strip, migration to automatic debug symbols is
-    already done, fixes debug-symbol-migration-possibly-complete lint. warning
-  * d/po/ro.po added Romanian debconf translation. (Closes: 1033084),
-    Thanks to Remus-Gabriel Chelu
-  * d/po/sv.po added Swedish debconf translation. (Closes: 1050443),
-    Thanks to Peter Kvillegård
-  * d/conf/mime.types added video/ogg, video/x-matroska (Closes: 1028144)
-  * d/p/CVE-2023-44487.patch adds additional mitigations for CVE-2023-44487
-    that according to NGINX developers on nginx-devel are already suitably
-    mitigated with the default config options for keepalive. (Closes: 1053770)
-  * d/control added nginx-dev dependency on ${nginx:abi}
-  * d/debhelper/nginx_mod.pm automatic libnginx-mod-stream dependencies
-
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Wed, 11 Oct 2023 01:17:51 +0200
-
-nginx (1.24.0-1) unstable; urgency=medium
-
-  * New upstream version 1.24.0
-  * nginx ABI release: nginx-abi-1.24.0-1
-  * d/libnginx-mod.abisubstvars update version constraints of the 3rd party
-    modules
-  * d/p/bug-{1024605,973861}.patch removed, fixed in upstream
-  * d/copyright: updated copyright for files src/event/ngx_event_udp.h,
-    src/os/win32/ngx_dlopen
-
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 27 Jun 2023 23:19:31 +0200
-
-nginx (1.22.1-9) unstable; urgency=medium
-
-  * d/control: nginx-common Breaks+Replaces: nginx (<< 1.22.1-8)
-    (Closes: 1032929)
-
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 14 Mar 2023 16:19:32 +0100
-
-nginx (1.22.1-8) unstable; urgency=medium
-
-  * Main change:
-    Configuration files returned to nginx-common package. This fixes
-    the serious problem of losing configuration files during upgrade.
-    This is a rollback of a change made in 1.22.1-6 (Closes: 1032517)
-  * d/control: fix nginx-full dependencies
-  * d/libnginx-mod.abisubstvars: update libnginx-mod-http-lua version
-
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 14 Mar 2023 06:53:32 +0100
-
-nginx (1.22.1-7) unstable; urgency=medium
-
-  * nginx ABI release: nginx-abi-1.22.1-7
-  * nginx ABI: Nginx now provides nginx-abi-<VERSION> to better manage
-    dependencies between nginx and 3rd party modules. Credit to Jérémy Lal.
-  * switched to libpcre2 (Closes: 1000013)
-  * d/p/bug-973861: added, lingering close for connections with pipelined
-    requests. The patch is backported from the upstream. (Closes: 973861)
-  * d/gbb.conf: switched to debian branch main (debian-branch = main)
-  * d/copyright: updated to be compatible with 'cme update dpkg-copyright'
-
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Mon, 13 Feb 2023 13:04:16 +0100
-
-nginx (1.22.1-6) unstable; urgency=medium
-
-  * Main change:
-    Nginx binary moved to package nginx, also moved basic
-    configuration files from nginx-common to package nginx.
-    The packages nginx-{light,core,extras,common} are replaced
-    by a metapackage. (Closes: 1025763)
-    Users should simply install 'nginx' and 'libnginx-mod-...'
-    instead of these packages.
-  * Additional changes:
-    * d/nginx-{light,core,extras,full,common}.NEWS: added warning that
-      nginx-{light,core,extras,full,common} are deprecated
-    * d/control: fixed dependencies for safe binNMU
-    * d/copyright: updated debian/* copyright
-    * d/copyright: added missing copyright for d/apport/*
-    * d/copyright: added missing GPL-2+ copyright for d/debhelper/dh_nginx
-    * d/copyright: added missing copyright for d/help/examples/nginx_modsite
-    * d/po/it.po: added Italian debconf translation. (Closes: 1019160)
-    * d/control: removed dependency on obsolete package lsb-base
-    * d/control: bump Standards-Version: 4.6.2, no changes
-
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Wed, 08 Feb 2023 17:20:27 +0100
-
-nginx (1.22.1-5) unstable; urgency=medium
-
-  [ Jan Mojžíš ]
-  * Since version 1.22.1-5 all third party modules are removed from Debian NGINX
-    package and all these modules are maintained in separate external packages.
-    Removed namely these remaining modules:
-      - libnginx-mod-http-geoip2
-      - libnginx-mod-stream-geoip2
-      - libnginx-mod-http-auth-pam
-      - libnginx-mod-http-echo
-      - libnginx-mod-http-upstream-fair
-      - libnginx-mod-http-headers-more-filter
-      - libnginx-mod-http-cache-purge
-      - libnginx-mod-http-fancyindex
-      - libnginx-mod-http-uploadprogress
-      - libnginx-mod-http-subs-filter
-      - libnginx-mod-http-dav-ext
-  * d/tests: all *-simple and *-deps tests updated to check if nginx works
-    after installation/reload/restart for all flavours
-  * d/control: updated nginx-common dependency, fixes lintian warning
-    maybe-not-arch-all-binnmuable
-
-  [ Jérémy Lal ]
-  * d/rules: default error-log-path is stderr (--error-log-path=stderr)
-    instead of hardcoded /var/log/nginx/error.log (Closes: 1025858)
-  * dh nginx: auto-detect build-dependency on ndk-dev
-  * dh nginx: absolute /usr/sbin/nginx path for nginx tests
-  * d/p/nginx-ssl_cert_cb_yield.patch SSL_CTX_set_cert_cb() callback yielding
-    patch update
-  * d/conf/nginx.conf: Set global error_log to /var/log/error.log
-    Now that error_log default value is stderr, it is possible
-    to override that config using nginx -g 'error_log stderr;'
-
-  [ Miao Wang ]
-  * d/control: removed unnecessary dependencies after removing 3rd party modules
-  * d/rules: enabled stream_realip_module (--with-stream_realip_module)
-  * d/rules: explicitly disabled pcre2 (--without-pcre2)
-
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 20 Dec 2022 10:36:19 +0100
-
-nginx (1.22.1-4) unstable; urgency=medium
-
-  * d/t/*-module-deps: updated, added curl timeout 300 seconds and
-    added nginx restart before calling curl
-  * d/t/*-module-deps: update:
-    - added tests for new ext. module libnginx-mod-http-set-misc
-    - added tests for new ext. module libnginx-mod-http-brotli-filter
-    - added tests for new ext. module libnginx-mod-http-brotli-static
-    - added tests for new ext. module libnginx-mod-http-memc
-    - added tests for new ext. module libnginx-mod-http-srcache-filter
-  * removed 3th party modules and moved to separate packages:
-    - libnginx-mod-nchan module
-    - libnginx-mod-rtmp module
-    - libnginx-mod-http-ndk module
-
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Thu, 08 Dec 2022 14:15:15 +0100
-
-nginx (1.22.1-3) unstable; urgency=medium
-
-  * d/control: added Multi-Arch: foreign for package nginx-dev
-  * d/rules: enabled NDK upstream list module NDK_UPSTREAM_LIST
-  * d/p/bug-1024605.patch: added header Forwarded: not-needed
-
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Mon, 05 Dec 2022 18:25:16 +0100
-
-nginx (1.22.1-2) unstable; urgency=medium
-
-  [ Jan Mojžíš ]
-  * d/control: fixed spelling-error-in-description
-  * d/nginx-*.postinst: fixed postinst script, used invoke-rc.d instead of
-    pidof and ad-hoc tests, tnx Gioele Barabucci
-  * d/tests/ssi-module-test added, simple ngx_http_ssi_filter_module test
-  * d/p/bug-1024605.patch added: fixes problem when a subrequest has SSI
-    enabled but its main request does not, the SSI module may crash the worker
-    due to NULL-pointer dereference. The patch is backported from the upstream
-    (Closes: 1024605)
-  * d/control: updated implicit dependencies of third-party modules
-    for easier transition to third-party modules in separate packages.
-
-  [ Jérémy Lal ]
-  * d/debhelper: set nginx_mod buildsystem by default
-  * d/control: nginx-dev provides dh-sequence-nginx (Closes: #1024879)
-  * d/control: remove Uploaders that are part of nginx-team,
-    keep only the most recent active one, per policy 5.6.3.
-
-  [ Debian Janitor ]
-  * Remove constraints unnecessary since buster (oldstable):
-    + nginx-dev: Drop versioned constraint on dpkg-dev in Depends.
-
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Wed, 30 Nov 2022 17:39:42 +0100
-
-nginx (1.22.1-1) unstable; urgency=medium
-
-  [ Jan Mojžíš ]
-  * New upstream version 1.22.1
-  * d/control: added implicit version of dependency libnginx-mod-http-lua
-    (>=1:0.10.22-3~), it is a rebuilt version with nginx 1.22.1.
-  * Added libnginx-mod-http-lua powerpc architecture
-
-  [ Debian Janitor ]
-  * Fix day-of-week for changelog entry 0.5.11-1.
-
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Thu, 10 Nov 2022 18:21:43 +0100
-
-nginx (1.22.0-3.1) unstable; urgency=medium
-
-  * Non-maintainer upload.
-  * No source change upload to rebuild with debhelper 13.10.
-
- -- Michael Biebl <biebl@debian.org>  Sat, 15 Oct 2022 12:28:07 +0200
-
-nginx (1.22.0-3) unstable; urgency=medium
-
-  * d/changelog: fixed typo in bug number 61261 -> 861261 (Closes: 861261)
-  * d/p/nginx-ssl_cert_cb_yield.patch added (Closes: 884434)
-  * http-lua: removed the http-lua module and moved it to a separate package
-
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Wed, 17 Aug 2022 18:38:15 +0200
-
-nginx (1.22.0-2) unstable; urgency=medium
-
-  [ Miao Wang ]
-  * adding a new libnginx-mod-http-ndk-dev package including necessary
-    headers to build a 3rd party module depending on ndk.
-
-  [ Jan Mojžíš ]
-  * d/nginx-common.nginx.service: added Systemd dependency
-    Wants=network-online.target and updated Systemd "After" dependency to
-    recommended NGINX values, namely:
-    - network-online.target (Closes: 861261) (Closes: 1000406)
-    - remote-fs.target (Closes: 898896)
-    - nss-lookup.target
-  * d/p/0003-define_gnu_source-on-other-glibc-based-platforms.patch: forwarded
-    to upstream (Closes: 859082)
-  * d/t/reboot: added, tests if nginx works after reboot
-  * d/m/p/http-subs-filter/pcre2.patch: added PCRE2 support
-  * d/p/nginx-fix-pidfile.patch: Fix NGINX PIDfile handling to avoid
-    SystemD race condition, this fix is backported from Ubuntu (Closes: 876365)
-  * d/apport/source_nginx.py: Add apport hooks for additional bug
-    information gathering, the script is backported from Ubuntu (Closes: 963668)
-  * d/nginx-common.install: Add install rule for apport hooks.
-
-  [ Debian Janitor ]
-  * Remove constraints unnecessary since buster:
-    + Build-Depends: Drop versioned constraint on dpkg-dev.
-    + nginx-common: Drop versioned constraint on lsb-base in Depends.
-    + nginx-core: Drop versioned constraint on nginx in Breaks.
-    + nginx-full: Drop versioned constraint on nginx in Breaks.
-    + nginx-light: Drop versioned constraint on nginx in Breaks.
-    + nginx-extras: Drop versioned constraint on nginx in Breaks.
-    + libnginx-mod-http-perl: Drop versioned constraint on nginx-extras in
-      Replaces.
-    + Remove 5 maintscript entries from 1 files.
-
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Sun, 07 Aug 2022 16:14:59 +0200
-
-nginx (1.22.0-1) unstable; urgency=medium
-
-  [ Thomas Ward ]
-  * New upstream release (1.22.0)
-  * Additional changes:
-    * d/conf/mime.types: Fix a typo in font/woff2 extension in
-      mime.types.  (Closes: #1010798)
-    * d/upstream/signing-key.asc: Additional signing keys observed
-      in upstream (Konstantin Pavlov <k.pavlov@f5.com>) during
-      upstream merge/import by Thomas Ward, additional signing key
-      was added to the keyring while keeping Maxim's key in signing
-      keys as well.
-    * d/copyright: Updated copyright for src/core/ngx_murmurhash.c
-      and debian/modules/http-ndk/src/hash/murmurhash2.c to be
-      public-domain (Closes: #1011936)
-  * d/control: Use libluajit-5.1-dev for s390x.
-    Due to src:luajit2 landing in Unstable, superseding src:luajit,
-    and due to luajit2 having s390x support, we can use s390x now
-    with luajit instead of standard Lua.
-    Thanks to Paul Gevers for the heads up on luajit2 supporting s390x.
-  * d/control: Use liblua for ppc64el - src:luajit2 is still not ppc64el
-    stable and there seems to be nobody willing to support it. (Closes: 1013807)
-
-  [ Jan Mojžíš ]
-  * d/patches/CVE-2021-3618.patch removed, fix is included in new upstream
-  release
-  * d/copyright: bump nginx copyright years
-  * d/copyright: added copyright for src/stream/ngx_stream_set_module.c
-  * d/copyright: removed copyright for src/http/v2/ngx_http_v2_huff_encode.c
-  * d/control: bump Standards-Version to 4.6.1, no changes
-
-  [ Bastian Germann ]
-  * d/copyright: Update copyright for d/debhelper/*
-
-  [ Miao Wang ]
-  * dh_nginx: support auto generating module config files
-  * adding a new nginx-dev package including necessary headers and debhelper
-    scripts to build and package a 3rd party module. (Closes: 985133)
-  * d/p/0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch
-    removed, because feature already implemented with --with-compat configure
-    option since 1.11.5
-
- -- Thomas Ward <teward@ubuntu.com>  Tue, 10 May 2022 12:08:02 -0400
-
-nginx (1.20.2-2) unstable; urgency=medium
-
-  [ Thomas Ward ]
-  * d/patches/CVE-2021-3618.patch: Include upstream changeset from NGINX
-    that adds mitigations into the Mail module for CVE-2021-3618.patch.
-    (Closes: #991328)
-
-  [ Jan Mojžíš ]
-  * d/p/0003-define_gnu_source-on-other-glibc-based-platforms.patch update,
-    fixes build on hurd-i386 platform
-
- -- Thomas Ward <teward@ubuntu.com>  Wed, 04 May 2022 16:04:59 -0400
-
-nginx (1.20.2-1) unstable; urgency=medium
-
-  [ Ondřej Nový ]
-  * d/control: Update Uploaders for new maintainers.
-
-  [ Thomas Ward ]
-  * Update to latest upstream Stable version (1.20.2) (Closes: #1008855)
-  * d/patches/Resolver-fixed-off-by-one-write-in-ngx_resolver
-    _copy.patch: Drop CVE-2021-23017 patch, as this is fixed in 1.20.1
-    and we are now using 1.20.2 which already contains the patch.
-  * Refreshed d/patches/0002-Make-sure-signature-stays-the-same-
-    in-all-nginx-buil.patch (fuzz thanks to 1.20.2)
-  * d/conf/mime.types: Update mime.types to more match upstream mime.types
-    and include upstream changes with mime.types from 1.21.x via nginx.org
-    mercurial repository versions.
-  * d/control: Remove self from Uploaders per other Debian devs, who want
-    that commit to be done by someone on the current uploaders/maintainers
-    group instead.
-
- -- Thomas Ward <teward@ubuntu.com>  Tue, 19 Apr 2022 09:50:42 -0400
-
-nginx (1.18.0-9) unstable; urgency=medium
-
-  [ Jan Mojžíš ]
-  * http-lua: Downgrade to 0.10.13 (Closes: #1008787).
-  * http-lua: Backport upstream bugfix for segfault in nginx core >= 1.15.0
-    when libnginx-mod-http-lua is loaded and init_worker_by_lua* is used.
-  * d/control: Add mips64el,ppc64,kfreebsd-amd64 to list of luajit platforms.
-  * d/control: fix Homepage nginx.net -> nginx.org (Closes: #976158)
-
-  [ Thomas Ward ]
-  * d/watch: Update watch syntax to match all even versions of NGINX releases
-    rather than use a watch syntax that is static to one specific version.
-    This will fix the untracked "New upstream stable versions" problem.
-  * d/control: Update 'uploaders' as Thomas Ward is now a maintainer in
-    the Salsa repository.
-
- -- Jan Mojžíš <jan.mojzis@gmail.com>  Tue, 05 Apr 2022 19:11:47 +0200
-
-nginx (1.18.0-8) unstable; urgency=medium
-
-  * Restore patch:
-    d/p/Resolver-fixed-off-by-one-write-in-ngx_resolver_copy.patch
-
- -- Ondřej Nový <onovy@debian.org>  Tue, 15 Mar 2022 13:23:06 +0100
-
-nginx (1.18.0-7) unstable; urgency=medium
-
-  [ Ondřej Nový ]
-  * d/p/CVE-2019-20372.patch: Drop, applied upstream.
-  * http-auth-pam: Upgrade to 1.5.3.
-  * http-echo: Upgrade to 0.62.
-  * nchan: Upgrade to 1.2.15.
-  * http-fancyindex: Upgrade to 0.5.2.
-  * rtmp: Upgrade to 1.2.2.
-  * http-lua: Upgrade to 0.10.15 (Closes: #994178).
-  * http-lua: Rebase patch.
-  * nchan: Drop GCC 10 patch, applied upstream.
-  * d/watch: Bump version to 4.
-  * Bump standards version to 4.6.1 (no changes).
-  * d/copyright: Bump my copyright year.
-
-  [ Ondřej Surý ]
-  * Add arm64 and ppc64el to list of luajit platforms.
-
-  [ Athos Ribeiro ]
-  * d/nginx-common.nginx.service: Fix service shutdown description to mention
-    SIGQUIT instead of SIGSTOP (LP: #1919965).
-
- -- Ondřej Nový <onovy@debian.org>  Tue, 15 Mar 2022 11:50:18 +0100
-
-nginx (1.18.0-6.1) unstable; urgency=high
-
-  * Non-maintainer upload.
-  * Resolver: fixed off-by-one write in ngx_resolver_copy() (CVE-2021-23017)
-    (Closes: #989095)
-
- -- Salvatore Bonaccorso <carnil@debian.org>  Sat, 29 May 2021 16:21:37 +0200
-
-nginx (1.18.0-6) unstable; urgency=medium
-
-  * Fix GCC-10 compatibility (Closes: #957605).
-
- -- Ondřej Nový <onovy@debian.org>  Wed, 19 Aug 2020 15:27:02 +0200
-
-nginx (1.18.0-5) unstable; urgency=medium
-
-  * Prevented request smuggling in LUA
-    CVE-2020-11724
-    Closes: #964950
-
- -- Ondřej Nový <onovy@debian.org>  Tue, 14 Jul 2020 10:08:15 +0200
-
-nginx (1.18.0-4) unstable; urgency=medium
-
-  * Revert: libnginx-mod-* now depends on nginx-<any flavour> (Closes: #963860).
-  * Update ngx_http_auth_pam_module upstream URL.
-  * libnginx-mod-* recommends nginx now.
-  * http-auth-pam: Upgrade to 1.5.2 (Closes: #963567).
-  * d/copyright: Bump year of http-auth-pam.
-
- -- Ondřej Nový <onovy@debian.org>  Fri, 03 Jul 2020 09:34:49 +0200
-
-nginx (1.18.0-3) unstable; urgency=medium
-
-  * Source-only upload to allow migration.
-
- -- Ondřej Nový <onovy@debian.org>  Thu, 11 Jun 2020 15:14:59 +0200
-
-nginx (1.18.0-2) unstable; urgency=medium
-
-  [ Ondřej Nový ]
-  * d/copyright:
-    - Update for upstream release
-    - Add Thomas Ward from Ubuntu for debian/*
-  * d/conf/sites-available/default: Update PHP path for PHP 7.4
-  * d/conf/nginx.conf:
-    - Enable TLSv1.3
-    - Remove tcp_nodelay on, which is same as default
-    - Remove keepalive_timeout 65 and use default value 75s.
-    - Remove trailing whitespaces
-  * Introduce nginx-core and make it new default for "nginx"
-  * Add stream-geoip and stream-geoip2 modules
-  * d/ngx-conf: Convert to Python 3
-  * d/control: Add GeoIP2 into description
-  * Build dynamic modules only in extras flavour
-  * libnginx-mod-* now depends on nginx-<any flavour>
-  * Check if port 80 is free before starting during install
-
-  [ Ondřej Surý ]
-  * http-geoip2: Add ngx_http_geoip2_module 3.3
-
- -- Ondřej Nový <onovy@debian.org>  Fri, 05 Jun 2020 18:28:40 +0200
-
-nginx (1.18.0-1) unstable; urgency=medium
-
-  [ Ondřej Nový ]
-  * New upstream version 1.18.0
-  * Add REMOTE_USER fastcgi param
-  * Use debhelper-compat instead of debian/compat
-  * Replace dh_systemd_enable with dh_installsystemd
-  * Set Rules-Requires-Root: no
-  * d/rules/dh_installinit: Replace --no-restart-on-upgrade with
-    --no-stop-on-upgrade
-  * Bump debhelper compat level to 13
-  * Use package.maintscript instead of dpkg-maintscript-helper
-  * Bump standards version to 4.5.0
-  * d/watch: Change to 1.18.x
-  * d/patches/CVE-2019-20372.patch: Rebase
-  * Convert d/ngxmod to Python 3 (Closes: #953025)
-  * nchan: Upgrade to 1.2.7
-  * http-fancyindex: Upgrade to 0.4.4
-  * d/copyright: Add myself for Debian part
-  * Add myself as uploader
-
-  [ Mohamed Akram ]
-  * Enable --with-compat configure option (Closes: #897926)
-
- -- Ondřej Nový <onovy@debian.org>  Fri, 29 May 2020 19:03:30 +0200
-
-nginx (1.16.1-3) unstable; urgency=high
-
-  * Handle CVE-2019-20372, error page request smuggling
-    (Closes: #948579)
-
- -- Christos Trochalakis <ctrochalakis@debian.org>  Sat, 11 Jan 2020 09:36:00 +0200
-
-nginx (1.16.1-2) unstable; urgency=medium
-
-  * http-lua: Downgrade to 0.10.13 (Closes: #941917)
-    Temporary fix FTBFS on architectures where Luajit is not available.
-
- -- Christos Trochalakis <ctrochalakis@debian.org>  Sat, 12 Oct 2019 17:59:23 +0300
-
-nginx (1.16.1-1) unstable; urgency=medium
-
-  * New upstream version (Closes: #929200)
-  * Follow stable 1.16 releases (Closes: #929199)
-  * Drop already included debian patches
-  * http-ndk: Upgrade to 0.3.1
-  * http-lua: Upgrade to 0.10.15
-
- -- Christos Trochalakis <ctrochalakis@debian.org>  Mon, 09 Sep 2019 18:24:43 +0300
-
-nginx (1.14.2-3) unstable; urgency=high
-
-  * Backport upstream fixes for 3 CVEs (Closes: #935037)
-    Those fixes affect Nginx HTTP/2 implementation, which might cause
-    excessive memory consumption and CPU usage.
-    (CVE-2019-9511, CVE-2019-9513, CVE-2019-9516).
-
- -- Christos Trochalakis <ctrochalakis@debian.org>  Mon, 19 Aug 2019 11:30:08 +0300
-
-nginx (1.14.2-2) unstable; urgency=medium
-
-  [ Kartik Mistry ]
-  * po/tr.po:
-    + Added Turkish translation. Thanks Atila KOÇ <koc@artielektronik.com.tr>
-      (Closes: #915728)
+nginx (1.10.2-3) UNRELEASED; urgency=medium

  [ Christos Trochalakis ]
-  * http-dav-ext: Upgrade to 3.0.0 (Closes: #851651)
-  * Use a minimal export of the upstream signing key
-  * Bump Standards-Version, no changes needed
-
- -- Christos Trochalakis <ctrochalakis@debian.org>  Thu, 27 Dec 2018 12:49:34 +0200
-
-nginx (1.14.2-1) unstable; urgency=medium
-
-  [ Olaf van der Spek ]
-  * Reference PHP 7.3 (Closes: 913250)
-
-  [ Christos Trochalakis ]
-  * Adjust fastcgi_split_path_info snippet to handle the `/example.php/` case
-    (Closes: #911398)
-
- -- Christos Trochalakis <ctrochalakis@debian.org>  Thu, 13 Dec 2018 10:05:37 +0200
-
-nginx (1.14.1-1) unstable; urgency=medium
-
-  [ Kartik Mistry ]
-  * Removed unused lintian override.
-  * Fixed trailing whitespaces in changelog.
-
-  [ Christos Trochalakis ]
-  * New upstream version. (Closes: #913090)
-    + CVE-2018-16843 Excessive memory usage in HTTP/2
-    + CVE-2018-16844 Excessive CPU usage in HTTP/2
-    + CVE-2018-16845 Memory disclosure in the ngx_http_mp4_module
-
- -- Christos Trochalakis <ctrochalakis@debian.org>  Wed, 07 Nov 2018 07:16:00 +0200
-
-nginx (1.14.0-1) unstable; urgency=medium
-
-  [ Kartik Mistry ]
-  * debian/control:
-    + Removed duplicate Build-Depends.
-    + Use https in Homepage.
-
-  [ Christos Trochalakis ]
-  * http-lua: Upgrade to 0.10.13
-  * http-lua: Drop our OpenSSL patch, OpenSSL 1.1 is now supported upstream
-  * http-fancyindex: Upgrade to 0.4.3
-  * Order nginx after nss-lookup.target to synchronize host/network name lookups
-    (Closes: #900790)
-  * Merge ru translations.
-    Thanks to Lev Lamberov (Closes: #883104)
-
- -- Christos Trochalakis <ctrochalakis@debian.org>  Fri, 31 Aug 2018 15:28:04 +0300
-
-nginx (1.13.12-1) unstable; urgency=medium
-
-  * New upstream version
-
- -- Christos Trochalakis <ctrochalakis@debian.org>  Wed, 11 Apr 2018 08:19:23 +0300
-
-nginx (1.13.11-1) unstable; urgency=medium
-
-  * New upstream version
-
- -- Christos Trochalakis <ctrochalakis@debian.org>  Tue, 10 Apr 2018 14:55:11 +0300
-
-nginx (1.13.10-1) unstable; urgency=medium
-
-  * New upstream version
-
- -- Christos Trochalakis <ctrochalakis@debian.org>  Wed, 21 Mar 2018 16:16:22 +0200
-
-nginx (1.13.9-1) unstable; urgency=medium
-
-  [ Michael Lustfield ]
-  * Remove non-uploading users
-
-  [ Christos Trochalakis ]
-  * New upstream version 1.13.9
-  * Move packaging repository to salsa.debian.org
-  * Bump Standards-Version to 4.1.3, no changes needed
-
- -- Christos Trochalakis <ctrochalakis@debian.org>  Wed, 21 Feb 2018 11:24:53 +0200
-
-nginx (1.13.8-1) unstable; urgency=medium
-
-  * New upstream release.
-
- -- Christos Trochalakis <ctrochalakis@debian.org>  Wed, 27 Dec 2017 09:24:36 +0200
-
-nginx (1.13.7-1) unstable; urgency=medium
-
-  [ Christos Trochalakis ]
-  * New upstream version 1.13.7
-  * Bump Standards-Version, no changes needed
-  * debian/watch: switch to HTTPS for the upstream check
-
-  [ Mpampis Kostas ]
-  * Automate modules watch & upgrade process (Closes: #869499)
-
-  [ Christos Trochalakis ]
-  * Bits & pieces for ngxmod
-  * http-headers-more-filter: Upgrade to 0.33
-  * http-echo: Upgrade to 0.61
-  * http-lua: Upgrade to 0.10.11
-  * http-dav-ext: Upgrade to 0.1.0 (Closes: #878611)
-  * http-fancyindex: Upgrade to 0.4.2
-  * rtmp: Upgrade to 1.2.1 (Closes: #880718)
-
- -- Christos Trochalakis <ctrochalakis@debian.org>  Thu, 14 Dec 2017 11:04:36 +0200
-
-nginx (1.13.6-2) unstable; urgency=medium
-
-  * rtmp: Ship docs & examples (Closes: #878368)
-
- -- Christos Trochalakis <ctrochalakis@debian.org>  Fri, 13 Oct 2017 12:59:28 +0300
-
-nginx (1.13.6-1) unstable; urgency=medium
-
-  * New upstream version
-  * Normalize module paths in packaging repository
-  * Bump Standards-Version, no changes needed
-  * Drop dh-systemd dependency since we depend on debhelper >= 10
-
- -- Christos Trochalakis <ctrochalakis@debian.org>  Thu, 12 Oct 2017 10:37:29 +0300
-
-nginx (1.13.5-1) unstable; urgency=medium
-
-  * New upstream version 1.13.5
-  * doc: Improve example WordPress configuration
-    Thanks to Larry Holish (Closes: #863343)
-  * Remove upstart conffile (Closes: #874319)
-
- -- Christos Trochalakis <ctrochalakis@debian.org>  Wed, 06 Sep 2017 10:10:24 +0300
-
-nginx (1.13.4-1) unstable; urgency=medium
-
-  * New upstream version 1.13.4
-  * nginx-lua:
-    + Add a simple lua autopkgtest
-    + Discover LuaJIT 2.1 (FTBFS) (Closes: #873319)
-    + Update to v0.10.10
-    + Update OpenSSL 1.1 patch
-    + Drop patch to build against Nginx 1.11.11, now included upstream
-  * tests: Fix race between reload and curl's http request
-  * Explicitly disable autoreconf (debhelper 10)
-  * Drop Upstart configuration
-  * Bump Standards to 4.1.0
-    + Switch all packages to Priority optional, extra is considered deprecated
-
- -- Christos Trochalakis <ctrochalakis@debian.org>  Tue, 29 Aug 2017 10:49:03 +0300
-
-nginx (1.13.3-1) unstable; urgency=high
-
-  * New upstream version 1.13.3.
-    Fixes CVE-2017-7529 (Closes: #868109)
-  * Drop gzip_disable "msie6" directive. (Closes: #867024)
-
- -- Christos Trochalakis <ctrochalakis@debian.org>  Wed, 12 Jul 2017 11:20:27 +0300
-
-nginx (1.13.2-1) unstable; urgency=medium
-
-  [ Christos Trochalakis ]
-  * New upstream version 1.13.2.
-  * Fix nginx-cache-purge segfaults (Closes: #866750)
-  * Merge ca translations.
-    Thanks to Alytidae (Closes: #865996)
-  * Merge es translations.
-    Thanks to Jonathan Bustillos (Closes: #855610)
-  * Merge pt translations.
-    Thanks to Rui Branco (Closes: #858741)
-  * Bump Standards to 4.0.0.
-    - Switch the copyright-format URL to https.
-
-  [ Nicolas Dandrimont ]
-  * Introduce libnginx-mod-rtmp (Closes: #843777)
-
- -- Christos Trochalakis <ctrochalakis@debian.org>  Mon, 03 Jul 2017 13:44:59 +0300
-
-nginx (1.13.1-2) unstable; urgency=medium
-
-  * Upload to unstable.
-
- -- Christos Trochalakis <ctrochalakis@debian.org>  Tue, 20 Jun 2017 14:16:52 +0300
-
-nginx (1.13.1-1) experimental; urgency=medium
-
-  * New upstream version 1.13.1.
-
- -- Christos Trochalakis <ctrochalakis@debian.org>  Wed, 31 May 2017 11:41:59 +0300
-
-nginx (1.13.0-1) experimental; urgency=medium
-
-  * New upstream release.
-    We now target nginx mainline (1.13.x).
-
- -- Christos Trochalakis <ctrochalakis@debian.org>  Wed, 10 May 2017 11:40:38 +0300
-
-nginx (1.12.0-1) experimental; urgency=medium
-
-  [ Michael Lustfield ]
-  * debian/rules:
-    - Configure build flags to work with other arches and downstreams.
-      Thanks to Thomas Ward.
-
-  [ Christos Trochalakis ]
-  * New upstream release.
-  * Patch nginx-upstream-fair to build against nginx 1.11.6.
-  * Patch nginx-lua to build against nginx 1.11.11.
-  * Patch nginx-echo to build against nginx 1.11.11.
-  * Drop curve list patch, it's included upstream.
-  * Drop perl build flags patch, it is now handled upstream.
-  * Enable SSL Preread builtin module on nginx-full & nginx-extras.
-    (Closes: #854214)
-  * Switch to debhelper 10, no changes needed.
-
- -- Christos Trochalakis <ctrochalakis@debian.org>  Fri, 05 May 2017 11:16:30 +0300
-
-nginx (1.10.3-1) unstable; urgency=medium
-
-  * New upstream release. (Closes: #855113)
-  * Update Vcs fields to the new location.
-    The repo is now moved under the pkg-nginx namespace.
-
- -- Christos Trochalakis <ctrochalakis@debian.org>  Wed, 15 Feb 2017 09:58:13 +0200
-
-nginx (1.10.2-4) unstable; urgency=medium
-
-  * Switch module reloading logic to dpkg triggers.
-  * Enable modules after a remove -> install cycle.
-  * Move module patches to debian/modules/patches.
-  * Backport curve list support from 1.11.x. (Closes: #846085)
-  * Add a NEWS entry regarding dynamic modules.
-  * Merge de,fr,nl,pt_BR,da translations.
-    Thanks to Chris Leick. (Closes: #843770)
-    Thanks to Julien Patriarca. (Closes: #844712)
-    Thanks to Frans Spiesschaert. (Closes: #845693)
-    Thanks to Adriano Rafael Gomes. (Closes: #846522)
-    Thanks to Joe Dalton. (Closes: #850857)
-
- -- Christos Trochalakis <ctrochalakis@debian.org>  Sun, 22 Jan 2017 12:19:30 +0200
-
-nginx (1.10.2-3) unstable; urgency=medium
-
-  [ Michael Lustfield ]
-  * debian/conf/sites-enabled/default:
-    + Correcting location of default php-fpm socket. (Closes: #846145)
-
-  [ Christos Trochalakis ]
-  * debian/rules: Correctly clean patched modules.
-    Thanks to Sven-Haegar Koch for the initial patch. (Closes: #844506)
-  * mod: Upgrade nchan to 1.0.8. (Closes: #844473)
-  * mod: Upgrade nginx-lua to 0.10.7.
-  * Update nginx-lua OpenSSL 1.1.0 patch.
-  * Reactivate PIE.
-    Thanks to Markus Waldeck for the suggestion.
-  * mod: Check if nginx binary exists before reloading.
-  * mod: Upgrade headers-mode to 0.32.
-  * mod: Upgrade development kit to 0.3.0.
-
- -- Christos Trochalakis <ctrochalakis@debian.org>  Sat, 24 Dec 2016 12:11:21 +0200
-
-nginx (1.10.2-2) unstable; urgency=medium
-
  * Build against OpenSSL 1.1.0. (Closes: #828453)
    + Patch for nginx-lua by Alessandro Ghedini.
    + Patch for nginx-upstream-fair by Kurt Roeckx.
@ -856,7 +9,18 @@ nginx (1.10.2-2) unstable; urgency=medium
    + Convert dav-ext to a dynamic module package:
      o libnginx-mod-http-dav-ext

- -- Christos Trochalakis <yatiohi@ideopolis.gr>  Sat, 12 Nov 2016 09:18:12 +0200
+  [ Michael Lustfield ]
+  * debian/conf/sites-available/default:
+    + Updated PHP sample configuration block. (Closes: #841230)
+    + Updated documentation and sample configuration. (Closes: #841488)
+  * Added support for package-maintained configuration files. (Closes: #822792)
+    + debian/conf/sites-available/default [+include]
+    + debian/conf/apps.d/README [added]
+    + debian/nginx-common.dirs [+apps.d]
+  * debian/nginx-common.postrm:
+    + Removing /etc/nginx from 'rm -rf' on purge.
+
+ -- Michael Lustfield <michael@lustfield.net>  Thu, 10 Nov 2016 07:21:14 +0000

 nginx (1.10.2-1) unstable; urgency=high

@ -2656,14 +1820,14 @@ nginx (0.7.61-2) unstable; urgency=low
 nginx (0.7.61-1) unstable; urgency=low

  * New upstream version:
-    *) Bugfix: nginx could not be built --without-http-cache; the bug had
+    *) Bugfix: nginx could not be built --without-http-cache; the bug had 
       appeared in 0.7.60.
-    *) Bugfix: a segmentation fault occurred in worker process, if a
-       backend 401 error was intercepted and the backend did not set the
+    *) Bugfix: a segmentation fault occurred in worker process, if a 
+       backend 401 error was intercepted and the backend did not set the 
       "WWW-Authenticate" response header line.
       Thanks to Eugene Mychlo.
    *) Feature: the "keepalive_requests" directive.
-    *) Bugfix: in open_file_cache and proxy/fastcgi cache interaction on
+    *) Bugfix: in open_file_cache and proxy/fastcgi cache interaction on 
       start up.
    *) Bugfix: open_file_cache might cache open file descriptors too long.
    *) Bugfix: XLST filter did not work in subrequests.
@ -2794,14 +1958,14 @@ nginx (0.5.33-1) unstable; urgency=low
  * New stable upstream release (Closes: #451173)
  * nginx now provides httpd, httpd-cgi virtual packages
    (Closes: #439468, #452025)
-  * sites-enabled/default link is now provided only on fresh
+  * sites-enabled/default link is now provided only on fresh 
    installations (Closes: #432961)
  * Updated code for online upgrading of nginx (Closes: #445246)
  * Reviewed maintainer scripts for correct behaviour on updates
    (Closes: #452787, #435965)
  * Removed debian/nginx.links and debian/preinst.
  * Changing Maintainer address to bureado@debian.org.
-  * Welcoming Fabio Tranchitella <kobold@debian.org> as an nginx
+  * Welcoming Fabio Tranchitella <kobold@debian.org> as an nginx 
    uploader for Debian. Thanks for your patches.

 -- Jose Parrella <bureado@debian.org>  Sat, 08 Dec 2007 11:27:54 -0400
@ -2809,7 +1973,7 @@ nginx (0.5.33-1) unstable; urgency=low
 nginx (0.5.30-1) unstable; urgency=low

  * New stable upstream release.
-  * Adding mime.types (and other upstream conffiles) to the package
+  * Adding mime.types (and other upstream conffiles) to the package 
    since it was lost on 0.5.26 (Closes: #435964)

 -- Jose Parrella <joseparrella@cantv.net>  Sat, 04 Aug 2007 10:39:40 -0400
@ -2839,7 +2003,7 @@ nginx (0.5.13-1) unstable; urgency=low

 nginx (0.5.12-2) unstable; urgency=low

-  * Patching src/core/ngx_shmtx.h in order to solve FTBFS problems in
+  * Patching src/core/ngx_shmtx.h in order to solve FTBFS problems in 
    non-x86 archs (Thanks to Igor Sysoev) (Closes: #410884)

 -- Jose Parrella <joseparrella@cantv.net>  Wed, 14 Feb 2007 13:32:01 -0400
@ -2855,7 +2019,7 @@ nginx (0.5.11-1) unstable; urgency=low

  * New upstream version. (Closes: #405983)

- -- Jose Parrella <joseparrella@cantv.net>  Mon, 05 Feb 2007 19:35:56 -0400
+ -- Jose Parrella <joseparrella@cantv.net>  Sun, 5 Feb 2007 19:35:56 -0400

 nginx (0.4.13-2) unstable; urgency=low

@ -2895,3 +2059,4 @@ nginx (0.4.2-1) unstable; urgency=low
  * Tweaked the configuration file and the path handling for Debian.

 -- Jose Parrella <joseparrella@cantv.net>  Thu, 14 Sep 2006 11:40:20 -0400
+
--- a/debian/compat
+++ b/debian/compat
@ -0,0 +1 @@
+9
--- a/debian/conf/apps.d/README
+++ b/debian/conf/apps.d/README
@ -0,0 +1,5 @@
+This directory is included by the default configuration file. It is intended
+to be a place for web applications to place their configurations and have them
+included in the default server block.
+
+https://wiki.debian.org/Nginx/DirectoryStructure#appincludes
--- a/debian/conf/fastcgi.conf
+++ b/debian/conf/fastcgi.conf
@ -18,7 +18,6 @@ fastcgi_param  SERVER_SOFTWARE    nginx/$nginx_version;

 fastcgi_param  REMOTE_ADDR        $remote_addr;
 fastcgi_param  REMOTE_PORT        $remote_port;
-fastcgi_param  REMOTE_USER        $remote_user;
 fastcgi_param  SERVER_ADDR        $server_addr;
 fastcgi_param  SERVER_PORT        $server_port;
 fastcgi_param  SERVER_NAME        $server_name;
--- a/debian/conf/fastcgi_params
+++ b/debian/conf/fastcgi_params
@ -17,7 +17,6 @@ fastcgi_param  SERVER_SOFTWARE    nginx/$nginx_version;

 fastcgi_param  REMOTE_ADDR        $remote_addr;
 fastcgi_param  REMOTE_PORT        $remote_port;
-fastcgi_param  REMOTE_USER        $remote_user;
 fastcgi_param  SERVER_ADDR        $server_addr;
 fastcgi_param  SERVER_PORT        $server_port;
 fastcgi_param  SERVER_NAME        $server_name;
--- a/debian/conf/mime.types
+++ b/debian/conf/mime.types
@ -1,101 +1,89 @@
+
 types {
-    text/html                                        html htm shtml;
-    text/css                                         css;
-    text/xml                                         xml;
-    image/gif                                        gif;
-    image/jpeg                                       jpeg jpg;
-    application/javascript                           js;
-    application/atom+xml                             atom;
-    application/rss+xml                              rss;
+    text/html                             html htm shtml;
+    text/css                              css;
+    text/xml                              xml;
+    image/gif                             gif;
+    image/jpeg                            jpeg jpg;
+    application/javascript                js;
+    application/atom+xml                  atom;
+    application/rss+xml                   rss;

-    text/mathml                                      mml;
-    text/plain                                       txt;
-    text/vnd.sun.j2me.app-descriptor                 jad;
-    text/vnd.wap.wml                                 wml;
-    text/x-component                                 htc;
+    text/mathml                           mml;
+    text/plain                            txt;
+    text/vnd.sun.j2me.app-descriptor      jad;
+    text/vnd.wap.wml                      wml;
+    text/x-component                      htc;

-    image/avif                                       avif;
-    image/png                                        png;
-    image/svg+xml                                    svg svgz;
-    image/tiff                                       tif tiff;
-    image/vnd.wap.wbmp                               wbmp;
-    image/webp                                       webp;
-    image/x-icon                                     ico;
-    image/x-jng                                      jng;
-    image/x-ms-bmp                                   bmp;
+    image/png                             png;
+    image/tiff                            tif tiff;
+    image/vnd.wap.wbmp                    wbmp;
+    image/x-icon                          ico;
+    image/x-jng                           jng;
+    image/x-ms-bmp                        bmp;
+    image/svg+xml                         svg svgz;
+    image/webp                            webp;

-    font/woff                                        woff;
-    font/woff2                                       woff2;
+    application/font-woff                 woff;
+    application/java-archive              jar war ear;
+    application/json                      json;
+    application/mac-binhex40              hqx;
+    application/msword                    doc;
+    application/pdf                       pdf;
+    application/postscript                ps eps ai;
+    application/rtf                       rtf;
+    application/vnd.apple.mpegurl         m3u8;
+    application/vnd.ms-excel              xls;
+    application/vnd.ms-fontobject         eot;
+    application/vnd.ms-powerpoint         ppt;
+    application/vnd.wap.wmlc              wmlc;
+    application/vnd.google-earth.kml+xml  kml;
+    application/vnd.google-earth.kmz      kmz;
+    application/x-7z-compressed           7z;
+    application/x-cocoa                   cco;
+    application/x-java-archive-diff       jardiff;
+    application/x-java-jnlp-file          jnlp;
+    application/x-makeself                run;
+    application/x-perl                    pl pm;
+    application/x-pilot                   prc pdb;
+    application/x-rar-compressed          rar;
+    application/x-redhat-package-manager  rpm;
+    application/x-sea                     sea;
+    application/x-shockwave-flash         swf;
+    application/x-stuffit                 sit;
+    application/x-tcl                     tcl tk;
+    application/x-x509-ca-cert            der pem crt;
+    application/x-xpinstall               xpi;
+    application/xhtml+xml                 xhtml;
+    application/xspf+xml                  xspf;
+    application/zip                       zip;

-    application/java-archive                         jar war ear;
-    application/json                                 json;
-    application/mac-binhex40                         hqx;
-    application/msword                               doc;
-    application/pdf                                  pdf;
-    application/postscript                           ps eps ai;
-    application/rtf                                  rtf;
-    application/vnd.apple.mpegurl                    m3u8;
-    application/vnd.google-earth.kml+xml             kml;
-    application/vnd.google-earth.kmz                 kmz;
-    application/vnd.ms-excel                         xls;
-    application/vnd.ms-fontobject                    eot;
-    application/vnd.ms-powerpoint                    ppt;
-    application/vnd.oasis.opendocument.graphics      odg;
-    application/vnd.oasis.opendocument.presentation  odp;
-    application/vnd.oasis.opendocument.spreadsheet   ods;
-    application/vnd.oasis.opendocument.text          odt;
-    application/vnd.openxmlformats-officedocument.presentationml.presentation
-                                                     pptx;
-    application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
-                                                     xlsx;
-    application/vnd.openxmlformats-officedocument.wordprocessingml.document
-                                                     docx;
-    application/vnd.wap.wmlc                         wmlc;
-    application/wasm                                 wasm;
-    application/x-7z-compressed                      7z;
-    application/x-cocoa                              cco;
-    application/x-java-archive-diff                  jardiff;
-    application/x-java-jnlp-file                     jnlp;
-    application/x-makeself                           run;
-    application/x-perl                               pl pm;
-    application/x-pilot                              prc pdb;
-    application/x-rar-compressed                     rar;
-    application/x-redhat-package-manager             rpm;
-    application/x-sea                                sea;
-    application/x-shockwave-flash                    swf;
-    application/x-stuffit                            sit;
-    application/x-tcl                                tcl tk;
-    application/x-x509-ca-cert                       der pem crt;
-    application/x-xpinstall                          xpi;
-    application/xhtml+xml                            xhtml;
-    application/xslt+xml                             xsl xslt;
-    application/xspf+xml                             xspf;
-    application/zip                                  zip;
+    application/octet-stream              bin exe dll;
+    application/octet-stream              deb;
+    application/octet-stream              dmg;
+    application/octet-stream              iso img;
+    application/octet-stream              msi msp msm;

-    application/octet-stream                         bin exe dll;
-    application/octet-stream                         deb;
-    application/octet-stream                         dmg;
-    application/octet-stream                         iso img;
-    application/octet-stream                         msi msp msm;
+    application/vnd.openxmlformats-officedocument.wordprocessingml.document    docx;
+    application/vnd.openxmlformats-officedocument.spreadsheetml.sheet          xlsx;
+    application/vnd.openxmlformats-officedocument.presentationml.presentation  pptx;

-    audio/midi                                       mid midi kar;
-    audio/mpeg                                       mp3;
-    audio/ogg                                        ogg;
-    audio/x-m4a                                      m4a;
-    audio/x-realaudio                                ra;
+    audio/midi                            mid midi kar;
+    audio/mpeg                            mp3;
+    audio/ogg                             ogg;
+    audio/x-m4a                           m4a;
+    audio/x-realaudio                     ra;

-    video/3gpp                                       3gpp 3gp;
-    video/mp2t                                       ts;
-    video/mp4                                        mp4;
-    video/mpeg                                       mpeg mpg;
-    video/ogg                                        ogv;
-    video/quicktime                                  mov;
-    video/webm                                       webm;
-    video/x-flv                                      flv;
-    video/x-m4v                                      m4v;
-    video/x-matroska                                 mkv;
-    video/x-mng                                      mng;
-    video/x-ms-asf                                   asx asf;
-    video/x-ms-wmv                                   wmv;
-    video/x-msvideo                                  avi;
+    video/3gpp                            3gpp 3gp;
+    video/mp2t                            ts;
+    video/mp4                             mp4;
+    video/mpeg                            mpeg mpg;
+    video/quicktime                       mov;
+    video/webm                            webm;
+    video/x-flv                           flv;
+    video/x-m4v                           m4v;
+    video/x-mng                           mng;
+    video/x-ms-asf                        asx asf;
+    video/x-ms-wmv                        wmv;
+    video/x-msvideo                       avi;
 }
--- a/debian/conf/nginx.conf
+++ b/debian/conf/nginx.conf
@ -1,8 +1,6 @@
 user www-data;
 worker_processes auto;
-worker_cpu_affinity auto;
 pid /run/nginx.pid;
-error_log /var/log/nginx/error.log;
 include /etc/nginx/modules-enabled/*.conf;

 events {
@ -18,8 +16,10 @@ http {

 	sendfile on;
 	tcp_nopush on;
+	tcp_nodelay on;
+	keepalive_timeout 65;
 	types_hash_max_size 2048;
-	server_tokens off; # Recommended practice is to turn this off
+	# server_tokens off;

 	# server_names_hash_bucket_size 64;
 	# server_name_in_redirect off;
@ -31,20 +31,22 @@ http {
 	# SSL Settings
 	##

-	ssl_protocols TLSv1.2 TLSv1.3; # Dropping SSLv3 (POODLE), TLS 1.0, 1.1
-	ssl_prefer_server_ciphers off; # Don't force server cipher order.
+	ssl_protocols TLSv1 TLSv1.1 TLSv1.2; # Dropping SSLv3, ref: POODLE
+	ssl_prefer_server_ciphers on;

 	##
 	# Logging Settings
 	##

 	access_log /var/log/nginx/access.log;
+	error_log /var/log/nginx/error.log;

 	##
 	# Gzip Settings
 	##

 	gzip on;
+	gzip_disable "msie6";

 	# gzip_vary on;
 	# gzip_proxied any;
@ -65,17 +67,17 @@ http {
 #mail {
 #	# See sample authentication script at:
 #	# http://wiki.nginx.org/ImapAuthenticateWithApachePhpScript
-#
+# 
 #	# auth_http localhost/auth.php;
 #	# pop3_capabilities "TOP" "USER";
 #	# imap_capabilities "IMAP4rev1" "UIDPLUS";
-#
+# 
 #	server {
 #		listen     localhost:110;
 #		protocol   pop3;
 #		proxy      on;
 #	}
-#
+# 
 #	server {
 #		listen     localhost:143;
 #		protocol   imap;
--- a/debian/conf/sites-available/default
+++ b/debian/conf/sites-available/default
@ -1,17 +1,14 @@
 ##
 # You should look at the following URL's in order to grasp a solid understanding
 # of Nginx configuration files in order to fully unleash the power of Nginx.
-# https://www.nginx.com/resources/wiki/start/
+#
 # https://www.nginx.com/resources/wiki/start/topics/tutorials/config_pitfalls/
-# https://wiki.debian.org/Nginx/DirectoryStructure
+# https://www.nginx.com/resources/wiki/start/
+# http://nginx.com/resources/admin-guide
 #
-# In most cases, administrators will remove this file from sites-enabled/ and
-# leave it as reference inside of sites-available where it will continue to be
-# updated by the nginx packaging team.
-#
-# This file will automatically load configuration files provided by other
-# applications, such as Drupal or Wordpress. These applications will be made
-# available underneath a path with that package name, such as /drupal8.
+# In most cases, it is assumed that users will remove this file from sites-enabled/
+# and write their own configuration files while leaving this file as a reference
+# in sites-available/.
 #
 # Please see /usr/share/doc/nginx-doc/examples/ for more detailed examples.
 ##
@ -24,8 +21,8 @@ server {

 	# SSL configuration
 	#
-	# listen 443 ssl default_server;
-	# listen [::]:443 ssl default_server;
+	#listen 443 ssl default_server;
+	#listen [::]:443 ssl default_server;
 	#
 	# Note: You should disable gzip for SSL traffic.
 	# See: https://bugs.debian.org/773332
@ -36,45 +33,105 @@ server {
 	# Self signed certs generated by the ssl-cert package
 	# Don't use them in a production server!
 	#
-	# include snippets/snakeoil.conf;
+	#include snippets/snakeoil.conf;
+
+	# Server name
+	#
+	# Our default server_name is an invalid hostname that won't be matched
+	# by any valid requests. Any server_name defined in another configuration
+	# will supercede ours and take precedence.
+	#
+	# If additional configuration files are created, it would be a good idea
+	# to include the 'default_server' token on one of them as well.
+	#
+	# See: http://ngx.cc/r/server_name
+	#
+	server_name _;

 	root /var/www/html;

-	# Add index.php to the list if you are using PHP
 	index index.html index.htm index.nginx-debian.html;

-	server_name _;
-
 	location / {
-		# First attempt to serve request as file, then
-		# as directory, then fall back to displaying a 404.
+		# This represents the default try_files directive.
+		#
+		# $uri serves a static regular file, or symlink, if the root dir
+		# plus the exact requested path ($uri) exists.
+		#
+		# $uri/ has two functions, if a directory named root + $uri exists:
+		#   1. If the requested path doesn't end in /, nginx issues a 301
+		#      with a slash (/) appended.
+		#   2. If the requested path ends in /, nginx tries to serve an index
+		#      file if one exists (index directive), or a generated index if
+		#      autoindex is enabled, or else responds with 403.
+		#
+		# The final argument is a fallback and expected to always exist. The
+		# default "=404" returns a 404 response to the user.
+		#
 		try_files $uri $uri/ =404;
 	}

-	# pass PHP scripts to FastCGI server
+	# Packaged applications
 	#
+	# Some packages might attempt to provide fully-deployed web applications.
+	# In these cases, packages are expected to make their application available
+	# under a path with the same name.
+	#
+	#   apt-get install drupal7 -> http://localhost/drupal7
+	#
+	# For custom applications, it is perfectly acceptable to create a file
+	# named apps.d/local_zeplin.conf that provides location ^~ /zeplin { }.
+	#
+	# See: https://wiki.debian.org/Nginx/DirectoryStructure#appincludes
+	#
+	include apps.d/*.conf;
+
 	#location ~ \.php$ {
-	#	include snippets/fastcgi-php.conf;
-	#
-	#	# With php-fpm (or other unix sockets):
-	#	fastcgi_pass unix:/run/php/php7.4-fpm.sock;
-	#	# With php-cgi (or other tcp sockets):
-	#	fastcgi_pass 127.0.0.1:9000;
+		# Pass the PHP scripts to a FastCGI application server
+		# in some cases, "index.php" should be added to the (above) index directive
+
+		# Includes default and suggested FastCGI configuration values
+		#include snippets/fastcgi-php.conf;
+
+		# If using php-fpm, this is the default socket location. If you have
+		# a different version of php-fpm installed, this may be different.
+		#fastcgi_pass unix:/var/run/php7.0-fpm.sock
 	#}

-	# deny access to .htaccess files, if Apache's document root
-	# concurs with nginx's one
-	#
 	#location ~ /\.ht {
-	#	deny all;
+		# If your web application was designed to be run on apache, it likely
+		# has .htaccess and possibly a .htpasswd file embedded. It is typically
+		# recommended to remove access to these files.
+
+		# If you are using apache as your application server, we strongly
+		# recommend looking into uwsgi as an alternative.
+		#
+		#deny all;
+	#}
+
+	#location ~ /\. {
+		# As an alternative to the above, it's possible to block access
+		# to all hidden directories and files, not just .htaccess/passwd.
+		#
+		# If choosing this, any hidden directories (such as .well-known,
+		# used for letsencrypt) will need to be explicitly allowed.
+		#
+		# deny all;
+	#}
+
+	#location ^~ /.well-known/ {
+		# A prefix ( ^~ ) match will take precedence over the regex ( ~ ) match
+		# from above. Because nginx will only select one location block per nest,
+		# no directives need to be specified here to override deny all from above.
 	#}
 }


 # Virtual Host configuration for example.com
 #
-# You can move that to a different file under sites-available/ and symlink that
-# to sites-enabled/ to enable it.
+# You can create files underneath the sites-available/ directory and symlink to
+# them from sites-enabled/. Once nginx has been reloaded, the changes will take
+# effect. (service nginx reload)
 #
 #server {
 #	listen 80;
@ -86,6 +143,6 @@ server {
 #	index index.html;
 #
 #	location / {
-#		try_files $uri $uri/ =404;
+#		try_files $uri =404;
 #	}
 #}
--- a/debian/conf/snippets/fastcgi-php.conf
+++ b/debian/conf/snippets/fastcgi-php.conf
@ -1,5 +1,5 @@
 # regex to split $uri to $fastcgi_script_name and $fastcgi_path
-fastcgi_split_path_info ^(.+?\.php)(/.*)$;
+fastcgi_split_path_info ^(.+\.php)(/.+)$;

 # Check that the PHP script exists before passing it
 try_files $fastcgi_script_name =404;
--- a/debian/control
+++ b/debian/control
@ -1,37 +1,47 @@
 Source: nginx
 Section: httpd
 Priority: optional
-Maintainer: Debian Nginx Maintainers <pkg-nginx-maintainers@alioth-lists.debian.net>
-Uploaders: Jan Mojžíš <janmojzis@debian.org>
-Build-Depends: debhelper-compat (= 13),
+Maintainer: Debian Nginx Maintainers <pkg-nginx-maintainers@lists.alioth.debian.org>
+Uploaders: Kartik Mistry <kartik@debian.org>,
+           Michael Lustfield <michael@lustfield.net>,
+           Christos Trochalakis <yatiohi@ideopolis.gr>
+Build-Depends: autotools-dev,
+               debhelper (>= 9),
+               po-debconf,
+               dh-systemd (>= 1.5),
+               dpkg-dev (>= 1.15.5),
               libexpat-dev,
               libgd-dev,
               libgeoip-dev,
-               libpcre2-dev,
+               libhiredis-dev,
+               liblua5.1-0-dev [!i386 !amd64 !kfreebsd-i386 !armel !armhf !powerpc !powerpcspe !mips !mipsel],
+               libluajit-5.1-dev [i386 amd64 kfreebsd-i386 armel armhf powerpc powerpcspe mips mipsel],
+               libmhash-dev,
+               libpam0g-dev,
+               libpcre3-dev,
               libperl-dev,
               libssl-dev,
               libxslt1-dev,
               po-debconf,
+               quilt,
               zlib1g-dev
-Standards-Version: 4.7.0
-Homepage: https://nginx.org
-Vcs-Git: https://salsa.debian.org/nginx-team/nginx.git
-Vcs-Browser: https://salsa.debian.org/nginx-team/nginx
-Rules-Requires-Root: no
+Standards-Version: 3.9.8.0
+Homepage: http://nginx.net
+Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/nginx.git
+Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/nginx.git

 Package: nginx
-Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         iproute2,
-         nginx-common (= ${source:Version}),
-Breaks: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~),
-Replaces: nginx-light (<< 1.22.1-6~), nginx-extras (<< 1.22.1-6~), nginx-core (<< 1.22.1-6~),
-Provides: httpd, httpd-cgi, ${nginx:abi}
+Architecture: all
+Depends: nginx-full (<< ${source:Version}.1~) | nginx-light (<< ${source:Version}.1~) | nginx-extras (<< ${source:Version}.1~),
+         nginx-full (>= ${source:Version}) | nginx-light (>= ${source:Version}) | nginx-extras (>= ${source:Version}),
+         ${misc:Depends}
 Description: small, powerful, scalable web/proxy server
 Nginx ("engine X") is a high-performance web and reverse proxy server
 created by Igor Sysoev. It can be used both as a standalone web server
 and as a proxy to reduce the load on back-end HTTP or mail servers.
+ .
+ This is a dependency package to install either nginx-full (by default),
+ nginx-light or nginx-extras.

 Package: nginx-doc
 Architecture: all
@ -46,11 +56,9 @@ Description: small, powerful, scalable web/proxy server - documentation
 This package provides extra documentation to help unleash the power of Nginx.

 Package: nginx-common
-Breaks: nginx (<< 1.22.1-8)
-Replaces: nginx (<< 1.22.1-8)
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}
+Depends: lsb-base (>= 3.0-6), ${misc:Depends}
 Suggests: fcgiwrap, nginx-doc, ssl-cert
 Description: small, powerful, scalable web/proxy server - common files
 Nginx ("engine X") is a high-performance web and reverse proxy server
@ -60,86 +68,33 @@ Description: small, powerful, scalable web/proxy server - common files
 This package contains base configuration files used by all versions of
 nginx.

-Package: nginx-dev
-Architecture: all
-Multi-Arch: foreign
-Depends: ${misc:Depends}, ${S:Build-Depends},
-         ${nginx:abi},
-         nginx (<< ${source:Version}.1~),
-         nginx (>= ${source:Version}),
-Provides: dh-sequence-nginx
-Description: nginx web/proxy server - development headers
- Nginx ("engine X") is a high-performance web and reverse proxy server
- created by Igor Sysoev. It can be used both as a standalone web server
- and as a proxy to reduce the load on back-end HTTP or mail servers.
- .
- This package provides development headers and necessary config scripts
- for the nginx web/proxy server, useful to develop and link third party
- additions to the Debian nginx web/proxy server packages.
-
-Package: nginx-core
-Architecture: all
-Depends: libnginx-mod-http-geoip (>= ${source:Version}),
-         libnginx-mod-http-geoip (<< ${source:Version}.1~),
-         libnginx-mod-http-image-filter (>= ${source:Version}),
-         libnginx-mod-http-image-filter (<< ${source:Version}.1~),
-         libnginx-mod-http-xslt-filter (>= ${source:Version}),
-         libnginx-mod-http-xslt-filter (<< ${source:Version}.1~),
-         libnginx-mod-mail (>= ${source:Version}),
-         libnginx-mod-mail (<< ${source:Version}.1~),
-         libnginx-mod-stream (>= ${source:Version}),
-         libnginx-mod-stream (<< ${source:Version}.1~),
-         libnginx-mod-stream-geoip (>= ${source:Version}),
-         libnginx-mod-stream-geoip (<< ${source:Version}.1~),
-         nginx (>= ${source:Version}),
-         nginx (<< ${source:Version}.1~),
+Package: nginx-full
+Architecture: any
+Depends: libnginx-mod-http-auth-pam (= ${binary:Version}),
+         libnginx-mod-http-dav-ext (= ${binary:Version}),
+         libnginx-mod-http-echo (= ${binary:Version}),
+         libnginx-mod-http-geoip (= ${binary:Version}),
+         libnginx-mod-http-image-filter (= ${binary:Version}),
+         libnginx-mod-http-subs-filter (= ${binary:Version}),
+         libnginx-mod-http-upstream-fair (= ${binary:Version}),
+         libnginx-mod-http-xslt-filter (= ${binary:Version}),
+         libnginx-mod-mail (= ${binary:Version}),
+         libnginx-mod-stream (= ${binary:Version}),
+         nginx-common (= ${source:Version}),
         ${misc:Depends},
         ${shlibs:Depends}
-Breaks: nginx-full (<< 1.18.0-1),
-Replaces: nginx-full (<< 1.18.0-1),
+Breaks: nginx (<< 1.4.5-1)
+Provides: httpd, httpd-cgi, nginx
+Conflicts: nginx-extras, nginx-light
+Suggests: nginx-doc (= ${source:Version})
 Description: nginx web/proxy server (standard version)
 Nginx ("engine X") is a high-performance web and reverse proxy server
 created by Igor Sysoev. It can be used both as a standalone web server
 and as a proxy to reduce the load on back-end HTTP or mail servers.
 .
- This metapackage provides a version of nginx identical to that of nginx-full,
- but without any third-party modules, and only modules in the original
- nginx code base.
- .
- STANDARD HTTP MODULES: Core, Access, Auth Basic, Auto Index, Browser, Empty
- GIF, FastCGI, Geo, Limit Connections, Limit Requests, Map, Memcached, Proxy,
- Referer, Rewrite, SCGI, Split Clients, UWSGI.
- .
- OPTIONAL HTTP MODULES: Addition, Auth Request, Charset, WebDAV, GeoIP, Gunzip,
- Gzip, Gzip Precompression, Headers, HTTP/2, Image Filter, Index, Log, Real IP,
- Slice, SSI, SSL, SSL Preread, Stub Status, Substitution, Thread  Pool,
- Upstream, User ID, XSLT.
- .
- OPTIONAL MAIL MODULES: Mail Core, Auth HTTP, Proxy, SSL, IMAP, POP3, SMTP.
- .
- OPTIONAL STREAM MODULES: Stream Core, GeoIP
-
-Package: nginx-full
-Architecture: all
-Depends: libnginx-mod-http-auth-pam,
-         libnginx-mod-http-dav-ext,
-         libnginx-mod-http-echo,
-         libnginx-mod-http-geoip2,
-         libnginx-mod-http-subs-filter,
-         libnginx-mod-http-upstream-fair,
-         libnginx-mod-stream-geoip2,
-         nginx (>= ${source:Version}),
-         nginx (<< ${source:Version}.1~),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: nginx web/proxy server (standard version with 3rd parties)
- Nginx ("engine X") is a high-performance web and reverse proxy server
- created by Igor Sysoev. It can be used both as a standalone web server
- and as a proxy to reduce the load on back-end HTTP or mail servers.
- .
- This metapackage provides a version of nginx with the complete set of
+ This package provides a version of nginx with the complete set of
 standard modules included (but omitting some of those included in
- nginx-extras).
+ nginx-extra).
 .
 STANDARD HTTP MODULES: Core, Access, Auth Basic, Auto Index, Browser, Empty
 GIF, FastCGI, Geo, Limit Connections, Limit Requests, Map, Memcached, Proxy,
@ -147,29 +102,31 @@ Description: nginx web/proxy server (standard version with 3rd parties)
 .
 OPTIONAL HTTP MODULES: Addition, Auth Request, Charset, WebDAV, GeoIP, Gunzip,
 Gzip, Gzip Precompression, Headers, HTTP/2, Image Filter, Index, Log, Real IP,
- Slice, SSI, SSL, Stream, SSL Preread, Stub Status, Substitution, Thread  Pool,
- Upstream, User ID, XSLT.
+ Slice, SSI, SSL, Stream, Stub Status, Substitution, Thread Pool, Upstream,
+ User ID, XSLT.
 .
- OPTIONAL MAIL MODULES: Mail Core, Auth HTTP, Proxy, SSL, IMAP, POP3, SMTP.
+ MAIL MODULES: Mail Core, Auth HTTP, Proxy, SSL, IMAP, POP3, SMTP.
 .
- OPTIONAL STREAM MODULES: Stream Core, GeoIP, GeoIP2
- .
- THIRD PARTY MODULES: Auth PAM, DAV Ext, Echo, GeoIP2, HTTP Substitutions
- Upstream Fair Queue.
+ THIRD PARTY MODULES: Auth PAM, DAV Ext, Echo, HTTP Substitutions, Upstream
+ Fair Queue.

 Package: nginx-light
-Architecture: all
-Depends: libnginx-mod-http-echo,
-         nginx (>= ${source:Version}),
-         nginx (<< ${source:Version}.1~),
+Architecture: any
+Priority: extra
+Depends: libnginx-mod-http-echo (= ${binary:Version}),
+         nginx-common (= ${source:Version}),
         ${misc:Depends},
         ${shlibs:Depends}
+Breaks: nginx (<< 1.4.5-1)
+Provides: httpd, httpd-cgi, nginx
+Conflicts: nginx-extras, nginx-full
+Suggests: nginx-doc (= ${source:Version})
 Description: nginx web/proxy server (basic version)
 Nginx ("engine X") is a high-performance web and reverse proxy server
 created by Igor Sysoev. It can be used both as a standalone web server
 and as a proxy to reduce the load on back-end HTTP or mail servers.
 .
- This metapackage provides a very light version of nginx with only the
+ This package provides a very light version of nginx with only the
 minimal set of features and modules.
 .
 STANDARD HTTP MODULES: Core, Access, Auth Basic, Auto Index, Empty GIF,
@ -183,35 +140,37 @@ Description: nginx web/proxy server (basic version)

 Package: nginx-extras
 Architecture: any
-Depends: nginx (= ${binary:Version}),
+Priority: extra
+Depends: libnginx-mod-http-auth-pam (= ${binary:Version}),
+         libnginx-mod-http-cache-purge (= ${binary:Version}),
+         libnginx-mod-http-dav-ext (= ${binary:Version}),
+         libnginx-mod-http-echo (= ${binary:Version}),
+         libnginx-mod-http-fancyindex (= ${binary:Version}),
         libnginx-mod-http-geoip (= ${binary:Version}),
+         libnginx-mod-http-headers-more-filter (= ${binary:Version}),
         libnginx-mod-http-image-filter (= ${binary:Version}),
+         libnginx-mod-http-lua (= ${binary:Version}),
         libnginx-mod-http-perl (= ${binary:Version}),
+         libnginx-mod-http-subs-filter (= ${binary:Version}),
+         libnginx-mod-http-uploadprogress (= ${binary:Version}),
+         libnginx-mod-http-upstream-fair (= ${binary:Version}),
         libnginx-mod-http-xslt-filter (= ${binary:Version}),
         libnginx-mod-mail (= ${binary:Version}),
+         libnginx-mod-nchan (= ${binary:Version}),
         libnginx-mod-stream (= ${binary:Version}),
-         libnginx-mod-stream-geoip (= ${binary:Version}),
-         libnginx-mod-http-auth-pam,
-         libnginx-mod-http-cache-purge,
-         libnginx-mod-http-dav-ext,
-         libnginx-mod-http-echo,
-         libnginx-mod-http-fancyindex,
-         libnginx-mod-http-geoip2,
-         libnginx-mod-http-headers-more-filter,
-         libnginx-mod-http-lua [amd64 arm64 armel armhf i386 mips64el mipsel s390x riscv64 powerpc],
-         libnginx-mod-http-subs-filter,
-         libnginx-mod-http-uploadprogress,
-         libnginx-mod-http-upstream-fair,
-         libnginx-mod-nchan,
-         libnginx-mod-stream-geoip2,
+         nginx-common (= ${source:Version}),
         ${misc:Depends},
         ${shlibs:Depends}
+Breaks: nginx (<< 1.4.5-1)
+Provides: httpd, httpd-cgi, nginx
+Conflicts: nginx-full, nginx-light
+Suggests: nginx-doc (= ${source:Version})
 Description: nginx web/proxy server (extended version)
 Nginx ("engine X") is a high-performance web and reverse proxy server
 created by Igor Sysoev. It can be used both as a standalone web server
 and as a proxy to reduce the load on back-end HTTP or mail servers.
 .
- This metapackage provides a version of nginx with the standard modules, plus
+ This package provides a version of nginx with the standard modules, plus
 extra features and modules such as the Perl module, which allows the
 addition of Perl in configuration files.
 .
@ -222,20 +181,17 @@ Description: nginx web/proxy server (extended version)
 OPTIONAL HTTP MODULES: Addition, Auth Request, Charset, WebDAV, FLV, GeoIP,
 Gunzip, Gzip, Gzip Precompression, Headers, HTTP/2, Image Filter, Index, Log,
 MP4, Embedded Perl, Random Index, Real IP, Slice, Secure Link, SSI, SSL,
- SSL Preread, Stub Status, Substitution, Thread Pool, Upstream, User ID, XSLT.
+ Stream, Stub Status, Substitution, Thread Pool, Upstream, User ID, XSLT.
 .
- OPTIONAL MAIL MODULES: Mail Core, Auth HTTP, Proxy, SSL, IMAP, POP3, SMTP.
- .
- OPTIONAL STREAM MODULES: Stream, GeoIP, GeoIP2
+ MAIL MODULES: Mail Core, Auth HTTP, Proxy, SSL, IMAP, POP3, SMTP.
 .
 THIRD PARTY MODULES: Auth PAM, Cache Purge, DAV Ext, Echo, Fancy Index,
- GeoIP2, Headers More, Embedded Lua, HTTP Substitutions, Nchan, Upload Progress,
+ Headers More, Embedded Lua, HTTP Substitutions, Nchan, Upload Progress,
 Upstream Fair Queue.

 Package: libnginx-mod-http-geoip
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends},
-Recommends: nginx,
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: GeoIP HTTP module for Nginx
 The ngx_http_geoip module creates variables with values depending on the
 client IP address, using the precompiled MaxMind databases.
@ -245,8 +201,7 @@ Description: GeoIP HTTP module for Nginx

 Package: libnginx-mod-http-image-filter
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends},
-Recommends: nginx,
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: HTTP image filter module for Nginx
 The ngx_http_image_filter module is a filter that transforms images in JPEG,
 GIF, and PNG formats.
@ -256,8 +211,7 @@ Description: HTTP image filter module for Nginx

 Package: libnginx-mod-http-xslt-filter
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends},
-Recommends: nginx,
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: XSLT Transformation module for Nginx
 The ngx_http_xslt_filter module is a filter that transforms XML responses
 using one or more XSLT stylesheets.
@ -267,8 +221,7 @@ Description: XSLT Transformation module for Nginx

 Package: libnginx-mod-mail
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends},
-Recommends: nginx,
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Mail module for Nginx
 The nginx_mail module adds mail proxy support to nginx.
 .
@ -277,8 +230,7 @@ Description: Mail module for Nginx

 Package: libnginx-mod-stream
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends},
-Recommends: nginx,
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Stream module for Nginx
 The nginx_stream module adds stream proxy support to nginx.
 .
@ -286,22 +238,10 @@ Description: Stream module for Nginx
 also supports ACLs/connection limiting and configuring multiple operational
 parameters.

-Package: libnginx-mod-stream-geoip
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends},
- libnginx-mod-stream (= ${binary:Version}),
-Recommends: nginx,
-Description: GeoIP Stream module for Nginx
- The ngx_stream_geoip module creates variables with values depending on the
- client IP address, using the precompiled MaxMind databases.
- .
- Those variables include country, region, city, latitude, longitude, postal
- code, etc.
-
 Package: libnginx-mod-http-perl
 Architecture: any
-Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends},
-Recommends: nginx,
+Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
+Replaces: nginx-extras (<< 1.9.14-1)
 Description: Perl module for Nginx
 Embed Perl runtime into nginx.
 .
@ -309,3 +249,137 @@ Description: Perl module for Nginx
 in Perl and insert Perl calls into SSI.
 .
 Note that this module is marked experimental.
+
+Package: libnginx-mod-http-auth-pam
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: PAM authentication module for Nginx
+ The nginx_http_auth_pam module enables authentication using PAM.
+ .
+ The module uses PAM as a backend for simple http authentication. It
+ also allows setting the pam service name to allow more fine grained control.
+
+Package: libnginx-mod-http-lua
+Architecture: any
+Depends: libnginx-mod-http-ndk (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: LUA module for Nginx
+ Embed LUA runtime into nginx.
+ .
+ This module embeds Lua, via the standard Lua 5.1 interpreter or LuaJIT
+ 2.0/2.1, into Nginx and by leveraging Nginx's subrequests, allows the
+ integration of the powerful Lua threads (Lua coroutines) into the Nginx event
+ model.
+
+Package: libnginx-mod-http-ndk
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Nginx Development Kit module
+ The NDK is an Nginx module that is designed to extend the core functionality of
+ the excellent Nginx webserver in a way that can be used as a basis of other
+ Nginx modules.
+ .
+ It has functions and macros to deal with generic tasks that don't currently
+ have generic code as part of the core distribution. The NDK itself adds few
+ features that are seen from a user's point of view - it's just designed to help
+ reduce the code that Nginx module developers need to write.  Embed LUA runtime
+ into nginx.
+
+Package: libnginx-mod-nchan
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Fast, flexible pub/sub server for Nginx
+ Nchan is a scalable, flexible pub/sub server for the modern web, It can be
+ configured as a standalone server, or as a shim between your application and
+ tens, thousands, or millions of live subscribers. It can buffer messages in
+ memory, on-disk, or via Redis. All connections are handled asynchronously and
+ distributed among any number of worker processes. It can also scale to many
+ nginx server instances with Redis.
+ .
+ Full documentation available at https://nchan.slact.net
+
+Package: libnginx-mod-http-echo
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Bring echo and more shell style goodies to Nginx
+ Echo module wraps lots of Nginx internal APIs for streaming input and output,
+ parallel/sequential subrequests, timers and sleeping, as well as various meta
+ data accessing.
+ .
+ Basically it provides various utilities that help testing and debugging of
+ other modules by trivially emulating different kinds of faked subrequest
+ locations.
+ .
+ People will also find it useful in real-world applications that need to:
+ .
+ 1. Serve static contents directly from memory.
+ 2. Wrap the upstream response with custom header and footer (kinda like the
+    addition module but with contents read directly from the config file and
+    Nginx variables).
+ 3. Merge contents of various "Nginx locations" (i.e., subrequests) together in
+    a single main request (using echo_location and its friends).
+
+Package: libnginx-mod-http-upstream-fair
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Nginx Upstream Fair Proxy Load Balancer
+ The Nginx fair proxy balancer enhances the standard round-robin load balancer
+ provided with Nginx so that it tracks busy backend servers and adjusts
+ balancing accordingly.
+
+Package: libnginx-mod-http-headers-more-filter
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Set and clear input and output headers for Nginx
+ The Headers More module allows you to add, set, or clear any output or input
+ header that you specify.
+ .
+ This is an enhanced version of the standard headers module because it provides
+ more utilities like resetting or clearing "builtin headers" like Content-Type,
+ Content-Length, and Server.
+
+Package: libnginx-mod-http-cache-purge
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Purge content from Nginx caches
+ Cache Purge module adds purging capabilities to Nginx. It allows purging
+ content from caches used by all of Nginx proxy modules, like FastCGI, Proxy,
+ SCGI and uWSGI.
+
+Package: libnginx-mod-http-fancyindex
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Fancy indexes module for the Nginx
+ The Fancy Index module makes possible the generation of file listings, like
+ the built-in autoindex module does, but adding a touch of style by introducing
+ ways to customize the result.
+
+Package: libnginx-mod-http-uploadprogress
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Upload progress system for Nginx
+ Upload progress module is an implementation of an upload progress system, that
+ monitors RFC1867 POST uploads as they are transmitted to upstream servers.
+ .
+ It works by tracking the uploads proxied by Nginx to upstream servers without
+ analysing the uploaded content and offers a web API to report upload progress
+ in Javscript, Json or any other format.
+
+Package: libnginx-mod-http-subs-filter
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Substitution filter module for Nginx
+ Subsitution Nginx module can do both regular expression and fixed string
+ substitutions on response bodies. The module is quite different from Nginx's
+ native Substitution module. It scans the output chains buffer and
+ matches string line by line, just like Apache's mod_substitute.
+
+Package: libnginx-mod-http-dav-ext
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: WebDAV missing commands support for Nginx
+ WebDAV Ext module complements the Nginx WebDAV module to provide a full
+ WebDAV support.
+ .
+ WebDAV Ext provides the missing PROPFIND & OPTIONS methods.
--- a/debian/copyright
+++ b/debian/copyright
@ -1,14 +1,26 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: nginx
-Source: https://nginx.org/en/download.html
+Source: http://nginx.org/en/download.html

 Files: *
-Copyright: Valentin V. Bartenev
- Ruslan Ermilov
- Roman Arutyunyan
- Maxim Dounin
- 2011-2024, Nginx, Inc.
- 2002-2021, Igor Sysoev
+Copyright: 2002-2014 Igor Sysoev
+           2011-2014 Nginx, Inc.
+                     Maxim Dounin
+                     Valentin V. Bartenev
+                     Roman Arutyunyan
+                     Ruslan Ermilov
+License: BSD-2-clause
+
+Files: src/core/ngx_murmurhash.c
+Copyright: Copyright (C) Austin Appleby
+License: BSD-2-clause
+
+Files: src/http/modules/ngx_http_scgi_module.c
+       src/http/modules/ngx_http_uwsgi_module.c
+Copyright: Copyright (C) Igor Sysoev
+           Copyright (C) Nginx, Inc.
+           2009-2010 Unbit S.a.s.
+           2008      Manlio Perillo (manlio.perillo@gmail.com)
 License: BSD-2-clause

 Files: contrib/geo2nginx.pl
@ -16,67 +28,83 @@ Copyright: 2005, Andrei Nigmatulin
 License: BSD-2-clause

 Files: debian/*
-Copyright: 2022-2025, Jan Mojžíš <janmojzis@debian.org>
- 2020-2022, Ondřej Nový <onovy@debian.org>
- 2019-2022, Thomas Ward <teward@ubuntu.com>
- 2013-2016, Christos Trochalakis <ctrochalakis@debian.org>
- 2011-2013, Cyril Lavier <cyril.lavier@davromaniak.eu>
- 2011, Dmitry E. Oboukhov <unera@debian.org>
- 2010-2014, Michael Lustfield <michael@lustfield.net>
- 2009-2014, Kartik Mistry <kartik@debian.org>
- 2008, Jose Parrella <joseparrella@cantv.net>
- 2007-2009, Fabio Tranchitella <kobold@debian.org>
+Copyright: 2007-2009, Fabio Tranchitella <kobold@debian.org>
+           2008,      Jose Parrella <joseparrella@cantv.net>
+           2009-2014, Kartik Mistry <kartik@debian.org>
+           2010-2014, Michael Lustfield <michael@lustfield.net>
+           2011       Dmitry E. Oboukhov <unera@debian.org>
+           2011-2013, Cyril Lavier <cyril.lavier@davromaniak.eu>
+           2013-2014, Christos Trochalakis <yatiohi@ideopolis.gr>
 License: BSD-2-clause

-Files: debian/apport/*
-Copyright: 2015, Thomas Ward <teward@ubuntu.com>
+Files: debian/modules/headers-more-nginx-module/*
+Copyright: Copyright (c) 2009-2014, Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
+           Copyright (c) 2010-2013, Bernd Dorn
+           Copyright (c) Igor Sysoev
 License: BSD-2-clause

-Files: debian/debhelper/*
-Copyright: 2022, Miao Wang
-License: Expat
+Files: debian/modules/nginx-development-kit/*
+Copyright: Marcus Clyne
+License: BSD-3-clause

-Files: debian/debhelper/dh_nginx
-Copyright: 2016, Christos Trochalakis <ctrochalakis@debian.org>
-License: GPL-2+
+Files: debian/modules/nginx-development-kit/src/hash/md5.h
+       debian/modules/nginx-development-kit/src/hash/sha.h
+Copyright: Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+License: BSD-4-clause

-Files: debian/ngx-conf/ngx-conf
-Copyright: 2015, Michael Lustfield <michael@lustfield.net>
-License: Expat
-
-Files: man/*
-Copyright: Nginx, Inc.
- 2010, 2019, Sergey A. Osokin
+Files: debian/modules/nginx-auth-pam/*
+Copyright: 2008-2013, Sergio Talens Oliag
 License: BSD-2-clause

-Files: src/core/ngx_murmurhash.c
-Copyright: Austin Appleby
-License: public-domain
- All MurmurHash versions are public domain software, and the author
- disclaims all copyright to their code.
-
-Files: src/http/modules/ngx_http_scgi_module.c
-Copyright: Nginx, Inc.
- Manlio Perillo (manlio.perillo@gmail.com)
- Igor Sysoev
+Files: debian/modules/nginx-echo/*
+Copyright: Copyright (c) 2009-2014, Yichun "agentzh" Zhang <agentzh@gmail.com>
 License: BSD-2-clause

-Files: src/http/modules/ngx_http_uwsgi_module.c
-Copyright: Nginx, Inc.
- Igor Sysoev
- 2009, 2010, Unbit S.a.s.
- 2008, Manlio Perillo (manlio.perillo@gmail.com)
+Files: debian/modules/nginx-lua/*
+Copyright: Copyright (C) 2009-2014, by Xiaozhe Wang (chaoslawful) <chaoslawful@gmail.com>.
+           Copyright (C) 2009-2014, by Yichun "agentzh" Zhang (章亦春) <agentzh@gmail.com>, CloudFlare Inc.
 License: BSD-2-clause

-Files: src/http/ngx_http_huff_encode.c
-Copyright: Valentin V. Bartenev
- Nginx, Inc.
- 2015, Vlad Krasnov
+Files: debian/modules/nginx-upstream-fair/*
+Copyright: Copyright (c) 2007 Grzegorz Nosek
+           Igor Sysoev
 License: BSD-2-clause

-Files: src/stream/ngx_stream_set_module.c
-Copyright: Pavel Pautov
- Nginx, Inc.
+Files: debian/modules/nchan/*
+Copyright: 2009-2016 Leo Ponomarev
+License: MIT
+
+Files: debian/modules/nchan/src/store/redis/cmp.*
+Copyright: 2015 Charles Gunyon
+License: MIT
+
+Files: debian/modules/nchan/src/hiredis/*
+Copyright: 2009-2011, Salvatore Sanfilippo
+           2010-2011, Pieter Noordhuis
+                      Matt Stancliff
+                      Jan-Erik Rediger
+License: BSD-3-clause
+
+Files: debian/modules/nginx-upload-progress/*
+Copyright: Brice Figureau
+           2002-2007, Igor Sysoev
+License: BSD-2-clause
+
+Files: debian/modules/nginx-cache-purge/*
+Copyright: 2009-2012, FRiCKLE <info@frickle.com>,
+           2009-2012, Piotr Sikora <piotr.sikora@frickle.com>
+License: BSD-2-clause
+
+Files: debian/modules/nginx-dav-ext-module/*
+Copyright: Arutyunyan Roman <arut@qip.ru>
+License: BSD-2-clause
+
+Files: debian/modules/ngx-fancyindex/*
+Copyright: Copyright (c) Adrian Perez <aperez@igalia.com>
+License: BSD-2-clause
+
+Files: debian/modules/ngx_http_substitutions_filter_module/*
+Copyright: Copyright (C) 2014 by Weibin Yao <yaoweibin@gmail.com>
 License: BSD-2-clause

 License: BSD-2-clause
@ -104,7 +132,59 @@ License: BSD-2-clause
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-License: Expat
+License: BSD-3-clause
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this
+    software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License: BSD-4-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 4. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+License: MIT
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to
 deal in the Software without restriction, including without limitation the
@ -122,15 +202,3 @@ License: Expat
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 IN THE SOFTWARE.
-
-License: GPL-2+
- This is free software, licensed under:
- .
-   The GNU General Public License, Version 2, June 1991
- .
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 dated June, 1991, or (at
- your option) any later version.
- On Debian systems, the complete text of version 2 of the GNU General
- Public License can be found in '/usr/share/common-licenses/GPL-2'.
--- a/debian/debhelper/nginx.pm
+++ b/debian/debhelper/nginx.pm
@ -1,14 +0,0 @@
-#!/usr/bin/perl
-use warnings;
-use strict;
-use Debian::Debhelper::Dh_Lib;
-
-add_command_options( "dh_auto_test",      "--buildsystem=nginx_mod" );
-add_command_options( "dh_auto_configure", "--buildsystem=nginx_mod" );
-add_command_options( "dh_auto_build",     "--buildsystem=nginx_mod" );
-add_command_options( "dh_auto_install",   "--buildsystem=nginx_mod" );
-add_command_options( "dh_auto_clean",     "--buildsystem=nginx_mod" );
-
-insert_after("dh_install", "dh_nginx");
-
-1;
--- a/debian/debhelper/nginx_mod.pm
+++ b/debian/debhelper/nginx_mod.pm
@ -1,138 +0,0 @@
-# A build system class for handling nginx modules.
-#
-# Copyright: © 2022 Miao Wang
-# License: MIT
-
-package Debian::Debhelper::Buildsystem::nginx_mod;
-
-use strict;
-use warnings;
-use Dpkg::Deps qw(deps_parse);
-use Dpkg::Control::Info;
-use Debian::Debhelper::Dh_Lib qw(error doit getpackages addsubstvar);
-use File::Spec;
-use parent qw(Debian::Debhelper::Buildsystem::makefile);
-use Config;
-
-sub DESCRIPTION {
-	"Nginx Module (config)"
-}
-
-sub check_auto_buildable {
-	my ($this, $step) = @_;
-
-	return 1 if -e $this->get_sourcepath("config");
-}
-
-sub _NGINX_SRC_DIR {
-	"/usr/share/nginx/src"
-}
-
-sub _NDK_SRC_DIR {
-	"/usr/share/nginx-ndk/src"
-}
-
-sub new {
-	my $class=shift;
-	my $this= $class->SUPER::new(@_);
-	my $ngx_ver = `grep 'define NGINX_VERSION' /usr/share/nginx/src/src/core/nginx.h | sed -e 's/^.*"\\(.*\\)".*/\\1/'`;
-	chomp($ngx_ver);
-	$this->prefer_out_of_source_building(@_);
-	$this->{has_ndk} = $this->has_build_dep("libnginx-mod-http-ndk-dev");
-	$this->{has_stream} = $this->has_build_dep("libnginx-mod-stream");
-	foreach my $cur (getpackages('arch')) {
-		if ($this->{has_ndk} == 1) {
-			addsubstvar($cur, "misc:Depends", "libnginx-mod-http-ndk");
-		}
-		if ($this->{has_stream} == 1) {
-			addsubstvar($cur, "misc:Depends", "libnginx-mod-stream (>= $ngx_ver), libnginx-mod-stream (<< $ngx_ver.1~)");
-		}
-	}
-	return $this;
-}
-
-sub configure {
-	my $this=shift;
-
-	doit({
-		"chdir" => $this->_NGINX_SRC_DIR,
-		"update_env" => {
-			"src_dir" => $this->get_sourcedir,
-			"bld_dir" => $this->get_builddir,
-			"pwd_dir" => $this->{cwd},
-		},
-	}, "bash", "-c", '. ./conf_flags
-		./configure \\
-		--with-cc-opt="$(cd "$pwd_dir/$src_dir"; dpkg-buildflags --get CFLAGS) -fPIC $(cd "$pwd_dir/$src_dir"; dpkg-buildflags --get CPPFLAGS)" \\
-		--with-ld-opt="$(cd "$pwd_dir/$src_dir"; dpkg-buildflags --get LDFLAGS) -fPIC" \\
-		"${NGX_CONF_FLAGS[@]}" \\
-		--add-dynamic-module="$pwd_dir/$src_dir" \\
-		--builddir="$pwd_dir/$bld_dir" \\
-		' . ($this->{has_ndk} ? '--add-module=' . $this->_NDK_SRC_DIR : '') . ' \\
-		' . ($this->{has_stream} ? '--with-stream' : '') . ' \\
-		"$@"', "dummy", @_);
-}
-
-sub build {
-	my $this=shift;
-
-	$this->do_make("-f", File::Spec->catfile($this->{cwd}, $this->get_buildpath("Makefile")), "-C", $this->_NGINX_SRC_DIR, "modules");
-}
-
-sub test {
-	my $this=shift;
-
-	if ( $this->{has_ndk} and !grep( /^ndk_http_module.so$/, @_ ) ) {
-		unshift @_, "ndk_http_module.so";
-	}
-
-	if ( $this->{has_stream} and !grep( /^ngx_stream_module.so$/, @_ ) ) {
-		unshift @_, "ngx_stream_module.so";
-	}
-
-	$this->doit_in_builddir("bash", "-e", "-o", "pipefail", "-c", '
-		tmp_conf=$(mktemp -p .)
-		for pre_dep in "$@"; do
-			echo "load_module modules/$pre_dep;" >> "$tmp_conf"
-		done
-		for i in *.so; do
-			echo "load_module $PWD/$i;" >> "$tmp_conf"
-		done
-		echo "events{}" >> "$tmp_conf"
-		/usr/sbin/nginx -g "error_log /dev/null; pid /dev/null;" -t -q -c "$PWD/$tmp_conf"
-		rm -f "$tmp_conf"
-	', "dummy", @_);
-}
-
-sub install {
-	my $this=shift;
-	my $destdir=shift;
-
-	$this->doit_in_builddir("bash", "-e", "-o", "pipefail", "-c", '
-		destdir=$1
-		mkdir -p "$destdir/usr/lib/nginx/modules"
-		for i in *.so; do
-			cp "$i" "$destdir/usr/lib/nginx/modules/"
-		done
-	', "dummy", $destdir);
-}
-
-sub clean {
-	my $this=shift;
-	$this->rmdir_builddir();
-}
-
-sub has_build_dep {
-	my $this=shift;
-	my $bd=shift;
-	my $control = Dpkg::Control::Info->new()->get_source();
-	my $depends = deps_parse($control->{'Build-Depends'});
-	foreach (split /,\s+/,$depends) {
-		if ($_ =~ /$bd/) {
-		return 1;
-	}
-	}
-	return 0;
-}
-
-1
--- a/debian/debhelper/dh_nginx
+++ b/debian/debhelper/dh_nginx
@ -1,7 +1,7 @@
 #! /usr/bin/perl

 # dh_nginx - Nginx configuration helper
-# Copyright (C) 2016 Christos Trochalakis <ctrochalakis@debian.org>
+# Copyright (C) 2016 Christos Trochalakis <yatiohi@ideopolis.gr>
 #
 # This program is licensed under the terms of the GNU General
 # Public License veserion 2+
@ -23,28 +23,17 @@
 use strict;
 use File::Find;
 use Debian::Debhelper::Dh_Lib;
-use Dpkg::Substvars;
+

 =head1 NAME

 dh_nginx - register configuration snippets to the nginx web server

 =cut
-my $nginx_in_tree;
-my $abi;
+
 sub nginx_depends
 {
-	if (!$abi) {
-		my $sv = Dpkg::Substvars->new();
-		if ($nginx_in_tree) {
-			$sv->load("debian/libnginx-mod.abisubstvars");
-		}
-		else {
-			$sv->load("/usr/share/nginx/src/debian/libnginx-mod.abisubstvars");
-		}
-		$abi = $sv->get("nginx:abi");
-	}
-	return "$abi";
+	return 'nginx-common (= ${source:Version})'
 }

 sub nginx_api_installdir
@ -59,7 +48,7 @@ sub nginx_modules_conf_installdir

 =head1 SYNOPSIS

-B<dh_nginx> [S<I<debhelper options>>] [B<-n>|B<--noscripts>] [B<--in-nginx-tree>]
+B<dh_nginx> [S<I<debhelper options>>] [B<-n>|B<--noscripts>]

 =head1 DESCRIPTION

@ -74,8 +63,6 @@ It supports the following configuration types
 =item *
 Nginx modules

-=back
-
 =head1 INVOCATION

  %:
@ -95,11 +82,6 @@ Lists files to be registered with the Nginx HTTP server. The file is
 interpreted as line separated list of installation stanzas, where each entry
 consists of whitespace separated values conforming to the file semantics below.

-When this file is missing but the name of the package looks like a nginx module,
-the module load file and its loading priority is automatically generated inferring
-from the package name. In this case, I<package-name>B<.install> or other mechanisms
-should be used for copying the B<.so> library into the correct place.
-
 =head2 FILE SEMANTICS

 Each line consists of a triple
@ -146,10 +128,6 @@ configuration by default.

 Do not modify F<postinst>/F<postrm>/F<prerm> maintainer scripts.

-=item B<--in-nginx-tree>
-
-Specify this option when building in-tree modules along with nginx. When
-specified, nginx abi version is not required in package name.

 =back

@ -174,7 +152,6 @@ dh_nginx is heavily influnced by dh_apache2 written by Arno Toell

 init(options => {
 	"e|noenable" => \$dh{NOENABLE},
-	"in-nginx-tree" => \$nginx_in_tree,
 });

 foreach my $package ((@{$dh{DOPACKAGES}}))
@ -185,116 +162,85 @@ foreach my $package ((@{$dh{DOPACKAGES}}))

 	my $file = pkgfile($package, "nginx");
 	my $tmp  = tmpdir($package);
-	my $installdir = $tmp . "/" . nginx_modules_conf_installdir();
-	my $modinstalldir = $tmp . "/" . nginx_api_installdir();

-	if ($file){
-		my @files_to_register = filedoublearray($file, ".") if $file;
-		foreach my $line (@files_to_register)
+	my @files_to_register = filedoublearray($file, ".") if $file;
+	foreach my $line (@files_to_register)
+	{
+		my $type = lc(shift @{$line}) if $line->[0];
+		my $source = shift @{$line} if $line->[0];
+		my @arguments = @{$line};
+		my $destination;
+
+		$type = "modules" if $type eq "mod";
+		my $installdir = $tmp . "/" . nginx_modules_conf_installdir();
+
+		verbose_print("$type -- $source -- @arguments\n\n");
+
+		if ($type eq "modules")
 		{
-			my $type = lc(shift @{$line}) if $line->[0];
-			my $source = shift @{$line} if $line->[0];
-			my @arguments = @{$line};
-			my $destination;
-
-			$type = "modules" if $type eq "mod";
-
-			verbose_print("$type -- $source -- @arguments\n\n");
+			my $basesource = basename($source);

 			if ($type eq "modules")
 			{
-				my $basesource = basename($source);
-
-				if ($type eq "modules")
+				if ($basesource =~ m/\.conf$/)
 				{
-					if ($basesource =~ m/\.conf$/)
-					{
-						my $enablename = $basesource;
-						my $prio = $#arguments >= 0 ? $arguments[0] : 50;
-						$destination = "$prio-$basesource";
-						push @{$PACKAGE_TYPE{'has_a_module'}}, "$enablename:$destination";
-						verbose_print("Installing module configuration $enablename into $installdir prio:$prio\n");
-					}
-					elsif ($basesource =~ m/\.so$/)
-					{
-						verbose_print("Installing module binary $source into $modinstalldir\n");
-						if (! -d $modinstalldir)
-						{
-							complex_doit("mkdir","-p", $modinstalldir);
-							complex_doit("chmod","755","$modinstalldir");
-						}
-						complex_doit("cp", $source, $modinstalldir);
-						next;
-					}
-
-					# TODO
-					error("module: \"$basesource\" needs .conf, .so or suffix") if $basesource !~ m/\.(conf|so)/;
+					my $enablename = $basesource;
+					my $prio = $#arguments >= 0 ? $arguments[0] : 50;
+					$destination = "$prio-$basesource";
+					push @{$PACKAGE_TYPE{'has_a_module'}}, "$enablename:$destination";
+					verbose_print("Installing module configuration $enablename into $installdir prio:$prio\n");
 				}
-
-				if (! -d $installdir)
-				{
-					complex_doit("mkdir","-p",$installdir);
-					complex_doit("chmod","755","$installdir");
-				}
-				complex_doit("cp",$source,$installdir);
-				complex_doit("chmod","644","$installdir/$basesource");
-
-			}
-			else
+				elsif ($basesource =~ m/\.so$/)
 			{
-				error("Unknown parameter: $type\n");
+					my $modinstalldir = $tmp . "/" . nginx_api_installdir();
+					verbose_print("Installing module binary $source into $modinstalldir\n");
+					if (! -d $modinstalldir)
+					{
+						complex_doit("mkdir","-p", $modinstalldir);
+						complex_doit("chmod","755","$modinstalldir");
+					}
+					complex_doit("cp", $source, $modinstalldir);
+					next;
+				}
+
+				# TODO
+				error("module: \"$basesource\" needs .conf, .so or suffix") if $basesource !~ m/\.(conf|so)/;
 			}

-		}
-	} elsif ($package =~ /^libnginx-mod-/){
-		verbose_print("$package might be a nginx module\n");
-
-		my $module = $package;
-		$module =~ s/^libnginx-mod-//;
-		verbose_print("Guessed module name: $module\n");
-
-		my $modulepath = $module;
-		$modulepath =~ s/-/_/g;
-
-		if (-e "$modinstalldir/ngx_${modulepath}_module.so"){
-			my $prio = 50;
-			if ($module =~ /^\w+-/ && !($module =~ /^http-/) ){
-				$prio = 70;
+			if (! -d $installdir)
+			{
+				complex_doit("mkdir","-p",$installdir);
+				complex_doit("chmod","755","$installdir");
 			}
-			verbose_print("Guessed load priority: $prio\n");
+			complex_doit("cp",$source,$installdir);
+			complex_doit("chmod","644","$installdir/$basesource");

-			my $conf_name = "mod-$module.conf";
-			install_dir($installdir);
-			verbose_print("Installing module configuration $conf_name into $installdir prio:$prio\n");
-			open(MOD_CONF, $dh{NO_ACT} ? ">&STDERR" : ">$installdir/$conf_name") or error("open($installdir/$conf_name): $!");
-			print(MOD_CONF "load_module modules/ngx_${modulepath}_module.so;\n");
-			close(MOD_CONF);
-			chmod(0644, "$installdir/$conf_name") or error("chmod(0644, $installdir/$conf_name): $!");
-			push @{$PACKAGE_TYPE{'has_a_module'}}, "$conf_name:$prio-$conf_name";
-		} else {
-			verbose_print("$package is not a nginx module because $modinstalldir/ngx_${modulepath}_module.so not found");
-			verbose_print("If it is not correct, check if the module is installed before invoking this script");
 		}
+		else
+		{
+			error("Unknown parameter: $type\n");
+		}
+
 	}

-	my @postinst_autoscripts;
+        my @postinst_autoscripts;

-	if ($#{$PACKAGE_TYPE{'has_a_module'}} >= 0)
-	{
-		if ($package !~ m/libnginx-mod-\w+?/)
-		{
-			warning("Package $package appears to be an Nginx module. It should comply to the package naming scheme libnginx-mod-<modulename>\n");
-		}
-		addsubstvar($package, "misc:Depends", nginx_depends());
+        if ($#{$PACKAGE_TYPE{'has_a_module'}} >= 0)
+        {
+                if ($package !~ m/libnginx-mod-\w+?/)
+                {
+                        warning("Package $package appears to be an Nginx module. It should comply to the package naming scheme libnginx-mod-<modulename>\n");
+                }
+                addsubstvar($package, "misc:Depends", nginx_depends());

-		my $modules = "";
-		foreach my $module (@{$PACKAGE_TYPE{'has_a_module'}})
-		{
-			$modules .= "$module ";
-		}
+                my $modules = "";
+                foreach my $module (@{$PACKAGE_TYPE{'has_a_module'}})
+                {
+                        $modules .= "$module ";
+                }

-		push @postinst_autoscripts, ["module", $modules];
-	}
+                push @postinst_autoscripts, ["module", $modules];
+        }

 	if (! $dh{NOSCRIPTS})
 	{
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@ -1,13 +1,3 @@
 [DEFAULT]
-debian-branch = main
-upstream-branch = upstream
-upstream-tag = upstream/%(version)s
 pristine-tar = True
-sign-tags = True
-upstream-signatures = on

-[import-orig]
-merge-mode = replace
-
-[pull]
-track-missing = True
--- a/debian/help/examples/http
+++ b/debian/help/examples/http
@ -38,6 +38,7 @@ http {
 	##

 	gzip on;
+	gzip_disable "msie6";

 	# gzip_vary on;
 	# gzip_proxied any;
--- a/debian/help/examples/wordpress
+++ b/debian/help/examples/wordpress
@ -34,8 +34,8 @@ server {
 	}
 
 	# This location block protects against a known attack. It happens if
-	# the attacker uploads a non-PHP file and attempts to run it as a
-	# PHP file on the server.
+	# the attacker uploads a non-php file and attempts to run it as a
+	# php file on the server.
 	location ~ \..*/.*\.php$ {
 		return 403;
 	}
@ -43,7 +43,7 @@ server {
 	# This is our primary location block. The try_files directive will
 	# attempt to serve the data in the order listed. First try the exact
 	# request (such as an image or text file). If it doesn't exist, see if
-	# the directory exists. If not, then we move to the last option which
+	# the directory exists. If not, then we move to the last options which
 	# passes the request to /index.php with the requested query.
 	location / {
 		try_files $uri $uri/ /index.php?q=$uri&$args;
@ -51,7 +51,7 @@ server {
 
 	# If a PHP file is served, this block will handle the request. This block
 	# works on the assumption you are using php-cgi listening on /tmp/phpcgi.socket.
-	# Please see the PHP example (/usr/share/doc/nginx-doc/php) for more
+	# Please see the php example (usr/share/doc/nginx/exmaples/php) for more
 	# information about setting up PHP.
 	# NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini
 	location ~ \.php$ {
@ -61,11 +61,12 @@ server {
 		fastcgi_intercept_errors on;
 		fastcgi_pass unix:/tmp/phpcgi.socket;
 	}
-
-	# If we're serving a static file that ends with one of the following
-	# extensions, it is best to set a very high expires time. This will
-	# generate fewer requests for the file. These requests will be logged if
-	# found, but not if they don't exist.
+ 
+	# As mentioned above, Nignx is king of static. If we're serving a static
+	# file that ends with one of the following extensions, it is best to set
+	# a very high expires time. This will generate fewer requests for the
+	# file. These requests will be logged if found, but not if they don't
+	# exist.
 	location ~* \.(js|css|png|jpg|jpeg|gif|ico)$ {
 		expires max;
 		log_not_found off;
--- a/debian/libnginx-mod-http-auth-pam.nginx
+++ b/debian/libnginx-mod-http-auth-pam.nginx
@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//;
 $modulepath = $module;
 $modulepath =~ s/-/_/g;

-print "mod debian/build-bin/objs/ngx_${modulepath}_module.so\n";
-print "mod debian/libnginx-mod.conf/mod-${module}.conf 70\n";
+print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
--- a/debian/libnginx-mod-http-cache-purge.nginx
+++ b/debian/libnginx-mod-http-cache-purge.nginx
@ -0,0 +1,13 @@
+#!/usr/bin/perl -w
+
+use File::Basename;
+
+# Guess module name
+$module = basename($0, '.nginx');
+$module =~ s/^libnginx-mod-//;
+
+$modulepath = $module;
+$modulepath =~ s/-/_/g;
+
+print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
--- a/debian/libnginx-mod-http-dav-ext.nginx
+++ b/debian/libnginx-mod-http-dav-ext.nginx
@ -0,0 +1,13 @@
+#!/usr/bin/perl -w
+
+use File::Basename;
+
+# Guess module name
+$module = basename($0, '.nginx');
+$module =~ s/^libnginx-mod-//;
+
+$modulepath = $module;
+$modulepath =~ s/-/_/g;
+
+print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
--- a/debian/libnginx-mod-http-echo.nginx
+++ b/debian/libnginx-mod-http-echo.nginx
@ -0,0 +1,13 @@
+#!/usr/bin/perl -w
+
+use File::Basename;
+
+# Guess module name
+$module = basename($0, '.nginx');
+$module =~ s/^libnginx-mod-//;
+
+$modulepath = $module;
+$modulepath =~ s/-/_/g;
+
+print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
--- a/debian/libnginx-mod-http-fancyindex.nginx
+++ b/debian/libnginx-mod-http-fancyindex.nginx
@ -0,0 +1,13 @@
+#!/usr/bin/perl -w
+
+use File::Basename;
+
+# Guess module name
+$module = basename($0, '.nginx');
+$module =~ s/^libnginx-mod-//;
+
+$modulepath = $module;
+$modulepath =~ s/-/_/g;
+
+print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
--- a/debian/libnginx-mod-http-geoip.nginx
+++ b/debian/libnginx-mod-http-geoip.nginx
@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//;
 $modulepath = $module;
 $modulepath =~ s/-/_/g;

-print "mod debian/build-bin/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
 print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
--- a/debian/libnginx-mod-http-headers-more-filter.nginx
+++ b/debian/libnginx-mod-http-headers-more-filter.nginx
@ -0,0 +1,13 @@
+#!/usr/bin/perl -w
+
+use File::Basename;
+
+# Guess module name
+$module = basename($0, '.nginx');
+$module =~ s/^libnginx-mod-//;
+
+$modulepath = $module;
+$modulepath =~ s/-/_/g;
+
+print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
--- a/debian/libnginx-mod-http-image-filter.nginx
+++ b/debian/libnginx-mod-http-image-filter.nginx
@ -9,5 +9,5 @@ $module =~ s/^libnginx-mod-//;
 $modulepath = $module;
 $modulepath =~ s/-/_/g;

-print "mod debian/build-bin/objs/ngx_${modulepath}_module.so\n";
+print "mod debian/build-extras/objs/ngx_${modulepath}_module.so\n";
 print "mod debian/libnginx-mod.conf/mod-${module}.conf\n";
--- a/Show more
+++ b/Show more
Author	SHA1	Message	Date
Michael Lustfield	b826f8681c	Adding/updating comments and including apps.d/.	2016-11-10 18:29:38 +00:00
Michael Lustfield	c87b640e93	Applying a summary of commit `5d09382c82`. Also updating nginx-common/purge.	2016-11-10 07:27:18 +00:00