passenger 5.1.6 → 5.1.7

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.

This version of passenger might be problematic. Click here for more details.

Files changed (26) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG +13 -4
  3. data/build/support/cxx_dependency_map.rb +48 -0
  4. data/src/agent/Core/Controller.h +1 -0
  5. data/src/agent/Core/Controller/StateInspection.cpp +5 -0
  6. data/src/agent/Core/CoreMain.cpp +3 -0
  7. data/src/agent/Core/SecurityUpdateChecker.h +30 -11
  8. data/src/agent/Core/SpawningKit/PipeWatcher.h +1 -1
  9. data/src/agent/UstRouter/RemoteSender.h +9 -2
  10. data/src/cxx_supportlib/ConfigKit/Common.h +5 -0
  11. data/src/cxx_supportlib/ConfigKit/DummyTranslator.h +76 -0
  12. data/src/cxx_supportlib/ConfigKit/PrefixTranslator.h +166 -0
  13. data/src/cxx_supportlib/ConfigKit/README.md +57 -32
  14. data/src/cxx_supportlib/ConfigKit/Schema.h +23 -15
  15. data/src/cxx_supportlib/ConfigKit/Store.h +15 -3
  16. data/src/cxx_supportlib/ConfigKit/Utils.h +6 -0
  17. data/src/cxx_supportlib/ConfigKit/VariantMapUtils.h +12 -0
  18. data/src/cxx_supportlib/Constants.h +1 -1
  19. data/src/cxx_supportlib/Utils.cpp +15 -5
  20. data/src/cxx_supportlib/Utils.h +2 -0
  21. data/src/cxx_supportlib/Utils/Curl.h +1 -1
  22. data/src/cxx_supportlib/vendor-modified/jsoncpp/json-forwards.h +10 -4
  23. data/src/cxx_supportlib/vendor-modified/jsoncpp/json.h +30 -9
  24. data/src/cxx_supportlib/vendor-modified/jsoncpp/jsoncpp.cpp +85 -51
  25. data/src/ruby_supportlib/phusion_passenger.rb +1 -1
  26. metadata +4 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 4311bd603fba4a811f0b73e87bc6c4bcea81f3c7
4
- data.tar.gz: 6c98efbb7f95813cefb4baf17e1be8b9d7b9c4e9
3
+ metadata.gz: fbbaa7ce5680d2bf74cb48b53ffdf479c3aeda4a
4
+ data.tar.gz: 9d09039be00d0ec2d7483c70e69ec6ce5e187555
5
5
  SHA512:
6
- metadata.gz: f4b1a51f5d6b745840a27fc0ea44476ffe4c91078d3e9f8f7cd6f0241e0113289dc69686632a836838fa30cb5c0d839f174871a2908707a08edc9b2b9d3bc5f2
7
- data.tar.gz: 786dbaba625c413aa66423ff5837a4132e938355327addac070a063f4b01e3a609f138039715c6bad5769e2cc73b19c5adf3688038a859074b21a1fcfeaf0753
6
+ metadata.gz: a0138db2f1a273619779d60367139fe2d4ce3ef57df256d45abfe0acd73445b0831213eb145d264029a64e2dfe70499f2c0b9b28569020e6c8bc8167e717a4a3
7
+ data.tar.gz: a6cbda6beeeaa59ba55a3d781490a6fcbe1018f31e1b9fbf75b99ac5d263e76dfd879aecc1c752129261ed12245f5b05a9fa23f2f392ebc02207b3d12f946a39
data/CHANGELOG CHANGED
@@ -1,5 +1,14 @@
1
+ Release 5.1.7 (not yet released)
2
+ --------------------------------
3
+
4
+ * Fixes compilation problems on some systems.
5
+ * Upgrades the JSON parser (json-cpp) to version 1.8.1. This makes parsing slightly faster, adds various security checks and fixes some JSON generation issues.
6
+ * [Enterprise] Fixes an SSL certificate issue in the license usage data reporter, which only occurs when Passenger Enterprise installed from gem or tarball. The license usage data reporter now searches for the correct system CA path.
7
+ * [Enterprise] Fixes a potential use-after-free bug when reporting usage data to the Phusion licensing server, and improves reliability of usage data recording.
8
+
9
+
1
10
  Release 5.1.6
2
- -------------------------------
11
+ -------------
3
12
 
4
13
  * Fixes a typo that causes a looping crash when long security update information is sent by the server. In practice we will keep the messages shorter to avoid triggering this until there has been ample time to upgrade.
5
14
  * Fixes unnecessary process respawn if it was detached and min_instances is set to 0. Closes GH-1735.
@@ -19,7 +28,7 @@ Release 5.1.6
19
28
 
