Merge branch 'stable-6.0' into feature/app_generations

.clangd

@@ -1,2 +1,2 @@
 CompileFlags:
-  Add: -ferror-limit=0
+  Add: -DINTELLISENSE -ferror-limit=0

.github/workflows/binaries.yml

@@ -4,25 +4,21 @@ env:
   ENTERPRISE: 0
 
 on:
-  push:
-    branches:
-      - 'stable-*'
-      - 'feature/*'
-  pull_request:
-    branches:
-      - 'stable-*'
-      - 'feature/*'
+  push: {}
+  pull_request: {}
 
 jobs:
   build_linux:
     name: "Binary automation Linux-${{ matrix.arch }}"
     strategy:
       fail-fast: false
       matrix:
-        arch:
-          - x86_64
-          - aarch64
-    runs-on: ubuntu-latest
+        include:
+          - arch: x86_64
+            runner: ubuntu-24.04
+          - arch: aarch64
+            runner: passenger-ubuntu-24.04-arm64-2cpu
+    runs-on: ${{ matrix.runner }}
     env:
       WORKSPACE: ${{ github.workspace }}
       OUTPUT_DIR: ${{ github.workspace }}/output-linux-${{ matrix.arch }}
@@ -33,7 +29,6 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: true
-    - uses: docker/setup-qemu-action@v3
     - uses: docker/setup-buildx-action@v3
     - run: ./dev/ci/tests/binaries/build-linux
     - uses: actions/upload-artifact@v4

.github/workflows/main.yml

@@ -5,14 +5,8 @@ env:
   COMPILE_CONCURRENCY: 4
 
 on:
-  push:
-    branches:
-      - 'stable-*'
-      - 'feature/*'
-  pull_request:
-    branches:
-      - 'stable-*'
-      - 'feature/*'
+  push: {}
+  pull_request: {}
 
 jobs:
   cxx:

.gitignore

@@ -8,6 +8,7 @@ autom4te.cache
 *.pyc
 *.dSYM
 *.gch
+*.pch
 *.swp
 *~.nib
 *.pbxuser

.vscode/c_cpp_properties.json

@@ -7,7 +7,6 @@
                 "${workspaceFolder}/src/agent",
                 "${workspaceFolder}/src/cxx_supportlib",
                 "${workspaceFolder}/src/cxx_supportlib/vendor-copy",
-                "${workspaceFolder}/src/cxx_supportlib/vendor-copy/websocketpp",
                 "${workspaceFolder}/src/cxx_supportlib/vendor-copy/libuv/include",
                 "${workspaceFolder}/src/cxx_supportlib/vendor-modified",
                 "${workspaceFolder}/src/cxx_supportlib/vendor-modified/libev",
@@ -31,10 +30,8 @@
                 "/System/Library/Frameworks",
                 "/Library/Frameworks"
             ],
-            "compilerPath": "/usr/bin/clang",
             "cStandard": "c11",
-            "cppStandard": "c++17",
-            "intelliSenseMode": "clang-x64"
+            "cppStandard": "c++17"
         }
     ],
     "version": 4

.vscode/settings.json

@@ -44,8 +44,59 @@
         "string_view": "cpp",
         "unordered_map": "cpp",
         "valarray": "cpp",
-        "vector": "cpp"
+        "vector": "cpp",
+        "__node_handle": "cpp",
+        "__threading_support": "cpp",
+        "__verbose_abort": "cpp",
+        "any": "cpp",
+        "bitset": "cpp",
+        "cctype": "cpp",
+        "charconv": "cpp",
+        "cinttypes": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "codecvt": "cpp",
+        "condition_variable": "cpp",
+        "csignal": "cpp",
+        "cstdarg": "cpp",
+        "cstddef": "cpp",
+        "cstdint": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "cwctype": "cpp",
+        "execution": "cpp",
+        "forward_list": "cpp",
+        "fstream": "cpp",
+        "future": "cpp",
+        "iomanip": "cpp",
+        "ios": "cpp",
+        "iosfwd": "cpp",
+        "iostream": "cpp",
+        "istream": "cpp",
+        "limits": "cpp",
+        "mutex": "cpp",
+        "new": "cpp",
+        "optional": "cpp",
+        "ostream": "cpp",
+        "print": "cpp",
+        "queue": "cpp",
+        "ratio": "cpp",
+        "shared_mutex": "cpp",
+        "source_location": "cpp",
+        "span": "cpp",
+        "sstream": "cpp",
+        "stack": "cpp",
+        "stdexcept": "cpp",
+        "streambuf": "cpp",
+        "strstream": "cpp",
+        "unordered_set": "cpp",
+        "variant": "cpp",
+        "algorithm": "cpp"
     },
