From 03203283c43c314c04caca90b32fa2a8ef3cd83e Mon Sep 17 00:00:00 2001 From: Tim Wagner Date: Tue, 5 May 2015 13:43:33 +0200 Subject: [PATCH 1/3] Update CHANGELOG.md and switch to 1.0.5 --- CHANGELOG.md | 10 ++++++++++ build.default.properties | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad6113e11..d8f414ff9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +# Version 1.0.5 + +## Bugfixes + +* Fixed [#784](https://github.com/appserver-io/appserver/issues/784) - Application Deployment after switching to safe user + +## Features + +* None + # Version 1.0.4 ## Bugfixes diff --git a/build.default.properties b/build.default.properties index 061efce2f..e0c174cae 100644 --- a/build.default.properties +++ b/build.default.properties @@ -8,7 +8,7 @@ #-------------------------------------------------------------------------------- # ---- Module Release Settings -------------------------------------------------- -release.version = 1.0.4 +release.version = 1.0.5 release.name = Iron Horse # ---- PHPCPD Settings ---------------------------------------------------------- From 866f87a162c1324c2cfd0203f520ae8c441773e2 Mon Sep 17 00:00:00 2001 From: Tim Wagner Date: Wed, 6 May 2015 14:24:28 +0200 Subject: [PATCH 2/3] Switch from Stackable to array to avoid Windows segfaults --- src/AppserverIo/Appserver/MessageQueue/MessageQueue.php | 5 ++++- src/AppserverIo/Appserver/MessageQueue/QueueWorker.php | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/AppserverIo/Appserver/MessageQueue/MessageQueue.php b/src/AppserverIo/Appserver/MessageQueue/MessageQueue.php index d03f5b078..3371670d3 100755 --- a/src/AppserverIo/Appserver/MessageQueue/MessageQueue.php +++ b/src/AppserverIo/Appserver/MessageQueue/MessageQueue.php @@ -263,8 +263,11 @@ public function run() // create a separate queue for each priority foreach (PriorityKeys::getAll() as $priorityKey) { + // ATTENTION: We use an array for the jobs (threads) that are executing acutually. + // Using stackables leads to random segfaults on Windows! + $jobsExecuting[$counter] = array(); + // create the containers for the worker - $jobsExecuting[$counter] = new GenericStackable(); $jobsToExceute[$counter] = new GenericStackable(); $messageStates[$counter] = new GenericStackable(); diff --git a/src/AppserverIo/Appserver/MessageQueue/QueueWorker.php b/src/AppserverIo/Appserver/MessageQueue/QueueWorker.php index 60e2f93f0..b3a035b8a 100644 --- a/src/AppserverIo/Appserver/MessageQueue/QueueWorker.php +++ b/src/AppserverIo/Appserver/MessageQueue/QueueWorker.php @@ -127,11 +127,11 @@ public function injectMessageStates(GenericStackable $messageStates) /** * Inject the storage for the executing jobs. * - * @param \AppserverIo\Storage\GenericStackable $jobsExecuting The storage for the executing jobs + * @param array $jobsExecuting The storage for the executing jobs * * @return void */ - public function injectJobsExecuting(GenericStackable $jobsExecuting) + public function injectJobsExecuting(array $jobsExecuting) { $this->jobsExecuting = $jobsExecuting; } From 58d28763d6bc3a02ae4f2da7608c7bc250f9eb6c Mon Sep 17 00:00:00 2001 From: Tim Wagner Date: Wed, 6 May 2015 14:27:27 +0200 Subject: [PATCH 3/3] Extend CHANGELOG.md with switch to PHP 5.5.24 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d8f414ff9..79302c813 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ ## Features -* None +* Closed [#758](https://github.com/appserver-io/appserver/issues/758) - Update to latest PHP 5.5.24 # Version 1.0.4