20
29
 
21
30
  Release 5.1.5
22
- -------------------------------
31
+ -------------
23
32
 
24
33
  * Updated Boost to version 1.64.0, which fixed a compilation issue on certain Gentoo based setups. Closes GH-1942.
25
34
  * Improved the error message shown when an app fails to start in time.
@@ -28,7 +37,7 @@ Release 5.1.5
28
37
 
29
38
 
30
39
  Release 5.1.4
31
- -------------------------------
40
+ -------------
32
41
 
33
42
  * Updated zlib version used in building precompiled binaries (used for e.g. gem installs) to 1.2.11 (was: 1.2.8).
34
43
  * Updated openssl version used in building precompiled binaries (used for e.g. gem installs) to 1.0.2k (was: 1.0.2j).
@@ -39,7 +48,7 @@ Release 5.1.4
39
48
 
40
49
 
41
50
  Release 5.1.3
42
- -------------------------------
51
+ -------------
43
52
 
44
53
  * [Standalone] Fixes `install-standalone-runtime` command after regression in 5.1.2.
45
54
  * Removes unnecessary logging of "No Error" from macOS Security Update Checker.
data/build/support/cxx_dependency_map.rb CHANGED
@@ -43,6 +43,7 @@ CXX_DEPENDENCY_MAP =
43
43
  "src/cxx_supportlib/AppTypes.h",
44
44
  "src/cxx_supportlib/ConfigKit/Common.h",
45
45
  "src/cxx_supportlib/ConfigKit/ConfigKit.h",
46
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
46
47
  "src/cxx_supportlib/ConfigKit/Schema.h",
47
48
  "src/cxx_supportlib/ConfigKit/Store.h",
48
49
  "src/cxx_supportlib/ConfigKit/TableTranslator.h",
@@ -2422,6 +2423,7 @@ CXX_DEPENDENCY_MAP =
2422
2423
  "src/cxx_supportlib/AppTypes.h",
2423
2424
  "src/cxx_supportlib/ConfigKit/Common.h",
2424
2425
  "src/cxx_supportlib/ConfigKit/ConfigKit.h",
2426
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
2425
2427
  "src/cxx_supportlib/ConfigKit/Schema.h",
2426
2428
  "src/cxx_supportlib/ConfigKit/Store.h",
2427
2429
  "src/cxx_supportlib/ConfigKit/TableTranslator.h",
@@ -2596,6 +2598,7 @@ CXX_DEPENDENCY_MAP =
2596
2598
  "src/cxx_supportlib/AppTypes.h",
2597
2599
  "src/cxx_supportlib/ConfigKit/Common.h",
2598
2600
  "src/cxx_supportlib/ConfigKit/ConfigKit.h",
2601
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
2599
2602
  "src/cxx_supportlib/ConfigKit/Schema.h",
2600
2603
  "src/cxx_supportlib/ConfigKit/Store.h",
2601
2604
  "src/cxx_supportlib/ConfigKit/TableTranslator.h",
@@ -2726,6 +2729,7 @@ CXX_DEPENDENCY_MAP =
2726
2729
  "src/cxx_supportlib/AppTypes.h",
2727
2730
  "src/cxx_supportlib/ConfigKit/Common.h",
2728
2731
  "src/cxx_supportlib/ConfigKit/ConfigKit.h",
2732
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
2729
2733
  "src/cxx_supportlib/ConfigKit/Schema.h",
2730
2734
  "src/cxx_supportlib/ConfigKit/Store.h",
2731
2735
  "src/cxx_supportlib/ConfigKit/TableTranslator.h",
@@ -2851,6 +2855,7 @@ CXX_DEPENDENCY_MAP =
2851
2855
  "src/cxx_supportlib/AppTypes.h",
2852
2856
  "src/cxx_supportlib/ConfigKit/Common.h",
2853
2857
  "src/cxx_supportlib/ConfigKit/ConfigKit.h",
2858
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
2854
2859
  "src/cxx_supportlib/ConfigKit/Schema.h",
2855
2860
  "src/cxx_supportlib/ConfigKit/Store.h",
2856
2861
  "src/cxx_supportlib/ConfigKit/TableTranslator.h",
