Skip to content
Browse files

Merge branch 'release/1.1.1'

  • Loading branch information...
2 parents 811044d + d0a17ac commit d0c2d91e462562f526721508c4f91ed0c47115ca @everzet everzet committed
Showing with 7 additions and 1 deletion.
  1. +6 −0 CHANGES.md
  2. +1 −1 src/Behat/Mink/Driver/Zombie/Server.php
View
6 CHANGES.md
@@ -1,3 +1,9 @@
+1.1.1 / 2011-08-12
+==================
+
+ * Fixed Zombie.js server termination on Linux
+ * Fixed base_url usage for external URLs
+
1.1.0 / 2011-08-08
==================
View
2 src/Behat/Mink/Driver/Zombie/Server.php
@@ -169,7 +169,7 @@ private function spawnZombieServer()
// run server
$this->process = proc_open(
- sprintf('%s %s', $this->nodeBin, $serverPath), $descriptors, $pipes, null, null, $options
+ sprintf('exec %s %s', $this->nodeBin, $serverPath), $descriptors, $pipes, null, null, $options
);
if (!is_resource($this->process)) {

0 comments on commit d0c2d91

Please sign in to comment.
Something went wrong with that request. Please try again.