-    "C_Cpp.intelliSenseEngine": "Default",
-    "C_Cpp.intelliSenseEngineFallback": "Enabled"
+    "C_Cpp.intelliSenseEngineFallback": "enabled",
+    "C_Cpp.default.cStandard": "c11",
+    "C_Cpp.default.cppStandard": "c++14"
 }

CHANGELOG

@@ -2,6 +2,18 @@ Release 6.0.24 (Not yet released)
 -------------
  * Update the order Passenger routes requests to app processes. Processes are now chosen based on being in the latest generation (Enterprise), then by newest process, then by oldest, then by
 busyness. Closes GH-2551.
+ * [Ruby] Specify rackup version to avoid broken 1.0 gem. Closes GH-2559.
+ * Upgrades Boost from 1.85 -> 1.86.
+ * Updated various library versions used in precompiled binaries (used for e.g. gem installs):
+   - ccache 4.10.1 -> 4.10.2
+   - cmake 3.30.1 -> 3.30.4
+   - curl 8.8.0 -> 8.10.1
+   - git 2.45.2 -> 2.46.2
+   - openssl 3.3.1 -> 3.3.2
+   - rubygems 3.5.16 -> 3.5.20
+   - rubies:
+     - 3.2.4 -> 3.2.5
+     - 3.3.4 -> 3.3.5
 
 
 Release 6.0.23

build/cxx_tests.rb

@@ -158,7 +158,15 @@
 end
 
 let(:test_cxx_flags) do
-  ['-include test/cxx/TestSupport.h'] + basic_test_cxx_flags
+  # Some flags are necessary to make precompiled headers play well with ccache (and possibly also sccache):
+  # https://ccache.dev/manual/4.8.2.html#_precompiled_headers
+  if PlatformInfo.cxx_is_gcc?
+    ['-include test/cxx/TestSupport.h', '-fpch-preprocess']
+  elsif PlatformInfo.cxx_is_clang?
+    ["-include-pch test/cxx/TestSupport.h.#{PlatformInfo.precompiled_header_extension}", '-Xclang', '-fno-pch-timestamp']
+  else
+    ['-include test/cxx/TestSupport.h']
+  end + basic_test_cxx_flags
 end
 
 let(:test_cxx_ldflags) do
@@ -182,7 +190,7 @@
     lambda { {
       :include_paths => test_cxx_include_paths,
       :flags => test_cxx_flags,
-      :deps => 'test/cxx/TestSupport.h.gch'
+      :deps => "test/cxx/TestSupport.h.#{PlatformInfo.precompiled_header_extension}"
     } }
   )
 end
@@ -280,14 +288,15 @@
   end
 end
 
-file('test/cxx/TestSupport.h.gch' => generate_compilation_task_dependencies('test/cxx/TestSupport.h')) do
+file("test/cxx/TestSupport.h.#{PlatformInfo.precompiled_header_extension}" => generate_compilation_task_dependencies('test/cxx/TestSupport.h')) do
   compile_cxx(
-    'test/cxx/TestSupport.h.gch',
+    "test/cxx/TestSupport.h.#{PlatformInfo.precompiled_header_extension}",
     'test/cxx/TestSupport.h',
     :include_paths => test_cxx_include_paths,
     :flags => [
       "-x c++-header",
+      PlatformInfo.cxx_is_clang? ? "-Xclang -emit-pch" : nil,
       basic_test_cxx_flags
-    ].flatten
+    ].compact.flatten
   )
 end