@@ -2941,6 +2946,7 @@ CXX_DEPENDENCY_MAP =
2941
2946
  ["src/cxx_supportlib/Algorithms/MovingAverage.h",
2942
2947
  "src/cxx_supportlib/ConfigKit/Common.h",
2943
2948
  "src/cxx_supportlib/ConfigKit/ConfigKit.h",
2949
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
2944
2950
  "src/cxx_supportlib/ConfigKit/Schema.h",
2945
2951
  "src/cxx_supportlib/ConfigKit/Store.h",
2946
2952
  "src/cxx_supportlib/ConfigKit/TableTranslator.h",
@@ -3041,6 +3047,7 @@ CXX_DEPENDENCY_MAP =
3041
3047
  "src/cxx_supportlib/AppTypes.h",
3042
3048
  "src/cxx_supportlib/ConfigKit/Common.h",
3043
3049
  "src/cxx_supportlib/ConfigKit/ConfigKit.h",
3050
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
3044
3051
  "src/cxx_supportlib/ConfigKit/Schema.h",
3045
3052
  "src/cxx_supportlib/ConfigKit/Store.h",
3046
3053
  "src/cxx_supportlib/ConfigKit/TableTranslator.h",
@@ -3171,6 +3178,7 @@ CXX_DEPENDENCY_MAP =
3171
3178
  "src/cxx_supportlib/AppTypes.h",
3172
3179
  "src/cxx_supportlib/ConfigKit/Common.h",
3173
3180
  "src/cxx_supportlib/ConfigKit/ConfigKit.h",
3181
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
3174
3182
  "src/cxx_supportlib/ConfigKit/Schema.h",
3175
3183
  "src/cxx_supportlib/ConfigKit/Store.h",
3176
3184
  "src/cxx_supportlib/ConfigKit/TableTranslator.h",
@@ -3311,6 +3319,7 @@ CXX_DEPENDENCY_MAP =
3311
3319
  "src/cxx_supportlib/AppTypes.h",
3312
3320
  "src/cxx_supportlib/ConfigKit/Common.h",
3313
3321
  "src/cxx_supportlib/ConfigKit/ConfigKit.h",
3322
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
3314
3323
  "src/cxx_supportlib/ConfigKit/Schema.h",
3315
3324
  "src/cxx_supportlib/ConfigKit/Store.h",
3316
3325
  "src/cxx_supportlib/ConfigKit/TableTranslator.h",
@@ -3441,6 +3450,7 @@ CXX_DEPENDENCY_MAP =
3441
3450
  "src/cxx_supportlib/AppTypes.h",
3442
3451
  "src/cxx_supportlib/ConfigKit/Common.h",
3443
3452
  "src/cxx_supportlib/ConfigKit/ConfigKit.h",
3453
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
3444
3454
  "src/cxx_supportlib/ConfigKit/Schema.h",
3445
3455
  "src/cxx_supportlib/ConfigKit/Store.h",
3446
3456
  "src/cxx_supportlib/ConfigKit/TableTranslator.h",
@@ -3571,6 +3581,7 @@ CXX_DEPENDENCY_MAP =
3571
3581
  "src/cxx_supportlib/AppTypes.h",
3572
3582
  "src/cxx_supportlib/ConfigKit/Common.h",
3573
3583
  "src/cxx_supportlib/ConfigKit/ConfigKit.h",
3584
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
3574
3585
  "src/cxx_supportlib/ConfigKit/Schema.h",
3575
3586
  "src/cxx_supportlib/ConfigKit/Store.h",
3576
3587
  "src/cxx_supportlib/ConfigKit/TableTranslator.h",
@@ -3701,6 +3712,7 @@ CXX_DEPENDENCY_MAP =
3701
3712
  "src/cxx_supportlib/AppTypes.h",
3702
3713
  "src/cxx_supportlib/ConfigKit/Common.h",
3703
3714
  "src/cxx_supportlib/ConfigKit/ConfigKit.h",
3715
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
3704
3716
  "src/cxx_supportlib/ConfigKit/Schema.h",
3705
3717
  "src/cxx_supportlib/ConfigKit/Store.h",
3706
3718
  "src/cxx_supportlib/ConfigKit/TableTranslator.h",
@@ -3831,6 +3843,7 @@ CXX_DEPENDENCY_MAP =
3831
3843
  "src/cxx_supportlib/AppTypes.h",
3832
3844
  "src/cxx_supportlib/ConfigKit/Common.h",
3833
3845
  "src/cxx_supportlib/ConfigKit/ConfigKit.h",
3846
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
3834
3847
  "src/cxx_supportlib/ConfigKit/Schema.h",
3835
3848
  "src/cxx_supportlib/ConfigKit/Store.h",
3836
3849
  "src/cxx_supportlib/ConfigKit/TableTranslator.h",
@@ -3955,6 +3968,7 @@ CXX_DEPENDENCY_MAP =
3955
3968
  "src/cxx_supportlib/AppTypes.h",
3956
3969
  "src/cxx_supportlib/ConfigKit/Common.h",
3957
3970
  "src/cxx_supportlib/ConfigKit/ConfigKit.h",
3971
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
3958
3972
  "src/cxx_supportlib/ConfigKit/Schema.h",
3959
3973
  "src/cxx_supportlib/ConfigKit/Store.h",
3960
3974
  "src/cxx_supportlib/ConfigKit/TableTranslator.h",
@@ -4081,6 +4095,7 @@ CXX_DEPENDENCY_MAP =
4081
4095
  "src/cxx_supportlib/AppTypes.h",
4082
4096
  "src/cxx_supportlib/ConfigKit/Common.h",
4083
4097
  "src/cxx_supportlib/ConfigKit/ConfigKit.h",
4098
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
4084
4099
  "src/cxx_supportlib/ConfigKit/Schema.h",
4085
4100
  "src/cxx_supportlib/ConfigKit/Store.h",
4086
4101
  "src/cxx_supportlib/ConfigKit/TableTranslator.h",
@@ -4211,6 +4226,7 @@ CXX_DEPENDENCY_MAP =
4211
4226
  "src/cxx_supportlib/AppTypes.h",
4212
4227
  "src/cxx_supportlib/ConfigKit/Common.h",
4213
4228
  "src/cxx_supportlib/ConfigKit/ConfigKit.h",
4229
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
4214
4230
  "src/cxx_supportlib/ConfigKit/Schema.h",
4215
4231
  "src/cxx_supportlib/ConfigKit/Store.h",
4216
4232
  "src/cxx_supportlib/ConfigKit/TableTranslator.h",
@@ -4385,6 +4401,7 @@ CXX_DEPENDENCY_MAP =
4385
4401
  "src/cxx_supportlib/BackgroundEventLoop.h",
4386
4402
  "src/cxx_supportlib/ConfigKit/Common.h",
4387
4403
  "src/cxx_supportlib/ConfigKit/ConfigKit.h",
4404
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
4388
4405
  "src/cxx_supportlib/ConfigKit/Schema.h",
4389
4406
  "src/cxx_supportlib/ConfigKit/Store.h",
4390
4407
  "src/cxx_supportlib/ConfigKit/TableTranslator.h",
@@ -5105,6 +5122,7 @@ CXX_DEPENDENCY_MAP =
5105
5122
  "src/cxx_supportlib/AppTypes.h",
5106
5123
  "src/cxx_supportlib/ConfigKit/Common.h",
5107
5124
  "src/cxx_supportlib/ConfigKit/ConfigKit.h",
5125
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
5108
5126
  "src/cxx_supportlib/ConfigKit/Schema.h",
5109
5127
  "src/cxx_supportlib/ConfigKit/Store.h",
5110
5128
  "src/cxx_supportlib/ConfigKit/TableTranslator.h",
@@ -5332,6 +5350,7 @@ CXX_DEPENDENCY_MAP =
5332
5350
  "src/cxx_supportlib/AppTypes.h",
5333
5351
  "src/cxx_supportlib/ConfigKit/Common.h",
5334
5352
  "src/cxx_supportlib/ConfigKit/ConfigKit.h",
5353
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
5335
5354
  "src/cxx_supportlib/ConfigKit/Schema.h",
5336
5355
  "src/cxx_supportlib/ConfigKit/Store.h",
5337
5356
  "src/cxx_supportlib/ConfigKit/TableTranslator.h",
@@ -5427,6 +5446,7 @@ CXX_DEPENDENCY_MAP =
5427
5446
  "src/cxx_supportlib/Algorithms/MovingAverage.h",
5428
5447
  "src/cxx_supportlib/ConfigKit/Common.h",
5429
5448
  "src/cxx_supportlib/ConfigKit/ConfigKit.h",
5449
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
5430
5450
  "src/cxx_supportlib/ConfigKit/Schema.h",
5431
5451
  "src/cxx_supportlib/ConfigKit/Store.h",
5432
5452
  "src/cxx_supportlib/ConfigKit/TableTranslator.h",
@@ -5487,6 +5507,7 @@ CXX_DEPENDENCY_MAP =
5487
5507
  "src/cxx_supportlib/Algorithms/MovingAverage.h",
5488
5508
  "src/cxx_supportlib/ConfigKit/Common.h",
5489
5509
  "src/cxx_supportlib/ConfigKit/ConfigKit.h",
5510
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
5490
5511
  "src/cxx_supportlib/ConfigKit/Schema.h",
5491
5512
  "src/cxx_supportlib/ConfigKit/Store.h",
5492
5513
  "src/cxx_supportlib/ConfigKit/TableTranslator.h",
@@ -5754,6 +5775,7 @@ CXX_DEPENDENCY_MAP =
5754
5775
  "src/cxx_supportlib/BackgroundEventLoop.h",
5755
5776
  "src/cxx_supportlib/ConfigKit/Common.h",
5756
5777
  "src/cxx_supportlib/ConfigKit/ConfigKit.h",
5778
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
5757
5779
  "src/cxx_supportlib/ConfigKit/Schema.h",
5758
5780
  "src/cxx_supportlib/ConfigKit/Store.h",
5759
5781
  "src/cxx_supportlib/ConfigKit/TableTranslator.h",
@@ -5881,6 +5903,7 @@ CXX_DEPENDENCY_MAP =
5881
5903
  "src/cxx_supportlib/AppTypes.h",
5882
5904
  "src/cxx_supportlib/ConfigKit/Common.h",
5883
5905
  "src/cxx_supportlib/ConfigKit/ConfigKit.h",
5906
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
5884
5907
  "src/cxx_supportlib/ConfigKit/Schema.h",
5885
5908
  "src/cxx_supportlib/ConfigKit/Store.h",
5886
5909
  "src/cxx_supportlib/ConfigKit/TableTranslator.h",
@@ -6014,6 +6037,7 @@ CXX_DEPENDENCY_MAP =
6014
6037
  "src/cxx_supportlib/BackgroundEventLoop.h",
6015
6038
  "src/cxx_supportlib/ConfigKit/Common.h",
6016
6039
  "src/cxx_supportlib/ConfigKit/ConfigKit.h",
6040
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
6017
6041
  "src/cxx_supportlib/ConfigKit/Schema.h",
6018
6042
  "src/cxx_supportlib/ConfigKit/Store.h",
6019
6043
  "src/cxx_supportlib/ConfigKit/TableTranslator.h",
@@ -6364,6 +6388,7 @@ CXX_DEPENDENCY_MAP =
6364
6388
  "src/cxx_supportlib/oxt/macros.hpp"],
