Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

BUMP 1.0.7

  • Loading branch information...
commit b5120583b347a7c1d38bd4a77f80e74fecc16efd 1 parent e579f3b
Kristina Chodorow authored
Showing with 37 additions and 11 deletions.
  1. +5 −0 db.c
  2. +28 −7 package.xml
  3. +1 −1  php_mongo.h
  4. +3 −3 tests/MongoDBTest.php
View
5 db.c
@@ -155,6 +155,11 @@ PHP_METHOD(MongoDB, setProfilingLevel) {
zval_ptr_dtor(&data);
+ if (EG(exception)) {
+ zval_ptr_dtor(&cmd_return);
+ return;
+ }
+
if (zend_hash_find(HASH_P(cmd_return), "ok", 3, (void**)&ok) == SUCCESS &&
Z_DVAL_PP(ok) == 1) {
zend_hash_find(HASH_P(cmd_return), "was", 4, (void**)&ok);
View
35 package.xml
@@ -13,11 +13,11 @@
<email>kristina@10gen.com</email>
<active>yes</active>
</lead>
- <date>2010-03-24</date>
+ <date>2010-04-28</date>
<time>12:00:00</time>
<version>
- <release>1.0.6</release>
- <api>1.0.6</api>
+ <release>1.0.7</release>
+ <api>1.0.7</api>
</version>
<stability>
<release>stable</release>
@@ -25,10 +25,12 @@
</stability>
<license uri="http://www.apache.org/licenses/LICENSE-2.0">Apache License</license>
<notes>
- Allow MongoCollection::ensureIndex to create 2D indexes.
- Added MongoCursor::fields().
- Fixed for big endian machines.
- Removed debug statements.
+ The bug fix release! A zillion bugfixes and the new static
+ MongoCursor::$timeout property for setting a default timeout for requests.
+ Bug fixes include count error handling, fixing double frees with BSON errors
+ and ensureIndex, a mutex fix for FreeBSD, catching socket connection errors
+ (William Volkman), database commands propagate exceptions, and cursor killing
+ is more efficient.
</notes>
<contents>
<dir baseinstalldir="/" name="/">
@@ -70,6 +72,25 @@
<api>stable</api>
</stability>
<version>
+ <release>1.0.7</release>
+ <api>1.0.7</api>
+ </version>
+ <date>2010-04-28</date>
+ <notes>
+ The bug fix release! A zillion bugfixes and the new static
+ MongoCursor::$timeout property for setting a default timeout for requests.
+ Bug fixes include count error handling, fixing double frees with BSON errors
+ and ensureIndex, a mutex fix for FreeBSD, catching socket connection errors
+ (William Volkman), database commands propagate exceptions, and cursor killing
+ is more efficient.
+ </notes>
+ </release>
+ <release>
+ <stability>
+ <release>stable</release>
+ <api>stable</api>
+ </stability>
+ <version>
<release>1.0.6</release>
<api>1.0.6</api>
</version>
View
2  php_mongo.h
@@ -18,7 +18,7 @@
#ifndef PHP_MONGO_H
#define PHP_MONGO_H 1
-#define PHP_MONGO_VERSION "1.0.6+"
+#define PHP_MONGO_VERSION "1.0.7"
#define PHP_MONGO_EXTNAME "mongo"
// resource names
View
6 tests/MongoDBTest.php
@@ -234,13 +234,13 @@ public function testGetDBRef() {
public function testExecute() {
$ret = $this->object->execute('4+3*6');
- $this->assertEquals($ret['retval'], 22);
+ $this->assertEquals($ret['retval'], 22, json_encode($ret));
$ret = $this->object->execute(new MongoCode('function() { return x+y; }', array('x' => 'hi', 'y' => 'bye')));
- $this->assertEquals($ret['retval'], 'hibye');
+ $this->assertEquals($ret['retval'], 'hibye', json_encode($ret));
$ret = $this->object->execute(new MongoCode('function(x) { return x+y; }', array('y' => 'bye')), array('bye'));
- $this->assertEquals($ret['retval'], 'byebye');
+ $this->assertEquals($ret['retval'], 'byebye', json_encode($ret));
}
public function testDBCommand() {
Please sign in to comment.
Something went wrong with that request. Please try again.