Merge branch 'stable-6.0' into feature/app_generations

phusion · Nov 13, 2024 · aee6fbf · aee6fbf
2 parents 170c628 + 181f0cf
commit aee6fbf
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 8 deletions.
diff --git a/.github/workflows/binaries.yml b/.github/workflows/binaries.yml
@@ -6,7 +6,6 @@ env:
 
 on:
   push: {}
-  pull_request: {}
 
 jobs:
   build_linux:
@@ -55,7 +54,7 @@ jobs:
       - uses: actions/upload-artifact@v4
         with:
           name: binaries-linux-${{ matrix.arch }}
-          path: packages/binaries/linux/output/**/*
+          path: packaging/binaries/linux/output/**/*
 
       - name: Update cache
         run: ./dev/ci/update-cache-az-blob-storage

diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml
@@ -6,7 +6,6 @@ env:
 
 on:
   push: {}
-  pull_request: {}
 
 jobs:
   define-matrix:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -9,7 +9,6 @@ env:
 
 on:
   push: {}
-  pull_request: {}
 
 jobs:
   cxx-linux:

diff --git a/.github/workflows/rpm.yml b/.github/workflows/rpm.yml
@@ -6,7 +6,6 @@ env:
 
 on:
   push: {}
-  pull_request: {}
 
 jobs:
   define-matrix:

diff --git a/packaging/rpm b/packaging/rpm
diff --git a/src/agent/Core/ApplicationPool/Process.h b/src/agent/Core/ApplicationPool/Process.h
@@ -344,8 +344,13 @@ class Process {
 
 	void destroySelf() const {
 		Context *context = getContext();
+		Process *storagePointer = const_cast<Process *>(this);
+		this->~Process();
+
 		LockGuard l(context->memoryManagementSyncher);
-		context->processObjectPool.destroy(const_cast<Process *>(this));
+		// Use `storagePointer` because using `this` after calling the destructor
+		// is undefined behavior.
+		context->processObjectPool.free(storagePointer);
 	}
 
 

diff --git a/src/agent/Core/ApplicationPool/Session.h b/src/agent/Core/ApplicationPool/Session.h
@@ -109,9 +109,14 @@ class Session: public AbstractSession {
 	}
 
 	void destroySelf() const {
+		Context *context = this->context;
+		Session *storagePointer = const_cast<Session *>(this);
 		this->~Session();
+
 		LockGuard l(context->memoryManagementSyncher);
-		context->sessionObjectPool.free(const_cast<Session *>(this));
+		// Use `storagePointer` because using `this` after calling the destructor
+		// is undefined behavior.
+		context->sessionObjectPool.free(storagePointer);
 	}
 
 public:
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,6 @@ env: @@
     on:
       push: {}
-      pull_request: {}
     jobs:
       define-matrix:
@@ Expand Down @@
+1 −1		docker-images/buildbox/Dockerfile
+1 −1		docker-images/testbox-rocky-8/Dockerfile
+6 −6		docker-images/testbox-rocky-8/install.sh
+1 −1		docker-images/testbox-rocky-9/Dockerfile
+2 −2		docker-images/testbox-rocky-9/install.sh
+2 −2		internal/lib/distro_info.sh
+1 −1		internal/lib/docker_image_info.sh
+1 −0		internal/test/test.sh