6365
6389
  "src/cxx_supportlib/ConfigKit/ConfigKit.h"=>
6366
6390
  ["src/cxx_supportlib/ConfigKit/Common.h",
6391
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
6367
6392
  "src/cxx_supportlib/ConfigKit/Schema.h",
6368
6393
  "src/cxx_supportlib/ConfigKit/Store.h",
6369
6394
  "src/cxx_supportlib/ConfigKit/TableTranslator.h",
@@ -6387,8 +6412,17 @@ CXX_DEPENDENCY_MAP =
6387
6412
  "src/cxx_supportlib/oxt/system_calls.hpp",
6388
6413
  "src/cxx_supportlib/oxt/thread.hpp",
6389
6414
  "src/cxx_supportlib/oxt/tracable_exception.hpp"],
6415
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h"=>
6416
+ ["src/cxx_supportlib/ConfigKit/Common.h",
6417
+ "src/cxx_supportlib/StaticString.h",
6418
+ "src/cxx_supportlib/oxt/macros.hpp"],
6419
+ "src/cxx_supportlib/ConfigKit/PrefixTranslator.h"=>
6420
+ ["src/cxx_supportlib/ConfigKit/Common.h",
6421
+ "src/cxx_supportlib/StaticString.h",
6422
+ "src/cxx_supportlib/oxt/macros.hpp"],
6390
6423
  "src/cxx_supportlib/ConfigKit/Schema.h"=>
6391
6424
  ["src/cxx_supportlib/ConfigKit/Common.h",
6425
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
6392
6426
  "src/cxx_supportlib/ConfigKit/Utils.h",
6393
6427
  "src/cxx_supportlib/DataStructures/HashedStaticString.h",
6394
6428
  "src/cxx_supportlib/DataStructures/StringKeyTable.h",
@@ -6411,6 +6445,7 @@ CXX_DEPENDENCY_MAP =
6411
6445
  "src/cxx_supportlib/oxt/tracable_exception.hpp"],
6412
6446
  "src/cxx_supportlib/ConfigKit/Store.h"=>
6413
6447
  ["src/cxx_supportlib/ConfigKit/Common.h",
6448
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
6414
6449
  "src/cxx_supportlib/ConfigKit/Schema.h",
6415
6450
  "src/cxx_supportlib/ConfigKit/Utils.h",
6416
6451
  "src/cxx_supportlib/DataStructures/HashedStaticString.h",
@@ -6446,6 +6481,7 @@ CXX_DEPENDENCY_MAP =
6446
6481
  "src/cxx_supportlib/oxt/macros.hpp"],
6447
6482
  "src/cxx_supportlib/ConfigKit/VariantMapUtils.h"=>
6448
6483
  ["src/cxx_supportlib/ConfigKit/Common.h",
6484
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
6449
6485
  "src/cxx_supportlib/ConfigKit/Schema.h",
6450
6486
  "src/cxx_supportlib/ConfigKit/Utils.h",
6451
6487
  "src/cxx_supportlib/DataStructures/HashedStaticString.h",
@@ -7142,6 +7178,7 @@ CXX_DEPENDENCY_MAP =
7142
7178
  ["src/cxx_supportlib/Algorithms/MovingAverage.h",
7143
7179
  "src/cxx_supportlib/ConfigKit/Common.h",
7144
7180
  "src/cxx_supportlib/ConfigKit/ConfigKit.h",
7181
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
7145
7182
  "src/cxx_supportlib/ConfigKit/Schema.h",
7146
7183
  "src/cxx_supportlib/ConfigKit/Store.h",
7147
7184
  "src/cxx_supportlib/ConfigKit/TableTranslator.h",
@@ -7210,6 +7247,7 @@ CXX_DEPENDENCY_MAP =
7210
7247
  ["src/cxx_supportlib/Algorithms/MovingAverage.h",
7211
7248
  "src/cxx_supportlib/ConfigKit/Common.h",
7212
7249
  "src/cxx_supportlib/ConfigKit/ConfigKit.h",
7250
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
7213
7251
  "src/cxx_supportlib/ConfigKit/Schema.h",
7214
7252
  "src/cxx_supportlib/ConfigKit/Store.h",
7215
7253
  "src/cxx_supportlib/ConfigKit/TableTranslator.h",
@@ -8078,6 +8116,7 @@ CXX_DEPENDENCY_MAP =
8078
8116
  "test/cxx/ConfigKit/SchemaTest.cpp"=>
8079
8117
  ["src/cxx_supportlib/BackgroundEventLoop.h",
8080
8118
  "src/cxx_supportlib/ConfigKit/Common.h",
8119
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
8081
8120
  "src/cxx_supportlib/ConfigKit/Schema.h",
8082
8121
  "src/cxx_supportlib/ConfigKit/Utils.h",
8083
8122
  "src/cxx_supportlib/Constants.h",
@@ -8114,6 +8153,7 @@ CXX_DEPENDENCY_MAP =
8114
8153
  "test/cxx/ConfigKit/StoreTest.cpp"=>
8115
8154
  ["src/cxx_supportlib/BackgroundEventLoop.h",
8116
8155
  "src/cxx_supportlib/ConfigKit/Common.h",
8156
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
8117
8157
  "src/cxx_supportlib/ConfigKit/Schema.h",
8118
8158
  "src/cxx_supportlib/ConfigKit/Store.h",
8119
8159
  "src/cxx_supportlib/ConfigKit/Utils.h",
@@ -8152,6 +8192,7 @@ CXX_DEPENDENCY_MAP =
8152
8192
  ["src/cxx_supportlib/BackgroundEventLoop.h",
8153
8193
  "src/cxx_supportlib/ConfigKit/Common.h",
8154
8194
  "src/cxx_supportlib/ConfigKit/ConfigKit.h",
8195
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
8155
8196
  "src/cxx_supportlib/ConfigKit/Schema.h",
8156
8197
  "src/cxx_supportlib/ConfigKit/Store.h",
8157
8198
  "src/cxx_supportlib/ConfigKit/TableTranslator.h",
@@ -8190,6 +8231,7 @@ CXX_DEPENDENCY_MAP =
8190
8231
  "test/cxx/ConfigKit/TranslationTest.cpp"=>
8191
8232
  ["src/cxx_supportlib/BackgroundEventLoop.h",
8192
8233
  "src/cxx_supportlib/ConfigKit/Common.h",
8234
+ "src/cxx_supportlib/ConfigKit/PrefixTranslator.h",
8193
8235
  "src/cxx_supportlib/ConfigKit/TableTranslator.h",
8194
8236
  "src/cxx_supportlib/Constants.h",
8195
8237
  "src/cxx_supportlib/DataStructures/HashedStaticString.h",
@@ -8511,6 +8553,7 @@ CXX_DEPENDENCY_MAP =
8511
8553
  "src/cxx_supportlib/BackgroundEventLoop.h",
8512
8554
  "src/cxx_supportlib/ConfigKit/Common.h",
8513
8555
  "src/cxx_supportlib/ConfigKit/ConfigKit.h",
8556
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
8514
8557
  "src/cxx_supportlib/ConfigKit/Schema.h",
8515
8558
  "src/cxx_supportlib/ConfigKit/Store.h",
8516
8559
  "src/cxx_supportlib/ConfigKit/TableTranslator.h",
@@ -8645,6 +8688,7 @@ CXX_DEPENDENCY_MAP =
8645
8688
  "src/cxx_supportlib/BackgroundEventLoop.h",
8646
8689
  "src/cxx_supportlib/ConfigKit/Common.h",
8647
8690
  "src/cxx_supportlib/ConfigKit/ConfigKit.h",
8691
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
8648
8692
  "src/cxx_supportlib/ConfigKit/Schema.h",
8649
8693
  "src/cxx_supportlib/ConfigKit/Store.h",
8650
8694
  "src/cxx_supportlib/ConfigKit/TableTranslator.h",
@@ -8775,6 +8819,7 @@ CXX_DEPENDENCY_MAP =
8775
8819
  "src/cxx_supportlib/BackgroundEventLoop.h",
8776
8820
  "src/cxx_supportlib/ConfigKit/Common.h",
8777
8821
  "src/cxx_supportlib/ConfigKit/ConfigKit.h",
8822
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
8778
8823
  "src/cxx_supportlib/ConfigKit/Schema.h",
8779
8824
  "src/cxx_supportlib/ConfigKit/Store.h",
8780
8825
  "src/cxx_supportlib/ConfigKit/TableTranslator.h",
@@ -9031,6 +9076,7 @@ CXX_DEPENDENCY_MAP =
9031
9076
  "src/cxx_supportlib/BackgroundEventLoop.h",
9032
9077
  "src/cxx_supportlib/ConfigKit/Common.h",
9033
9078
  "src/cxx_supportlib/ConfigKit/ConfigKit.h",
9079
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
9034
9080
  "src/cxx_supportlib/ConfigKit/Schema.h",
9035
9081
  "src/cxx_supportlib/ConfigKit/Store.h",
9036
9082
  "src/cxx_supportlib/ConfigKit/TableTranslator.h",
@@ -9677,6 +9723,7 @@ CXX_DEPENDENCY_MAP =
9677
9723
  "src/cxx_supportlib/BackgroundEventLoop.h",
9678
9724
  "src/cxx_supportlib/ConfigKit/Common.h",
9679
9725
  "src/cxx_supportlib/ConfigKit/ConfigKit.h",
9726
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
9680
9727
  "src/cxx_supportlib/ConfigKit/Schema.h",
9681
9728
  "src/cxx_supportlib/ConfigKit/Store.h",
9682
9729
  "src/cxx_supportlib/ConfigKit/TableTranslator.h",
@@ -9749,6 +9796,7 @@ CXX_DEPENDENCY_MAP =
9749
9796
  "src/cxx_supportlib/BackgroundEventLoop.h",
9750
9797
  "src/cxx_supportlib/ConfigKit/Common.h",
9751
9798
  "src/cxx_supportlib/ConfigKit/ConfigKit.h",
9799
+ "src/cxx_supportlib/ConfigKit/DummyTranslator.h",
9752
9800
  "src/cxx_supportlib/ConfigKit/Schema.h",
9753
9801
  "src/cxx_supportlib/ConfigKit/Store.h",
9754
9802
  "src/cxx_supportlib/ConfigKit/TableTranslator.h",
data/src/agent/Core/Controller.h CHANGED
@@ -382,6 +382,7 @@ public:
382
382
 
383
383
  /****** State inspection and configuration ******/
384
384
 
385
+ unsigned int getThreadNumber() const; // Thread-safe
385
386
  virtual Json::Value inspectStateAsJson() const;
386
387
  virtual Json::Value inspectClientStateAsJson(const Client *client) const;
387
388
  virtual Json::Value inspectRequestStateAsJson(const Request *req) const;
data/src/agent/Core/Controller/StateInspection.cpp CHANGED
@@ -46,6 +46,11 @@ using namespace boost;
46
46
  ****************************/
47
47
 
48
48
 
49
+ unsigned int
50
+ Controller::getThreadNumber() const {
51
+ return mainConfigCache.threadNumber;
52
+ }
53
+
49
54
  Json::Value
50
55
  Controller::inspectStateAsJson() const {
51
56
  Json::Value doc = ParentClass::inspectStateAsJson();
data/src/agent/Core/CoreMain.cpp CHANGED
@@ -936,6 +936,7 @@ shutdownApiServer() {
936
936
  static void
937
937
  serverShutdownFinished() {
938
938
  unsigned int i = workingObjects->shutdownCounter.fetch_sub(1, boost::memory_order_release);
939
+ P_DEBUG("Shutdown counter = " << (i - 1));
939
940
  if (i == 1) {
940
941
  boost::atomic_thread_fence(boost::memory_order_acquire);
941
942
  workingObjects->allClientsDisconnectedEvent.notify();
@@ -944,11 +945,13 @@ serverShutdownFinished() {
944
945
 
945
946
  static void
946
947
  controllerShutdownFinished(Core::Controller *controller) {
948
+ P_DEBUG("Controller " << controller->getThreadNumber() << " shutdown finished");
947
949
  serverShutdownFinished();
948
950
  }
949
951
 
950
952
  static void
951
953
  apiServerShutdownFinished(Core::ApiServer::ApiServer *server) {
954
+ P_DEBUG("API server shutdown finished");
952
955
  serverShutdownFinished();
953
956
  }
954
957
 
data/src/agent/Core/SecurityUpdateChecker.h CHANGED
@@ -1,14 +1,30 @@
1
1
  /*
2
2
  * Phusion Passenger - https://www.phusionpassenger.com/
3
- * Copyright (c) 2011-2017 Phusion Holding B.V.
3
+ * Copyright (c) 2017 Phusion Holding B.V.
4
4
  *
5
5
  * "Passenger", "Phusion Passenger" and "Union Station" are registered
6
6
  * trademarks of Phusion Holding B.V.
7
7
  *
8
- * See LICENSE file for license information.
8
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
9
+ * of this software and associated documentation files (the "Software"), to deal
10
+ * in the Software without restriction, including without limitation the rights
11
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12
+ * copies of the Software, and to permit persons to whom the Software is
13
+ * furnished to do so, subject to the following conditions:
14
+ *
15
+ * The above copyright notice and this permission notice shall be included in
16
+ * all copies or substantial portions of the Software.
17
+ *
18
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24
+ * THE SOFTWARE.
9
25
  */
10
- #ifndef _PASSENGER_UPDATE_CHECKER_H_
11
- #define _PASSENGER_UPDATE_CHECKER_H_
26
+ #ifndef _PASSENGER_SECURITY_UPDATE_CHECKER_H_
27
+ #define _PASSENGER_SECURITY_UPDATE_CHECKER_H_
12
28
 
13
29
  #include <string>
14
30
  #include <oxt/thread.hpp>
@@ -19,8 +35,8 @@
19
35
  #include <modp_b64.h>
20
36
 
21
37
  #if BOOST_OS_MACOS
22
- #include <sys/syslimits.h>
23
- #include <unistd.h>
38
+ #include <sys/syslimits.h>
39
+ #include <unistd.h>
24
40
  #endif
25
41
 
26
42
  namespace Passenger {
@@ -28,11 +44,12 @@ namespace Passenger {
28
44
  using namespace std;
29
45
  using namespace oxt;
30
46
 
47
+
31
48
  #define CHECK_HOST_DEFAULT "securitycheck.phusionpassenger.com"
32
49
 
33
50
  #define CHECK_URL_DEFAULT "https://" CHECK_HOST_DEFAULT ":443/v1/check.json"
34
- #define MIN_CHECK_BACKOFF_SEC 12 * 60 * 60
35
- #define MAX_CHECK_BACKOFF_SEC 7 * 24 * 60 * 60
51
+ #define MIN_CHECK_BACKOFF_SEC (12 * 60 * 60)
52
+ #define MAX_CHECK_BACKOFF_SEC (7 * 24 * 60 * 60)
36
53
 
37
54
  // Password for the .p12 client certificate (because .p12 is required to be pwd protected on some
38
55
  // implementations). We're OK with hardcoding because the certs are not secret anyway, and they're not used
@@ -41,6 +58,7 @@ using namespace oxt;
41
58
  #define CLIENT_CERT_LABEL "Phusion Passenger Open Source"
42
59
 
43
60
  #define POSSIBLE_MITM_RESOLUTION "(if this error persists check your connection security or try upgrading " SHORT_PROGRAM_NAME ")"
61
+
44
62
  /**
45
63
  * If started, this class periodically (default: daily, immediate start) checks whether there are any important
46
64
  * security updates available (updates that don't fix security issues are not reported). The result is logged
@@ -64,7 +82,7 @@ private:
64
82
  TRACE_POINT();
65
83
  // Sleep for a short while to allow interruption during the Apache integration double startup procedure, this prevents running the update check twice
66
84
  boost::this_thread::sleep_for(boost::chrono::seconds(2));
67
- while (!this_thread::interruption_requested()) {
85
+ while (!boost::this_thread::interruption_requested()) {
68
86
  UPDATE_TRACE_POINT();
69
87
  int backoffMin = 0;
70
88
  try {
@@ -573,6 +591,7 @@ public:
573
591
  }
574
592
 
575
593
  };
576
- }
577
594
 
578
- #endif /* _PASSENGER_UPDATE_CHECKER_H_ */
595
+ } // namespace Passenger
596
+
597
+ #endif /* _PASSENGER_SECURITY_UPDATE_CHECKER_H_ */