Page MenuHomePhabricator (Chris)
Files F118492

No OneTemporary
Actions

Authored By
Unknown
Size
686 KB
Referenced Files
None
Subscribers
None

View Options

This file is larger than 256 KB, so syntax highlighting was skipped.
diff --git a/mongodb-1.1.1/RELEASE-1.0.1-dev b/mongodb-1.1.1/RELEASE-1.0.1-dev
deleted file mode 100644
index 4e3b5e43..00000000
--- a/mongodb-1.1.1/RELEASE-1.0.1-dev
+++ /dev/null
@@ -1,33 +0,0 @@
-RELEASE 1.0.1-dev
--------------
-2015-12-03 Jeremy Mikola <jmikola@gmail.com>
- * Add "-dev" to extension version constant
-
-2015-11-06 Jeremy Mikola <jmikola@gmail.com>
- * PHPC-487: Regression tests for check_closed stream handler
-
-2015-11-06 Hannes Magnusson <bjori@php.net>
- * PHPC-487: Reverse logic in check_closed stream handler
-
-2015-11-25 Hannes Magnusson <bjori@php.net>
- * Its a bit creepy seeing my family in bug reports
-
-2015-11-25 Derick Rethans <github@derickrethans.nl>
- * PHPC-499: Only add the dependency when we're actually enabling the extension
-
-2015-11-12 Derick Rethans <github@derickrethans.nl>
- * Wording tweaks after review
-
-2015-11-12 Derick Rethans <github@derickrethans.nl>
- * HHVM-136: Make hippo and phongo README/CONTRIBUTING files consistent
-
-2015-11-02 Jeremy Mikola <jmikola@gmail.com>
- * Update documentation for 1.0.0
-
-2015-10-30 Jeremy Mikola <jmikola@gmail.com>
- * Back to -dev
-
-2015-10-30 Jeremy Mikola <jmikola@gmail.com>
- * Add 1.0.0 release notes
-
-
diff --git a/mongodb-1.1.1/RELEASE-1.1 b/mongodb-1.1.1/RELEASE-1.1
deleted file mode 100644
index 276a416a..00000000
--- a/mongodb-1.1.1/RELEASE-1.1
+++ /dev/null
@@ -1,120 +0,0 @@
-RELEASE 1.1.0
--------------
-2015-12-15 Jeremy Mikola <jmikola@gmail.com>
- * Initial release notes for 1.1 series
-
-2015-12-15 Jeremy Mikola <jmikola@gmail.com>
- * Bump extension version to 1.1.0
-
-2015-12-14 Jeremy Mikola <jmikola@gmail.com>
- * PHPC-509: Default Manager URI to "mongodb://localhost:27017/"
-
-2015-12-14 Jeremy Mikola <jmikola@gmail.com>
- * PHPC-448: Fix arginfo for ReadConcern constructor
-
-2015-12-12 Jorgen Evens <jorgen@evens.eu>
- * PHPC-514: Fix --with-mongodb-sasl flag
-
-2015-12-14 Hannes Magnusson <bjori@php.net>
- * PHPC-512: Disable async stream connections
-
-2015-12-14 Jeremy Mikola <jmikola@gmail.com>
- * PHPC-508: Construct valid stream URI for IPv6 literals
-
-2015-12-10 Jeremy Mikola <jmikola@gmail.com>
- * PHPC-448: Manager::getReadConcern() and URI test
-
-2015-12-10 Jeremy Mikola <jmikola@gmail.com>
- * PHPC-448: Support readConcern option on Query
-
-2015-12-10 Jeremy Mikola <jmikola@gmail.com>
- * PHPC-448: Implement ReadConcern class
-
-2015-12-10 Jeremy Mikola <jmikola@gmail.com>
- * Fix include for mongoc-write-concern-private.h
-
-2015-12-11 Hannes Magnusson <bjori@php.net>
- * Fix package license to be consistent with the source files
-
-2015-12-11 Hannes Magnusson <bjori@php.net>
- * Accept MongoDB 3.2 package repo public keys on test VM
-
-2015-12-05 Jeremy Mikola <jmikola@gmail.com>
- * PHPC-443: Support "bypassDocumentValidation" option in BulkWrite
-
-2015-12-10 Jeremy Mikola <jmikola@gmail.com>
- * Update package repo public key for Travis CI builds
-
-2015-12-10 Jeremy Mikola <jmikola@gmail.com>
- * Define STANDALONE as MongoDB 3.2 on Travis CI
-
-2015-12-09 Jeremy Mikola <jmikola@gmail.com>
- * Bump libmongoc for CDRIVER-1046 memory leak fix
-
-2015-12-09 Jeremy Mikola <jmikola@gmail.com>
- * PHPC-450: failReceivedGetmore does not support getMore commands
-
-2015-12-09 Jeremy Mikola <jmikola@gmail.com>
- * PHPC-450: Don't assert exact isMaster response when dumping Servers
-
-2015-12-09 Jeremy Mikola <jmikola@gmail.com>
- * PHPC-450: Split query tests for OP_QUERY and find command
-
-2015-12-09 Jeremy Mikola <jmikola@gmail.com>
- * Add MongoDB 3.0 replica set test environment
-
-2015-12-09 Jeremy Mikola <jmikola@gmail.com>
- * PHPC-450: Profiled aggregate commands log the collection NS in 3.2
-
-2015-12-08 Jeremy Mikola <jmikola@gmail.com>
- * PHPC-450: Update open cursor check for MongoDB 3.2
-
-2015-12-10 Derick Rethans <github@derickrethans.nl>
- * Use more descriptive unused value
-
-2015-12-07 Hannes Magnusson <bjori@php.net>
- * Fixed PHPC-502: bson_init_static(): precondition failed: data
-
-2015-12-09 Jeremy Mikola <jmikola@gmail.com>
- * Use consistent name for MongoDB 3.0 test server
-
-2015-12-08 Jeremy Mikola <jmikola@gmail.com>
- * PHPC-450: Enable majority read concern by default in MO
-
-2015-12-08 Jeremy Mikola <jmikola@gmail.com>
- * PHPC-450: Use MongoDB 3.2 final for testing
-
-2015-12-08 Jeremy Mikola <jmikola@gmail.com>
- * Make server startup via MO more robust
-
-2015-12-08 Jeremy Mikola <jmikola@gmail.com>
- * Register STANDALONE-3.0 with the test suite
-
-2015-12-08 Jeremy Mikola <jmikola@gmail.com>
- * STANDALONE-3.0 port conflicted with STANDALONE-2.4
-
-2015-12-08 Derick Rethans <github@derickrethans.nl>
- * Bump libmongoc and libbson to 1.3.0 releases
-
-2015-12-02 Derick Rethans <github@derickrethans.nl>
- * This code has changed in 3.2, and make the error message clear
-
-2015-12-02 Derick Rethans <github@derickrethans.nl>
- * Added 3.2.0rc5 to our Mongo Orchestration suite
-
-2015-12-02 Derick Rethans <github@derickrethans.nl>
- * Added some more phpt test leftovers to .gitignore
-
-2015-12-08 Remi Collet <fedora@famillecollet.com>
- * libmongoc 1.3 is not compatible
-
-2015-12-07 Jeremy Mikola <jmikola@gmail.com>
- * Revise prep-release.php handling
-
-2015-12-07 Jeremy Mikola <jmikola@gmail.com>
- * Back to -dev
-
-2015-12-07 Jeremy Mikola <jmikola@gmail.com>
- * Add 1.0.1 release notes
-
-
diff --git a/mongodb-1.1.1/ChangeLog b/mongodb-1.1.2/ChangeLog
similarity index 98%
rename from mongodb-1.1.1/ChangeLog
rename to mongodb-1.1.2/ChangeLog
index cc55981b..93bbf140 100644
--- a/mongodb-1.1.1/ChangeLog
+++ b/mongodb-1.1.2/ChangeLog
@@ -1,4139 +1,4199 @@
+2016-01-07 Jeremy Mikola <jmikola@gmail.com>
+ * Bump extension version to 1.1.2
+
+2016-01-07 Jeremy Mikola <jmikola@gmail.com>
+ * Merge pull request #196
+
+2016-01-06 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-496: Revert "Temporary workaround for warning in mongoc"
+
+2016-01-07 Jeremy Mikola <jmikola@gmail.com>
+ * Merge pull request #197
+
+2016-01-06 Jeremy Mikola <jmikola@gmail.com>
+ * Improve other config.m4 check messages
+
+2015-12-31 Lior Kaplan <kaplanlior@gmail.com>
+ * PHPC-534: Enable configure without SASL and support --with-mongodb-sasl=no
+
+2015-12-31 Lior Kaplan <kaplanlior@gmail.com>
+ * Improve SASL check message
+
+2015-12-31 Lior Kaplan <kaplanlior@gmail.com>
+ * Don't print pcre-dir usage during configure check
+
+2016-01-06 Jeremy Mikola <jmikola@gmail.com>
+ * Merge pull request #194
+
+2016-01-01 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-529: Prefix BSON functions to avoid symbol conflicts
+
+2016-01-05 Jeremy Mikola <jmikola@gmail.com>
+ * Merge pull request #192
+
+2015-12-30 Jeremy Mikola <jmikola@gmail.com>
+ * phongo_bson_append() can be static and get zval type internally
+
+2015-12-30 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-528: Support zval references when appending BSON
+
+2015-12-30 Jeremy Mikola <jmikola@gmail.com>
+ * Merge pull request #191
+
+2015-12-30 Remi Collet <fedora@famillecollet.com>
+ * PHPC-527: fix call to add_index_stringl
+
+2015-12-30 Jeremy Mikola <jmikola@gmail.com>
+ * Merge pull request #185
+
+2015-12-26 Remi Collet <fedora@famillecollet.com>
+ * PHPC-527: Fix PHP 7 / 32bits build
+
+2015-12-22 Jeremy Mikola <jmikola@gmail.com>
+ * Back to -dev
+
+2015-12-22 Jeremy Mikola <jmikola@gmail.com>
+ * Add 1.1.1 release notes
+
+2015-12-22 Jeremy Mikola <jmikola@gmail.com>
+ * Encode special characters in commit messages for package.xml
+
2015-12-22 Jeremy Mikola <jmikola@gmail.com>
* Bump extension version to 1.1.1
2015-12-22 Jeremy Mikola <jmikola@gmail.com>
* PHPC-285: Allow for PHP 7.x support in package.xml
2015-12-22 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #172
2015-12-16 Jeremy Mikola <jmikola@gmail.com>
* Fix protos for ReadPreference and WriteConcern
2015-12-22 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #180
2015-12-22 Kanin Peanviriyakulkit <dogrocker@users.noreply.github.com>
* Remove "beta" in doc.
2015-12-22 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #179
2015-12-21 Jeremy Mikola <jmikola@gmail.com>
* PHPC-285: VC14 needs timezone defined for SSL function
2015-12-21 Jeremy Mikola <jmikola@gmail.com>
* PHPC-285: Fix syntax for empty struct initializer
2015-12-18 Derick Rethans <github@derickrethans.nl>
* Merged pull request #175
2015-12-18 Derick Rethans <github@derickrethans.nl>
* Fixed test case, where PHP 5 and PHP 7 call the type differently
2015-12-18 Derick Rethans <github@derickrethans.nl>
* Fixed 'dump on uninitialised value' with BSON deserialisation
2015-12-16 Derick Rethans <github@derickrethans.nl>
* Fixed issues with PHP 7 and the new ReadConcern
2015-12-18 Derick Rethans <github@derickrethans.nl>
* Fixed CS from Joe's patch
2015-12-14 Joe Watkins <krakjoe@php.net>
* fix leaks and logical errors for PHP 7
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-400: Compare WriteConcern journal arg with IS_TRUE
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-405: Additional zval* to zval changes
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-397: Additional RETURN_STRING updates
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-393: Don't BSON-encode non-public properties in PHP 7
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-390: Fix OnUpdateString calls within OnUpdateDebug
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-373: Additional MAKE_STD_ZVAL() cleanup
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-374: zend_string updates for OnUpdateDebug
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-404: Additional hash API changes
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-370: Additionally return_value_ptr and return_value_used suppressions
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-369: Additional Z_<CLASSNAME>_OBJ_P() macros
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-399: Additional zval_used_for_init cleanup
2015-09-24 Hannes Magnusson <bjori@php.net>
* PHPC-431: Add the testcase from the report
2015-09-24 Hannes Magnusson <bjori@php.net>
* PHPC-431: Segfault when using Manager through singleton class
2015-09-02 Hannes Magnusson <bjori@php.net>
* Use ZVAL_COPY_VALUE()
2015-09-01 Hannes Magnusson <bjori@php.net>
* Enable PHP7 on Travis
2015-09-01 Hannes Magnusson <bjori@php.net>
* PHPC-391 & PHPC-389: Stream and SSL API changes
2015-09-01 Hannes Magnusson <bjori@php.net>
* PHPC-387: Properly init the iterator, and don't free it on dtor
2015-09-01 Hannes Magnusson <bjori@php.net>
* _id doesn't have to be object
2015-09-01 Hannes Magnusson <bjori@php.net>
* Fix incorrect version checks
2015-09-01 Hannes Magnusson <bjori@php.net>
* PHPC-405: zval drop a level; zval*->zval, zval**->zval*
2015-09-01 Hannes Magnusson <bjori@php.net>
* PHPC-404: off-by-one hash api changes
2015-09-01 Hannes Magnusson <bjori@php.net>
* PHPC-390: php.ini updates
2015-08-31 Hannes Magnusson <bjori@php.net>
* littlebit to eager on the zend_string, this is PHP5
2015-08-31 Hannes Magnusson <bjori@php.net>
* Get the zend_string value
2015-08-31 Hannes Magnusson <bjori@php.net>
* hash API changes, off-by-ones
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-380: Use the compatability macros to get the object
2015-08-31 Hannes Magnusson <bjori@php.net>
* Properly initialize the zval* we are working with
2015-08-31 Hannes Magnusson <bjori@php.net>
* +1 in PHP5, not PHP7
2015-08-31 Hannes Magnusson <bjori@php.net>
* Include numeric keys as well
2015-09-01 Patrick Boyd <pboyd04@gmail.com>
* Object property names missing due to lack of key length
2015-08-31 Hannes Magnusson <bjori@php.net>
* Should all compile now!
2015-08-31 Hannes Magnusson <bjori@php.net>
* Simpilfy iterating over a zval
2015-08-31 Hannes Magnusson <bjori@php.net>
* Use Z_ISUNDEF() to check the zval
2015-08-31 Hannes Magnusson <bjori@php.net>
* WS
2015-08-31 Patrick Boyd <pboyd04@gmail.com>
* PHPC-400: Handle IS_TRUE and IS_FALSE
2015-08-31 Hannes Magnusson <bjori@php.net>
* Simplify IS_ARRAY/IS_OBJECT discovery for PHP7
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-373: MAKE_STD_ZVAL() and zval* -> zval upgrades
2015-08-31 Hannes Magnusson <bjori@php.net>
* We already know the length
2015-08-31 Patrick Boyd <pboyd04@gmail.com>
* str_efree() not defined in PHP7
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-397: RETURN_*() should RETURN ! :)
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-399: zval_used_for_init is no longer needed (or defined)
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-398: zend_parse_parameter 's' expects a char* and size_t now
2015-08-28 Patrick Boyd <pboyd04@gmail.com>
* PHP7 upgrades
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-373: MAKE_STD_ZVAL() is gone
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-397: RETURN_STRING() duplicate argument removed
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-387: get_current_data() API changes
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-397: dup argument in most string macros removed
2015-08-31 Patrick Boyd <pboyd04@gmail.com>
* PHPC-380: Use our bc type for free_object argument
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-397: dup argument in most string macros removed
2015-08-31 Patrick Boyd <pboyd04@gmail.com>
* PHPC-396: HashTable no longer contains nApplyCount
2015-08-27 Patrick Boyd <pboyd04@gmail.com>
* PHPC-394: Fix issue with WriteException and zend_read_property
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-380: PHP7 create/free object changes
2015-08-27 Patrick Boyd <pboyd04@gmail.com>
* PHPC-380: create/free object handlers for PHP7
2015-08-27 Hannes Magnusson <bjori@php.net>
* Define the TODOs for PHP5, these are PHP7 TODOs
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-385: Remove leftover braces
2015-08-27 Hannes Magnusson <bjori@php.net>
* Sprinkle TODOs -- it compiles now!
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-374: php_stream_xport_create() now wants zend_string
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-388 - dtor on bson_to_zval() failure
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-387: Iterator API changes
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-386: Forward port Z_PHPDATE_P() to get php_date_obj
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-385: add_assoc_string_ex() doesn't have a duplicate param in PHP7
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-384: php_stream's no longer have resource ids
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-383: Simplify getting the current exception zval*
2015-08-26 Hannes Magnusson <bjori@php.net>
* PHPC-376: Cursor var_dump() is weird
2015-08-25 Hannes Magnusson <bjori@php.net>
* PHPC-373: Remove MAKE_STD_ZVAL() usage
2015-08-25 Hannes Magnusson <bjori@php.net>
* PHPC-374: zend_string* vs char* PHP API changes (1/many)
2015-08-25 Hannes Magnusson <bjori@php.net>
* PHPC-375: TSRMLS_FETCH_FROM_CTX() not applicable in PHP7
2015-08-25 Hannes Magnusson <bjori@php.net>
* PHPC-372: zend_throw_exception() return value changes
2015-08-25 Hannes Magnusson <bjori@php.net>
* PHP7: Start a phongo_compat.c with things that shouldn't be done in headers
2015-08-25 Hannes Magnusson <bjori@php.net>
* PHP7: Lets start with just php_phongo.c for now
2015-08-24 Hannes Magnusson <bjori@php.net>
* PHPC-371: Prep for PHP7 resource changes
2015-08-24 Hannes Magnusson <bjori@php.net>
* PHPC-370: Hardcode return_value_used to 1 in PHP7
2015-08-24 Hannes Magnusson <bjori@php.net>
* PHPC-370: return_value_ptr and return_value_used removed in PHP7
2015-08-24 Hannes Magnusson <bjori@php.net>
* PHPC-369: Use the new Z_<CLASSNAME>_OBJ_P() macros
2015-08-24 Hannes Magnusson <bjori@php.net>
* PHPC-369: Split PHP5 and PHP7 style custom object struct declrations
2015-08-24 Hannes Magnusson <bjori@php.net>
* PHPC-368: Refactor MongoDB\Driver\Manager ctor
2015-08-24 Hannes Magnusson <bjori@php.net>
* Fix const casting warning in php_array_api
2015-08-24 Hannes Magnusson <bjori@php.net>
* Resync with GitHub: https://github.com/sgolemon/php-array-api
2015-12-15 Jeremy Mikola <jmikola@gmail.com>
* Back to -dev
2015-12-15 Jeremy Mikola <jmikola@gmail.com>
* Include libbson and libmongoc version files in PECL package
2015-12-15 Jeremy Mikola <jmikola@gmail.com>
* Add 1.1.0 release notes
2015-12-15 Jeremy Mikola <jmikola@gmail.com>
* Bump extension version to 1.1.0
2015-12-14 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #168
2015-12-14 Jeremy Mikola <jmikola@gmail.com>
* PHPC-509: Default Manager URI to "mongodb://localhost:27017/"
2015-12-14 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #167
2015-12-14 Jeremy Mikola <jmikola@gmail.com>
* PHPC-448: Fix arginfo for ReadConcern constructor
2015-12-14 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #163
2015-12-12 Jorgen Evens <jorgen@evens.eu>
* PHPC-514: Fix --with-mongodb-sasl flag
2015-12-14 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #166
2015-12-14 Hannes Magnusson <bjori@php.net>
* PHPC-512: Disable async stream connections
2015-12-14 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #165
2015-12-14 Jeremy Mikola <jmikola@gmail.com>
* PHPC-508: Construct valid stream URI for IPv6 literals
2015-12-11 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #158
2015-12-10 Jeremy Mikola <jmikola@gmail.com>
* PHPC-448: Manager::getReadConcern() and URI test
2015-12-10 Jeremy Mikola <jmikola@gmail.com>
* PHPC-448: Support readConcern option on Query
2015-12-10 Jeremy Mikola <jmikola@gmail.com>
* PHPC-448: Implement ReadConcern class
2015-12-10 Jeremy Mikola <jmikola@gmail.com>
* Fix include for mongoc-write-concern-private.h
2015-12-11 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #161
2015-12-11 Hannes Magnusson <bjori@php.net>
* Fix package license to be consistent with the source files
2015-12-11 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #160
2015-12-11 Hannes Magnusson <bjori@php.net>
* Accept MongoDB 3.2 package repo public keys on test VM
2015-12-11 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #157
2015-12-05 Jeremy Mikola <jmikola@gmail.com>
* PHPC-443: Support "bypassDocumentValidation" option in BulkWrite
2015-12-10 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #156
2015-12-10 Jeremy Mikola <jmikola@gmail.com>
* Update package repo public key for Travis CI builds
2015-12-10 Jeremy Mikola <jmikola@gmail.com>
* Define STANDALONE as MongoDB 3.2 on Travis CI
2015-12-09 Jeremy Mikola <jmikola@gmail.com>
* Bump libmongoc for CDRIVER-1046 memory leak fix
2015-12-09 Jeremy Mikola <jmikola@gmail.com>
* PHPC-450: failReceivedGetmore does not support getMore commands
2015-12-09 Jeremy Mikola <jmikola@gmail.com>
* PHPC-450: Don't assert exact isMaster response when dumping Servers
2015-12-09 Jeremy Mikola <jmikola@gmail.com>
* PHPC-450: Split query tests for OP_QUERY and find command
2015-12-09 Jeremy Mikola <jmikola@gmail.com>
* Add MongoDB 3.0 replica set test environment
2015-12-09 Jeremy Mikola <jmikola@gmail.com>
* PHPC-450: Profiled aggregate commands log the collection NS in 3.2
2015-12-08 Jeremy Mikola <jmikola@gmail.com>
* PHPC-450: Update open cursor check for MongoDB 3.2
2015-12-10 Derick Rethans <github@derickrethans.nl>
* Merge branch 'pr/152' — fixes PHPC-502 and issue #149
2015-12-10 Derick Rethans <github@derickrethans.nl>
* Use more descriptive unused value
2015-12-07 Hannes Magnusson <bjori@php.net>
* Fixed PHPC-502: bson_init_static(): precondition failed: data
2015-12-09 Jeremy Mikola <jmikola@gmail.com>
* Use consistent name for MongoDB 3.0 test server
2015-12-08 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #155
2015-12-08 Jeremy Mikola <jmikola@gmail.com>
* PHPC-450: Enable majority read concern by default in MO
2015-12-08 Jeremy Mikola <jmikola@gmail.com>
* PHPC-450: Use MongoDB 3.2 final for testing
2015-12-08 Jeremy Mikola <jmikola@gmail.com>
* Make server startup via MO more robust
2015-12-08 Jeremy Mikola <jmikola@gmail.com>
* Register STANDALONE-3.0 with the test suite
2015-12-08 Jeremy Mikola <jmikola@gmail.com>
* STANDALONE-3.0 port conflicted with STANDALONE-2.4
2015-12-08 Derick Rethans <github@derickrethans.nl>
* Merged pull request #151
2015-12-08 Derick Rethans <github@derickrethans.nl>
* Bump libmongoc and libbson to 1.3.0 releases
2015-12-02 Derick Rethans <github@derickrethans.nl>
* This code has changed in 3.2, and make the error message clear
2015-12-02 Derick Rethans <github@derickrethans.nl>
* Added 3.2.0rc5 to our Mongo Orchestration suite
2015-12-02 Derick Rethans <github@derickrethans.nl>
* Added some more phpt test leftovers to .gitignore
2015-12-08 Derick Rethans <github@derickrethans.nl>
* Merge branch 'v1.0'
2015-12-08 Remi Collet <fedora@famillecollet.com>
* libmongoc 1.3 is not compatible
2015-12-07 Jeremy Mikola <jmikola@gmail.com>
* Revise prep-release.php handling
2015-12-07 Jeremy Mikola <jmikola@gmail.com>
* Merge branch 'v1.0'
2015-12-07 Jeremy Mikola <jmikola@gmail.com>
* Back to -dev
2015-12-07 Jeremy Mikola <jmikola@gmail.com>
* Add 1.0.1 release notes
2015-12-07 Jeremy Mikola <jmikola@gmail.com>
* Bump extension version to 1.0.1
2015-12-07 Jeremy Mikola <jmikola@gmail.com>
* Revise prep-release.php handling
2015-12-07 Derick Rethans <github@derickrethans.nl>
* Merged pull request #150
2015-12-04 Hannes Magnusson <bjori@php.net>
* bump mongoc & libbson
2015-12-04 Hannes Magnusson <bjori@php.net>
* Generate the mongoc and libbson version files correctly
2015-12-04 Hannes Magnusson <bjori@php.net>
* Revert "Unblock compile by copying VERSION_CURRENT and VERSION_RELEASED until CDRIVER-1027 is fixed."
2015-12-03 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #148
2015-12-03 Jeremy Mikola <jmikola@gmail.com>
* Master branch is now 1.1.0-dev
2015-12-03 Jeremy Mikola <jmikola@gmail.com>
* Add "-dev" to extension version constant
2015-12-02 Derick Rethans <github@derickrethans.nl>
* Merged pull request #141
2015-12-02 Derick Rethans <github@derickrethans.nl>
* Made error message more consistent as per Jeremy's comment
2015-12-02 Derick Rethans <github@derickrethans.nl>
* Move flag exceptions back into config.m4
2015-12-02 Hannes Magnusson <bjori@php.net>
* Edgecase compiler warnings in mongoc are mongoc problem, not phongo
2015-12-02 Derick Rethans <github@derickrethans.nl>
* Turn off missing braces to make Travis happy
2015-12-02 Derick Rethans <github@derickrethans.nl>
* Unblock compile by copying VERSION_CURRENT and VERSION_RELEASED until CDRIVER-1027 is fixed.
2015-12-02 Derick Rethans <github@derickrethans.nl>
* Added weak symbols for Windows too
2015-12-02 Derick Rethans <github@derickrethans.nl>
* Changed error message to make more sense.
2015-12-02 Derick Rethans <github@derickrethans.nl>
* Upgrade libbson and libmongoc to latest master release
2015-12-02 Derick Rethans <github@derickrethans.nl>
* Fixed memory leak as per Hannes' comment.
2015-11-20 Derick Rethans <github@derickrethans.nl>
* Only list a file once (crept in due to merge conflicts it seems)
2015-11-19 Hannes Magnusson <bjori@php.net>
* Temporary workaround for warning in mongoc
2015-11-19 Hannes Magnusson <bjori@php.net>
* PHPC-495: Upgrade bundled libbson and libmongoc to 1.3.0
2015-11-19 Hannes Magnusson <bjori@php.net>
* PHPC-488: Manager::selectServer() should throw when failing to select a server
2015-11-19 Hannes Magnusson <bjori@php.net>
* No need to double-initialize boptions
2015-11-19 Derick Rethans <github@derickrethans.nl>
* Renamed struct members due to changes in libmongoc
2015-11-19 Derick Rethans <github@derickrethans.nl>
* mongoc_cursor_cursorid_init takes an extra bson_error
2015-11-19 Derick Rethans <github@derickrethans.nl>
* Define weak symbols as per a comment in PHPC-406
2015-11-19 Derick Rethans <github@derickrethans.nl>
* Add compilation of mongoc_read_concern.c
2015-11-19 Derick Rethans <github@derickrethans.nl>
* Bump libbson and libmongoc to 1.3.0beta0
2015-11-17 Derick Rethans <github@derickrethans.nl>
* mongoc_topology_description_server_by_id now takes an additional bson_error_t (CDRIVER-906)
2015-11-17 Derick Rethans <github@derickrethans.nl>
* Ordered flag has moved into 'flags' struct (CDRIVER-893)
2015-11-17 Derick Rethans <github@derickrethans.nl>
* Initial upgrade to pre-1.3.0rc0 version.
2015-12-02 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #135
2015-11-06 Jeremy Mikola <jmikola@gmail.com>
* PHPC-487: Regression tests for check_closed stream handler
2015-11-06 Hannes Magnusson <bjori@php.net>
* PHPC-487: Reverse logic in check_closed stream handler
2015-11-25 Hannes Magnusson <bjori@php.net>
* Its a bit creepy seeing my family in bug reports
2015-11-25 Derick Rethans <github@derickrethans.nl>
* Merged pull request #143
2015-11-25 Derick Rethans <github@derickrethans.nl>
* PHPC-499: Only add the dependency when we're actually enabling the extension
2015-11-12 Derick Rethans <github@derickrethans.nl>
* Merged pull request #137
2015-11-12 Derick Rethans <github@derickrethans.nl>
* Wording tweaks after review
2015-11-12 Derick Rethans <github@derickrethans.nl>
* HHVM-136: Make hippo and phongo README/CONTRIBUTING files consistent
2015-11-02 Jeremy Mikola <jmikola@gmail.com>
* Update documentation for 1.0.0
2015-10-30 Jeremy Mikola <jmikola@gmail.com>
* Back to -dev
2015-10-30 Jeremy Mikola <jmikola@gmail.com>
* Add 1.0.0 release notes
2015-10-30 Jeremy Mikola <jmikola@gmail.com>
* Bump extension version to 1.0.0
2015-10-30 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #130
2015-10-30 Jeremy Mikola <jmikola@gmail.com>
* PHPC-475: toJSON and fromJSON should thrown on error
2015-10-28 Jeremy Mikola <jmikola@gmail.com>
* Tests for fromJSON() and toJSON()
2015-10-26 Jeremy Mikola <jmikola@gmail.com>
* Back to -dev
2015-10-26 Jeremy Mikola <jmikola@gmail.com>
* Add 1.0.0RC0 release notes
2015-10-26 Jeremy Mikola <jmikola@gmail.com>
* Bump extension version to 1.0.0RC0
2015-10-26 Jeremy Mikola <jmikola@gmail.com>
* Revise system libbson version check error message
2015-10-23 Jeremy Mikola <jmikola@gmail.com>
* Update GitHub URLs for org change and repo rename
2015-10-22 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #128
2015-10-21 Jeremy Mikola <jmikola@gmail.com>
* PHPC-465: Remove WriteConcernException and WriteErrorException
2015-10-21 Jeremy Mikola <jmikola@gmail.com>
* Rename WriteConcernError tests
2015-10-21 Jeremy Mikola <jmikola@gmail.com>
* PHPC-465: Remove Manager's single write methods
2015-10-20 Jeremy Mikola <jmikola@gmail.com>
* PHPC-440: WriteErrorException extends abstract WriteException
2015-10-20 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #127
2015-10-20 Jeremy Mikola <jmikola@gmail.com>
* PHPC-462: Remove unused DuplicateKeyException
2015-10-20 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #126
2015-10-19 Jeremy Mikola <jmikola@gmail.com>
* PHPC-310: Make BSON types final and disable serialization for now
2015-10-19 Jeremy Mikola <jmikola@gmail.com>
* Make BSON create_object assignments consistent
2015-10-16 Jeremy Mikola <jmikola@gmail.com>
* PHPC-310: Exception classes need not be final
2015-10-16 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #125
2015-10-15 Jeremy Mikola <jmikola@gmail.com>
* PHPC-444: Support options array in BulkWrite and executeInsert()
2015-10-15 Jeremy Mikola <jmikola@gmail.com>
* Fix indentation
2015-10-15 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #124
2015-10-14 Jeremy Mikola <jmikola@gmail.com>
* PHPC-407: Rename X509 error test and fix cert path
2015-10-14 Jeremy Mikola <jmikola@gmail.com>
* Rename X509 connection tests
2015-10-14 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #123
2015-10-14 Jeremy Mikola <jmikola@gmail.com>
* PHPC-454: Remove WriteResult::getInfo() method
2015-10-14 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #122
2015-10-14 Jeremy Mikola <jmikola@gmail.com>
* PHPC-441: slaveOk bit is now set on hinted secondary query
2015-10-14 Jeremy Mikola <jmikola@gmail.com>
* Bump libbson and libmongoc submodules to 1.2.0
2015-10-12 Hannes Magnusson <bjori@10gen.com>
* Merge pull request #121 from bjori/PHPC-256-prod-debug-logs
2015-10-07 Hannes Magnusson <bjori@php.net>
* PHPC-256: Productions debug logs
2015-10-07 Hannes Magnusson <bjori@php.net>
* PHPC-441: Skip (xfail) these tests while the ticket is being worked on
2015-10-07 Hannes Magnusson <bjori@php.net>
* Make sure we have the X509 declaration we need
2015-10-07 Hannes Magnusson <bjori@php.net>
* No need for TSRMLS here -- no calls to PHP at all
2015-10-06 Jeremy Mikola <jmikola@gmail.com>
* Back to -dev
2015-10-06 Jeremy Mikola <jmikola@gmail.com>
* Update install examples to mongodb-beta
2015-10-06 Jeremy Mikola <jmikola@gmail.com>
* Add 1.0.0beta2 release notes
2015-10-06 Jeremy Mikola <jmikola@gmail.com>
* Avoid nested macros when reporting runtime version in debug mode
2015-10-05 Jeremy Mikola <jmikola@gmail.com>
* Omit merge commits from release changelog
2015-10-05 Jeremy Mikola <jmikola@gmail.com>
* Use UTC time when creating package.xml
2015-10-05 Jeremy Mikola <jmikola@gmail.com>
* Bump extension version to 1.0.0beta2
2015-10-05 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #120
2015-10-05 Remi Collet <fedora@famillecollet.com>
* PHPC-442: report PHP version in debug info
2015-10-05 Remi Collet <fedora@famillecollet.com>
* report runtime version in debug mode
2015-10-05 Remi Collet <fedora@famillecollet.com>
* rename macros
2015-10-04 Remi Collet <fedora@famillecollet.com>
* report libraries runtime versions
2015-10-05 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #119
2015-10-05 Jeremy Mikola <jmikola@gmail.com>
* Test write and WC error extraction for single write methods
2015-10-02 Jeremy Mikola <jmikola@gmail.com>
* PHPC-409: $readPreference is no longer sent to non-mongos nodes
2015-10-02 Jeremy Mikola <jmikola@gmail.com>
* Update filenames for libmongoc and libbson version functions
2015-10-02 Jeremy Mikola <jmikola@gmail.com>
* PHPC-438: Debug handler should display null for no WC error
2015-10-02 Jeremy Mikola <jmikola@gmail.com>
* PHPC-436: Handle new writeConcernErrors array in mongoc_write_result_t
2015-10-02 Jeremy Mikola <jmikola@gmail.com>
* Bump libbson and libmongoc submodules to 1.2.0-rc0
2015-09-11 Hannes Magnusson <bjori@php.net>
* PHPC-415: Add testcase
2015-09-11 Hannes Magnusson <bjori@php.net>
* PHPC-415: SSL/TLS already set-up for this stream
2015-09-09 Hannes Magnusson <bjori@php.net>
* $readPreferences should not be sent to standalone server
2015-09-09 Hannes Magnusson <bjori@php.net>
* Don't provide server_id when we have none
2015-10-01 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #83
2015-10-01 Jeremy Mikola <jmikola@gmail.com>
* Use versioned URI for mongo-orchestration
2015-10-01 Jeremy Mikola <jmikola@gmail.com>
* Increase mongo-orchestration HTTP timeout
2015-08-20 Jeremy Mikola <jmikola@gmail.com>
* Empty query results should still pass "find" phase in mo-tests
2015-08-20 Jeremy Mikola <jmikola@gmail.com>
* Implement "clientHosts" phase for mo-tests
2015-08-19 Jeremy Mikola <jmikola@gmail.com>
* Support "delete" operation in mo-tests
2015-08-19 Jeremy Mikola <jmikola@gmail.com>
* Rename "findOne" to "find" in mo-tests
2015-08-19 Jeremy Mikola <jmikola@gmail.com>
* Fix exception throwing in mo-tests conversion script
2015-09-28 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #118
2015-09-24 Jeremy Mikola <jmikola@gmail.com>
* PHPC-393: Ignore non-public properties when encoding BSON
2015-09-24 Jeremy Mikola <jmikola@gmail.com>
* Previous break statement makes the else condition redundant
2015-09-24 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #117
2015-09-23 Jeremy Mikola <jmikola@gmail.com>
* PHPC-430, PHPC-377: Do not convert Query filter arg to an object
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-377: Eliminate object casting and whole lot of zend hash helpers
2015-08-25 Hannes Magnusson <bjori@php.net>
* PHPC-373: Get rid of MAKE_STD_ZVAL() and use bson_t instead
2015-09-23 Jeremy Mikola <jmikola@gmail.com>
* PHPC-430: Regression tests for Query arg corruption
2015-09-23 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #116
2015-09-23 Jeremy Mikola <jmikola@gmail.com>
* PHP versions in .travis.yml don't need to be strings
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-379: I broke PHP5.3 build. Thats OK, since we don't support it.
2015-09-23 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #115
2015-09-23 Jeremy Mikola <jmikola@gmail.com>
* PHPC-427: Fix parsing of null WC journal param for PHP 5.4
2015-09-22 Jeremy Mikola <jmikola@gmail.com>
* PHPC-428: Remove support for WriteConcern fsync option
2015-09-22 Jeremy Mikola <jmikola@gmail.com>
* Update arg info for WriteConcern $w ctor parameter
2015-09-22 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #113
2015-09-21 Jeremy Mikola <jmikola@gmail.com>
* PHPC-427: Do not set WC journal/fsync to false for NULL args
2015-09-22 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #110
2015-09-18 Jeremy Mikola <jmikola@gmail.com>
* Additional tests for WriteConcern debug handler
2015-09-18 Jeremy Mikola <jmikola@gmail.com>
* PHPC-423: WriteConcern should report default "w" option as null
2015-09-22 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #109
2015-09-17 Jeremy Mikola <jmikola@gmail.com>
* PHPC-426: WC ctor should throw for invalid $w and $wtimeout args
2015-09-17 Jeremy Mikola <jmikola@gmail.com>
* PHPC-425: WC ctor should accept int/string $w args w/o casting
2015-09-17 Jeremy Mikola <jmikola@gmail.com>
* WriteConcern ctor error test doesn't need EXPECTF
2015-09-17 Jeremy Mikola <jmikola@gmail.com>
* Use throws() helper function in WriteConcern ctor error test
2015-09-22 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #106
2015-09-18 Derick Rethans <github@derickrethans.nl>
* Skip logging tests for HHVM, which will use its own method
2015-09-10 Derick Rethans <github@derickrethans.nl>
* Better messages for when things go wrong with exceptions
2015-09-10 Derick Rethans <github@derickrethans.nl>
* PHPC-412: HHVM does not do SSL peer verification like PHP
2015-09-18 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #111
2015-09-18 Jeremy Mikola <jmikola@gmail.com>
* PHPC-410: Make BSON exception message consistent with HHVM
2015-09-17 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #103
2015-09-17 Jeremy Mikola <jmikola@gmail.com>
* Split out UTCDateTime toDateTime and toString tests
2015-09-15 Jeremy Mikola <jmikola@gmail.com>
* PHPC-410: zval_to_bson() should throw on non-Serializable Type objects
2015-09-15 Jeremy Mikola <jmikola@gmail.com>
* PHPC-410: object_to_bson() should throw on unsupported BSON\Type objects
2015-09-09 Jeremy Mikola <jmikola@gmail.com>
* PHPC-410: object_to_bson() should encode non-stdClass objects
2015-09-09 Jeremy Mikola <jmikola@gmail.com>
* Revise debug messages in object_to_bson()
2015-09-17 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #108
2015-09-16 Jeremy Mikola <jmikola@gmail.com>
* PHPC-418: Getters for WriteConcern properties
2015-09-16 Jeremy Mikola <jmikola@gmail.com>
* Rename WriteConcern tests
2015-09-16 Jeremy Mikola <jmikola@gmail.com>
* Move PHONGO_WRITE_CONCERN_W_MAJORITY definition to php_phongo.h
2015-09-15 Jeremy Mikola <jmikola@gmail.com>
* Revise ReadPreference constructor error messages
2015-09-15 Jeremy Mikola <jmikola@gmail.com>
* Rename first ReadPreference constructor arg to "mode"
2015-09-15 Jeremy Mikola <jmikola@gmail.com>
* PHPC-418: Getters for ReadPreference properties
2015-09-15 Jeremy Mikola <jmikola@gmail.com>
* Use valid tag sets in ReadPreference tests
2015-09-15 Jeremy Mikola <jmikola@gmail.com>
* Rename ReadPreference tests and split constructor error test
2015-09-16 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #107
2015-09-15 Jeremy Mikola <jmikola@gmail.com>
* PHPC-417: Return value objects from Manager RP/WC getters
2015-09-15 Jeremy Mikola <jmikola@gmail.com>
* Declare phongo_cursor_init() statically
2015-09-14 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #102
2015-09-09 Jeremy Mikola <jmikola@gmail.com>
* PHPC-408: Ensure object_to_bson() always creates a BSON document
2015-09-09 Jeremy Mikola <jmikola@gmail.com>
* Refactor bson-utcdatetime-001.phpt
2015-09-10 Jeremy Mikola <jmikola@gmail.com>
* Back to -dev
2015-09-10 Jeremy Mikola <jmikola@gmail.com>
* Add 1.0.0beta1 release notes
2015-09-10 Jeremy Mikola <jmikola@gmail.com>
* Add line break between versions in release notes
2015-09-10 Jeremy Mikola <jmikola@gmail.com>
* Bump extension version to 1.0.0beta1
2015-09-09 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #98
2015-09-09 Jeremy Mikola <jmikola@gmail.com>
* PHPC-381: Print whether profile commands were successful
2015-09-02 Jeremy Mikola <jmikola@gmail.com>
* PHPC-381: Server::executeQuery/Command() should take a read preference
2015-09-04 Jeremy Mikola <jmikola@gmail.com>
* Include unknown error domain in log messages
2015-09-02 Jeremy Mikola <jmikola@gmail.com>
* Fall back to driver's RuntimeException instead of SPL
2015-09-04 Hannes Magnusson <bjori@10gen.com>
* Merge pull request #100 from bjori/master
2015-09-04 Hannes Magnusson <bjori@php.net>
* s/10gen-labs/mongodb-labs/g after org changes
2015-09-03 Hannes Magnusson <bjori@10gen.com>
* Merge pull request #99 from bjori/master
2015-08-20 Hannes Magnusson <bjori@php.net>
* Bump libmongoc to 1.2-beta1
2015-09-02 Derick Rethans <github@derickrethans.nl>
* Merged pull request #95
2015-09-02 Derick Rethans <github@derickrethans.nl>
* Disable the test for a double wrap with IteratorIterator()
2015-09-02 Derick Rethans <github@derickrethans.nl>
* Disable test that dumps hex codes for generated BSON
2015-09-02 Derick Rethans <github@derickrethans.nl>
* Merged pull request #96
2015-09-02 Derick Rethans <github@derickrethans.nl>
* Fixed getServers test to include milliseconds in UTCDate dumps
2015-09-02 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #92
2015-08-30 Jeremy Mikola <jmikola@gmail.com>
* Clean up BSON error tests
2015-09-01 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #80
2015-08-14 Jeremy Mikola <jmikola@gmail.com>
* PHPC-361: Manager::getServers() should omit unknown servers
2015-09-01 Derick Rethans <github@derickrethans.nl>
* Merged pull request #91
2015-08-28 Derick Rethans <github@derickrethans.nl>
* HHVM encodes __pclass last, so disable these tests here.
2015-08-26 Derick Rethans <github@derickrethans.nl>
* phpinfo() behaves totally different in HHVM
2015-08-28 Derick Rethans <github@derickrethans.nl>
* Merged pull request #89
2015-08-27 Derick Rethans <github@derickrethans.nl>
* HHVM does not allow for current() on an object
2015-08-27 Derick Rethans <github@derickrethans.nl>
* Split tests for invalid arguments out into their own files, and ignore them for HHVM
2015-08-28 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #88
2015-08-26 Jeremy Mikola <jmikola@gmail.com>
* PHPC-337: BSON\Javascript debug handler
2015-08-26 Jeremy Mikola <jmikola@gmail.com>
* PHPC-339: BSON\Timestamp debug handler
2015-08-26 Jeremy Mikola <jmikola@gmail.com>
* PHPC-340: BSON\UTCDateTime debug handler
2015-08-26 Jeremy Mikola <jmikola@gmail.com>
* PHPC-338: BSON\Regex debug handler
2015-08-26 Jeremy Mikola <jmikola@gmail.com>
* Fix test expectation for builds with top-level BSON namespace
2015-08-21 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #85
2015-08-21 Hannes Magnusson <bjori@php.net>
* Don't be printing out these commands during execution
2015-08-21 Hannes Magnusson <bjori@php.net>
* Back to -dev
2015-08-21 Hannes Magnusson <bjori@php.net>
* PHPC-366: Update release script to use RELEASE-x.y file
2015-08-21 Hannes Magnusson <bjori@php.net>
* PHPC-366: Merge 1.0.x release notes into RELEASE-1.0
2015-08-21 Hannes Magnusson <bjori@php.net>
* PHPC-366: Merge RELEASE-0.* release notes into RELEASE-0
2015-08-20 Jeremy Mikola <jmikola@gmail.com>
* Add 1.0.0alpha2 release notes
2015-08-20 Jeremy Mikola <jmikola@gmail.com>
* Bump extension version to 1.0.0alpha2
2015-08-20 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #84
2015-08-20 Jeremy Mikola <jmikola@gmail.com>
* PHPC-365: Add src/contrib to Windows build includes
2015-08-20 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #81
2015-08-20 Jeremy Mikola <jmikola@gmail.com>
* Add 1.0.0alpha1 release notes
2015-08-18 Jeremy Mikola <jmikola@gmail.com>
* Bump extension version to 1.0.0alpha1
2015-08-18 Jeremy Mikola <jmikola@gmail.com>
* Bump minimum PHP version requirement to 5.4
2015-08-18 Jeremy Mikola <jmikola@gmail.com>
* Use php.net email addresses for authors
2015-08-20 Hannes Magnusson <bjori@php.net>
* Link to the HHVM project
2015-08-20 Hannes Magnusson <bjori@php.net>
* Test running belongs to CONTRIBUTING.md
2015-08-20 Hannes Magnusson <bjori@php.net>
* Add docs for the new PHONGO_SERVERS environment variable
2015-08-20 Hannes Magnusson <bjori@php.net>
* We don't tail master
2015-08-20 Hannes Magnusson <bjori@php.net>
* Merge pull request #82 from derickr/test-name-and-servers
2015-08-20 Derick Rethans <github@derickrethans.nl>
* Do this with an env var instead
2015-08-19 Jeremy Mikola <jmikola@gmail.com>
* Fix str_replace() newline replacement
2015-08-19 Derick Rethans <github@derickrethans.nl>
* Allow for PHONGO-SERVERS.json in ~ (and fix a test case name)
2015-08-14 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #76
2015-08-14 Jeremy Mikola <jmikola@gmail.com>
* Strip newlines from exception messages for more concise failures
2015-08-05 Derick Rethans <github@derickrethans.nl>
* Added the error message to the failure cases.
2015-08-14 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #70
2015-08-14 Jeremy Mikola <jmikola@gmail.com>
* Add mongoc-host-list.c to config sources
2015-08-14 Jeremy Mikola <jmikola@gmail.com>
* Fix indentation in config.m4 sources
2015-08-14 Jeremy Mikola <jmikola@gmail.com>
* Bump libmongoc submodule to 1.2.0-beta
2015-07-30 Jeremy Mikola <jmikola@gmail.com>
* Restore -Werror compile flag for 5.4+ developer builds
2015-08-14 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #78
2015-08-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-271: Server::executeBulkWrite() should take a write concern
2015-08-13 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #77
2015-08-05 Jeremy Mikola <jmikola@gmail.com>
* Split out Manager constructor error tests
2015-08-05 Jeremy Mikola <jmikola@gmail.com>
* Manager should check client pointer before destroying it
2015-08-03 Jeremy Mikola <jmikola@gmail.com>
* PHPC-196: Implement Manager getters for WC and RP
2015-08-05 Jeremy Mikola <jmikola@gmail.com>
* PHPC-353: Return early when there are no options to apply
2015-08-05 Jeremy Mikola <jmikola@gmail.com>
* PHPC-353: Support RP and WC in Manager options array
2015-08-05 Jeremy Mikola <jmikola@gmail.com>
* Manager constructor should check if URI or client creation fails
2015-07-31 Jeremy Mikola <jmikola@gmail.com>
* Fix memory leak in _phongo_debug_bson()
2015-08-13 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #79
2015-08-13 Jeremy Mikola <jmikola@gmail.com>
* Trim #includes, since src/contrib is already an include path
2015-08-05 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #75
2015-08-05 Jeremy Mikola <jmikola@gmail.com>
* PHPC-357: Revise test and relocate to standalone group
2015-08-04 Derick Rethans <github@derickrethans.nl>
* PHPC-357: "invalid namespace" exception should report the namespace
2015-08-05 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #74
2015-08-04 Derick Rethans <github@derickrethans.nl>
* PHPC-129: Split out WriteConcern constructor error test
2015-08-04 Derick Rethans <github@derickrethans.nl>
* Merged pull request #73
2015-08-03 Derick Rethans <github@derickrethans.nl>
* Rename BSON\Binary's subType field and getSubType() method to type and getType()
2015-08-04 Derick Rethans <github@derickrethans.nl>
* Merged pull request #72
2015-07-31 Derick Rethans <github@derickrethans.nl>
* Temporary fix for the NULL vs null issue
2015-08-03 Hannes Magnusson <bjori@php.net>
* Make the relative path work
2015-08-03 Hannes Magnusson <bjori@php.net>
* Skip test when not using the test vms
2015-07-30 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #69
2015-07-30 Jeremy Mikola <jmikola@gmail.com>
* PHPC-350: Bump libmongoc submodule for updated headers
2015-07-30 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #68
2015-07-30 Jeremy Mikola <jmikola@gmail.com>
* bson_to_zval() should always initialize state->zchild
2015-07-29 Jeremy Mikola <jmikola@gmail.com>
* Update extension filename in Travis scripts
2015-07-29 Jeremy Mikola <jmikola@gmail.com>
* PHPC-347: bson_to_zval() leaks when buffer contains no documents
2015-07-29 Jeremy Mikola <jmikola@gmail.com>
* PHPC-345: bson_to_zval() should throw exceptions instead of warnings
2015-07-29 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #67
2015-07-28 Jeremy Mikola <jmikola@gmail.com>
* PHPC-334: Split hex_dump() test case
2015-07-29 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #64
2015-07-27 Jeremy Mikola <jmikola@gmail.com>
* PHP 5.3 compatibility for tools.php
2015-07-27 Jeremy Mikola <jmikola@gmail.com>
* Define str_efree() macro for PHP 5.3 compatibility
2015-07-27 Jeremy Mikola <jmikola@gmail.com>
* Compile with no-cast-qual for PHP 5.3
2015-07-27 Jeremy Mikola <jmikola@gmail.com>
* PHPC-344: Allow non-root Serializable to encode as BSON array
2015-07-27 Jeremy Mikola <jmikola@gmail.com>
* PHPC-343: Allow bsonSerialize() to return a stdClass
2015-07-27 Jeremy Mikola <jmikola@gmail.com>
* PHPC-331: Tests for BSON deserialization errors
2015-07-27 Jeremy Mikola <jmikola@gmail.com>
* PHPC-329: bson_to_zval() serialization spec compatibility
2015-07-27 Jeremy Mikola <jmikola@gmail.com>
* PHPC-329: __pclass must be both instantiatable and Persistable
2015-07-27 Jeremy Mikola <jmikola@gmail.com>
* PHPC-329: Apply more validation to type map class
2015-07-24 Jeremy Mikola <jmikola@gmail.com>
* PHPC-336: BSON\Binary debug handler
2015-07-28 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #66
2015-07-28 Derick Rethans <github@derickrethans.nl>
* Assert what the tests want, and not more
2015-07-28 Derick Rethans <github@derickrethans.nl>
* HHVM does not include the function name, and has two lines of extra stack trace
2015-07-24 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #63
2015-07-24 Jeremy Mikola <jmikola@gmail.com>
* PHPC-341: Ensure bson_t is freed after decoding JSON
2015-07-22 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #62
2015-07-22 Jeremy Mikola <jmikola@gmail.com>
* PHPC-333: Implement MongoDB\BSON\Binary::getData()
2015-07-22 Jeremy Mikola <jmikola@gmail.com>
* Fix proto for Binary::getSubType()
2015-07-22 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #59
2015-07-15 Hannes Magnusson <bjori@php.net>
* bump debug tests after slight tracing changes
2015-07-15 Hannes Magnusson <bjori@php.net>
* PHPC-229: Support options array in second parameter of Manager ctor
2015-07-22 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #61
2015-07-21 Jeremy Mikola <jmikola@gmail.com>
* PHPC-334: Don't produce BSON with multiple __pclass fields
2015-07-21 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #60
2015-07-21 Jeremy Mikola <jmikola@gmail.com>
* Don't build with -Werror until CDRIVER-757 is resolved
2015-07-20 Jeremy Mikola <jmikola@gmail.com>
* PHPC-330: Always include __pclass property when unserializing BSON
2015-07-15 Hannes Magnusson <bjori@php.net>
* Add -Werror into --enable-developer-flags
2015-07-15 Hannes Magnusson <bjori@php.net>
* Move the php_array to contrib/ and rename to _api
2015-07-14 Hannes Magnusson <bjori@php.net>
* We are tracking 1.2.0-dev, not master!
2015-07-15 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #56
2015-07-11 Jeremy Mikola <jmikola@gmail.com>
* Use namespace-agnostic BSON (de)serialization functions
2015-07-11 Jeremy Mikola <jmikola@gmail.com>
* Fix from/toJSON() protos
2015-07-11 Jeremy Mikola <jmikola@gmail.com>
* PHPC-311: Rename from/toArray() functions to from/toPHP()
2015-07-10 Jeremy Mikola <jmikola@gmail.com>
* PHPC-315: Support "root" type mapping for top-level documents
2015-07-06 Jeremy Mikola <jmikola@gmail.com>
* PHPC-319: Convert top-level documents to stdClass by default
2015-07-07 Jeremy Mikola <jmikola@gmail.com>
* Relax expected class instance in Manager: getServers() test
2015-07-07 Jeremy Mikola <jmikola@gmail.com>
* Use plural property name to store list of Address objects
2015-07-07 Jeremy Mikola <jmikola@gmail.com>
* Fix WriteResult::getWriteConcernError() proto
2015-07-08 Hannes Magnusson <bjori@php.net>
* Force 'E' to be present in php.ini so environment variables are picked up
2015-07-07 Hannes Magnusson <bjori@php.net>
* The MongoDB 3.0 repo was moved.
2015-07-07 Hannes Magnusson <bjori@php.net>
* Don't start/stop servers on travis. We don't use MO here yet
2015-07-07 Hannes Magnusson <bjori@php.net>
* PHPC-304: Enable the test again -- and fix typo in the clean section!
2015-07-07 Hannes Magnusson <bjori@php.net>
* Add the START() servers to PHONGO-SERVERS, and remove it with DELETE()
2015-07-07 Hannes Magnusson <bjori@php.net>
* PHPC-303: Cannot connect to healthy Replica Set if seedlist only contains a secondary
2015-07-07 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #57
2015-07-06 Jeremy Mikola <jmikola@gmail.com>
* PHPC-325: bson_to_zval() leaks when buffer contains multiple documents
2015-07-06 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #55
2015-06-17 Jeremy Mikola <jmikola@gmail.com>
* PHPC-306: Check for sasl_client_done in config.m4
2015-07-01 Jeremy Mikola <jmikola@gmail.com>
* Update expected float output after libbson bump
2015-07-01 Jeremy Mikola <jmikola@gmail.com>
* Bump libbson and libmongoc submodules
2015-07-06 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #51
2015-07-06 Jeremy Mikola <jmikola@gmail.com>
* Remove redundant array conversions in phongo_query_init()
2015-07-06 Jeremy Mikola <jmikola@gmail.com>
* PHPC-317: Ensure "sort" query option serializes as BSON object
2015-06-30 Hannes Magnusson <bjori@php.net>
* PHPC-323: The check for system mongoc checks system bson, not mongoc
2015-06-30 Hannes Magnusson <bjori@php.net>
* PHPC-322: Wrong bugtracker URL in configure output
2015-06-30 Hannes Magnusson <bjori@php.net>
* PHPC-321: UTCDatetime -> UTCDateTime
2015-06-30 Hannes Magnusson <bjori@php.net>
* PHPC-321: UTCDatetime -> UTCDateTime
2015-06-30 Hannes Magnusson <bjori@php.net>
* PHPC-309: Bump tests
2015-06-30 Hannes Magnusson <bjori@php.net>
* PHPC-309: Move the BSON namespace under MongoDB\ namespace
2015-06-30 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #50 from 10gen-labs/jmikola-patch-1
2015-06-29 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #49
2015-06-21 Jeremy Mikola <jmikola@gmail.com>
* LDAP VM does not require python-pip (or epel)
2015-06-29 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #53
2015-06-29 Jeremy Mikola <jmikola@gmail.com>
* PHPC-308: Skip getmore test until libmongoc issues are resolved
2015-06-21 Jeremy Mikola <jmikola@gmail.com>
* Update install docs, since we now have a PECL package
2015-06-09 Hannes Magnusson <bjori@php.net>
* bump submodule, hopfully fixing build
2015-06-09 Hannes Magnusson <bjori@php.net>
* Fix build after some SDAM changes
2015-06-09 Hannes Magnusson <bjori@php.net>
* install mongo-c-driver required building blocks
2015-06-09 Hannes Magnusson <bjori@php.net>
* PHPC-308: Failed getmore should throw exception
2015-05-22 Hannes Magnusson <bjori@php.net>
* There is no need for these tests to be this slow -- safes 2seconds now
2015-05-22 Hannes Magnusson <bjori@php.net>
* Cluster tests are slow
2015-05-20 Hannes Magnusson <bjori@php.net>
* Fix test -- this isn't a hardcoded ID
2015-05-20 Hannes Magnusson <bjori@php.net>
* Move MO host resolving to tools
2015-05-20 Hannes Magnusson <bjori@php.net>
* PHPC-304: Add a failGetMore trigger
2015-05-20 Hannes Magnusson <bjori@php.net>
* PHPC-291: New cluster/socket/connection tests
2015-05-20 Hannes Magnusson <bjori@php.net>
* PHPC-291: Add a script to convert mo-tests (JSON) to PHPT
2015-05-20 Hannes Magnusson <bjori@php.net>
* These are no longer used
2015-05-18 Hannes Magnusson <bjori@php.net>
* Organize cursor tests
2015-05-20 Hannes Magnusson <bjori@10gen.com>
* Merge pull request #46 from remicollet/issue-driver
2015-05-20 Remi Collet <fedora@famillecollet.com>
* PHPC-305: add --with-libmongo option
2015-05-18 Hannes Magnusson <bjori@php.net>
* Add a helper to know if we are in predictable (vagrant) env or not
2015-05-18 Hannes Magnusson <bjori@php.net>
* Fix server IDs
2015-05-13 Hannes Magnusson <bjori@php.net>
* Improve code coverage for the WriteException
2015-05-13 Hannes Magnusson <bjori@php.net>
* Add test for the info/ini section
2015-05-13 Hannes Magnusson <bjori@php.net>
* Improve code covergae
2015-05-13 Hannes Magnusson <bjori@php.net>
* PHPC-75: Improve debug output coverage
2015-05-13 Hannes Magnusson <bjori@php.net>
* Use the defines
2015-05-13 Hannes Magnusson <bjori@php.net>
* fix test after moving it around
2015-05-13 Hannes Magnusson <bjori@php.net>
* PHPC-75: Improve coverage
2015-05-13 Hannes Magnusson <bjori@php.net>
* improve code coverage
2015-05-13 Hannes Magnusson <bjori@php.net>
* Improve test organization
2015-05-13 Hannes Magnusson <bjori@php.net>
* PHPC-75: Server error code coverage
2015-05-13 Hannes Magnusson <bjori@php.net>
* Fix test on travis
2015-05-13 Hannes Magnusson <bjori@php.net>
* PHPC-301: var_dump()ing Manager should show debug info
2015-05-13 Hannes Magnusson <bjori@php.net>
* PHPC-300: Add var_dump() debug info for Server
2015-05-13 Hannes Magnusson <bjori@php.net>
* PHPC-75: Improve coverage for the Manager
2015-05-13 Hannes Magnusson <bjori@php.net>
* PHPC-277: Ensure Query always serializes $query as a BSON object
2015-05-13 Hannes Magnusson <bjori@php.net>
* Split the test into success/failure
2015-05-13 Hannes Magnusson <bjori@php.net>
* PHPC-299: Annoying compiler warning
2015-05-13 Hannes Magnusson <bjori@php.net>
* PHPC-298: Coalesce small writes
2015-05-13 Hannes Magnusson <bjori@php.net>
* PHPC-284: Fix LogicException declaration
2015-05-12 Hannes Magnusson <bjori@php.net>
* bump submodules
2015-05-12 Hannes Magnusson <bjori@php.net>
* PHPC-279: Add 2.4 (and 2.6) to build matrix and ensure test suite compatibility
2015-05-06 Hannes Magnusson <bjori@php.net>
* PHPC-296: phongo.debug created for empty values
2015-05-06 Hannes Magnusson <bjori@php.net>
* Bump version
2015-05-06 Hannes Magnusson <bjori@php.net>
* Add 0.6.3 release notes
2015-05-06 Hannes Magnusson <bjori@php.net>
* prep for 0.6.3
2015-05-06 Hannes Magnusson <bjori@php.net>
* PHPC-294: Fix path to build directory
2015-05-06 Jeremy Mikola <jmikola@gmail.com>
* back to -dev
2015-05-06 Jeremy Mikola <jmikola@gmail.com>
* Add 0.6.2 release notes
2015-05-06 Jeremy Mikola <jmikola@gmail.com>
* Bump stability
2015-05-06 Jeremy Mikola <jmikola@gmail.com>
* back to -dev
2015-05-06 Jeremy Mikola <jmikola@gmail.com>
* Add 0.6.1 release notes
2015-05-06 Jeremy Mikola <jmikola@gmail.com>
* Bump stability
2015-05-05 Hannes Magnusson <bjori@php.net>
* Fix build outside of srcdir
2015-05-04 Hannes Magnusson <bjori@php.net>
* back to -dev
2015-05-04 Hannes Magnusson <bjori@php.net>
* Add 0.6.0 release notes
2015-05-04 Hannes Magnusson <bjori@php.net>
* Bump stability
2015-05-04 Hannes Magnusson <bjori@php.net>
* Exceptions live in their own folder now
2015-05-04 Hannes Magnusson <bjori@php.net>
* Add coveralls badger
2015-05-04 Hannes Magnusson <bjori@php.net>
* Use the coveralls token for 10gen-labs/mongo-php-driver-prototype not my personal one
2015-05-04 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #45 from jmikola/multiple-toArray
2015-05-04 Jeremy Mikola <jmikola@gmail.com>
* PHPC-282: Test for multiple Cursor::toArray() calls
2015-05-04 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #44 from jmikola/phpc-255
2015-05-04 Jeremy Mikola <jmikola@gmail.com>
* PHPC-255: Cursors cannot rewind after starting iteration
2015-05-04 Jeremy Mikola <jmikola@gmail.com>
* PHPC-282: Remove tests for multiple iterators on the same Cursor
2015-05-04 Jeremy Mikola <jmikola@gmail.com>
* PHPC-282: Cursor should not yield multiple iterators
2015-05-04 Jeremy Mikola <jmikola@gmail.com>
* PHPC-284: Create MongoDB\Driver\Exception\LogicException class
2015-05-04 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #43 from jmikola/phpc-283
2015-05-04 Jeremy Mikola <jmikola@gmail.com>
* Use common return for zval_to_bson() bsonSerialize() error path
2015-05-04 Jeremy Mikola <jmikola@gmail.com>
* PHPC-283: UnexpectedValueException for invalid bsonSerialize() return value
2015-05-04 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #42 from jmikola/phpc-179
2015-05-01 Jeremy Mikola <jmikola@gmail.com>
* PHPC-280: WriteConcern should always set journal/fsync boolean args
2015-05-01 Jeremy Mikola <jmikola@gmail.com>
* Document WriteConcern $w param as integer|string
2015-05-01 Jeremy Mikola <jmikola@gmail.com>
* PHPC-179: Show unset journal/fsync as null in WriteConcern debug handler
2015-05-04 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #40 from jmikola/phpc-274
2015-04-26 Jeremy Mikola <jmikola@gmail.com>
* PHPC-274: Regression test for root BSON\Serializable encoding
2015-04-26 Jeremy Mikola <jmikola@gmail.com>
* PHPC-275: object_to_bson() handling for invalid bsonSerialize() retval
2015-04-24 Jeremy Mikola <jmikola@gmail.com>
* PHPC-274: Fix zval_to_bson() encoding of BSON\Serializable objects
2015-05-04 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #41 from jmikola/phpc-278
2015-04-30 Jeremy Mikola <jmikola@gmail.com>
* PHPC-278: nModified may be null for legacy writes
2015-04-27 Hannes Magnusson <bjori@php.net>
* PHPC-269: Travis mojo again
2015-04-24 Hannes Magnusson <bjori@php.net>
* PHPC-272: Move exceptions into MongoDB\Driver\Exception namespace
2015-04-24 Hannes Magnusson <bjori@php.net>
* Post-release-bump-version
2015-04-24 Hannes Magnusson <bjori@php.net>
* Add 0.5.1 release notes
2015-04-24 Hannes Magnusson <bjori@php.net>
* Bump version to 0.5.1-alpha
2015-04-24 Hannes Magnusson <bjori@php.net>
* Include the pre-generated fixtures in the package
2015-04-24 Hannes Magnusson <bjori@php.net>
* PHPC-241: Don't try to use local timezone
2015-04-24 Hannes Magnusson <bjori@php.net>
* Fix extension name -- and recommend the developers flags
2015-04-24 Hannes Magnusson <bjori@php.net>
* PHPC-241: mongodb.debug improvements
2015-04-24 Hannes Magnusson <bjori@php.net>
* Fix unused result warning - and use the localtime in logs
2015-04-23 Hannes Magnusson <bjori@php.net>
* Update testing section and add related section
2015-04-23 Hannes Magnusson <bjori@php.net>
* Fix coveralls build
2015-04-23 Hannes Magnusson <bjori@php.net>
* PHPC-270: Several test fail because of missing enableTestCommands
2015-04-23 Hannes Magnusson <bjori@php.net>
* PHPC-270: add TESTCOMMANDS() skipif to confirm mongod is running with required options
2015-04-23 Hannes Magnusson <bjori@php.net>
* PHPC-269: Fix travis setup
2015-04-23 Hannes Magnusson <bjori@php.net>
* PHPC-268: Update tests to declare which environments they need
2015-04-23 Hannes Magnusson <bjori@php.net>
* PHPC-268: Add NEEDS() function to check if that environment is available
2015-04-23 Hannes Magnusson <bjori@php.net>
* Object IDs change, fix test
2015-04-23 Hannes Magnusson <bjori@php.net>
* PHPC-247: Remove 'faker' as prerequisite from running our full test suite
2015-04-23 Hannes Magnusson <bjori@php.net>
* PHPC-247: Remove on-the-fly composer generated fixtures
2015-04-23 Hannes Magnusson <bjori@php.net>
* PHPC-247: Use the bundled pregenerated fixtures
2015-04-23 Hannes Magnusson <bjori@php.net>
* PHPC-89: Bundle generated fixtures and make them easily loadable
2015-04-23 Hannes Magnusson <bjori@php.net>
* PHPC-260: Allow/use "object" in setTypeMap() as alias/preferred for "stdclass"
2015-04-23 Hannes Magnusson <bjori@php.net>
* PHPC-267; _id generated on embedded document
2015-04-23 Hannes Magnusson <bjori@php.net>
* PHPC-265: BSON encoding unsupoprted types (Resource) should fail
2015-04-23 Hannes Magnusson <bjori@php.net>
* PHPC-266: Add MongoDB\Driver\UnexpectedValueException
2015-04-22 Hannes Magnusson <bjori@php.net>
* Bump copyright -- happy 2015
2015-04-22 Hannes Magnusson <bjori@php.net>
* PHPC-75: Improve code coverage
2015-04-22 Hannes Magnusson <bjori@php.net>
* No need for code-coverage for contrib
2015-04-23 Hannes Magnusson <bjori@10gen.com>
* Merge pull request #39 from remicollet/issue-phpc258
2015-04-23 Remi Collet <fedora@famillecollet.com>
* PHPC-258: make all filed needed for test as role="test"
2015-04-22 Hannes Magnusson <bjori@php.net>
* Merge branch 'remicollet-issue-libbson'
2015-04-22 Remi Collet <fedora@famillecollet.com>
* PHPC-259: add --with-libbson option
2015-04-21 Jeremy Mikola <jmikola@gmail.com>
* Mongo Orchestration now works with PyMongo 3.0
2015-04-21 Hannes Magnusson <bjori@php.net>
* Back to -dev
2015-04-21 Hannes Magnusson <bjori@php.net>
* Add 0.5.0 release notes
2015-04-21 Hannes Magnusson <bjori@php.net>
* Bump stability
2015-04-21 Hannes Magnusson <bjori@php.net>
* Fix tests on 5.3 -- and use consistent db/collection
2015-04-21 Hannes Magnusson <bjori@php.net>
* Fix test - set my favorite ini option: date.timezone
2015-04-21 Hannes Magnusson <bjori@php.net>
* Fix tests
2015-04-21 Hannes Magnusson <bjori@php.net>
* PHPC-241: Include lib versions and uri in the logs
2015-04-21 Hannes Magnusson <bjori@php.net>
* Use the pretty MONGOC macros
2015-04-21 Hannes Magnusson <bjori@php.net>
* Remove dead code
2015-04-21 Hannes Magnusson <bjori@php.net>
* Move the init function to where all the others are and add folding markers
2015-04-21 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #37
2015-04-17 Jeremy Mikola <jmikola@gmail.com>
* Current element is already freed in php_phongo_cursor_free()
2015-04-16 Jeremy Mikola <jmikola@gmail.com>
* Test Cursor iteration handlers and ensure rewind doesn't reset position
2015-04-16 Jeremy Mikola <jmikola@gmail.com>
* Tests for multiple iterators sharing the same Cursor
2015-04-15 Jeremy Mikola <jmikola@gmail.com>
* PHPC-240: Rely on libmongoc for command cursor iteration
2015-04-14 Jeremy Mikola <jmikola@gmail.com>
* PHPC-240: Regression tests for command cursor getmore
2015-04-21 Hannes Magnusson <bjori@php.net>
* PHPC-254: Remove unused RINIT and RSHUTDOWN handlers
2015-04-21 Hannes Magnusson <bjori@php.net>
* PHPC-253: bump mongoc after CDRIVER-611 fix
2015-04-16 Hannes Magnusson <bjori@php.net>
* PHPC-249: empty array should be serialized as array
2015-04-16 Hannes Magnusson <bjori@php.net>
* PHPC-248: Allow ->setTypeMap() to set 'array' and 'stdclass'
2015-04-15 Hannes Magnusson <bjori@php.net>
* PHPC-245: Allow embedding objects in updates
2015-04-15 Hannes Magnusson <bjori@php.net>
* PHPC-245: executeUpdate() converts objects to arrays
2015-04-14 Hannes Magnusson <bjori@php.net>
* PHPC-244: Cannot use object of type Person as array
2015-04-14 Hannes Magnusson <bjori@php.net>
* PHPC-243: Manager->executeUpdate() option is supposed to be 'multi'
2015-04-14 Hannes Magnusson <bjori@10gen.com>
* Merge pull request #35 from bjori/PHPc-239
2015-04-14 Hannes Magnusson <bjori@php.net>
* PHPC-239: Cursor refcount issues
2015-04-14 Hannes Magnusson <bjori@10gen.com>
* Merge pull request #36 from derickr/align-and-missing-break-comment
2015-04-14 Derick Rethans <github@derickrethans.nl>
* Align code and added the "break intentionally ommitted" comment
2015-04-13 Hannes Magnusson <bjori@php.net>
* PHPC-237: Update PHP version requirement in package.xml
2015-04-10 Hannes Magnusson <bjori@php.net>
* post-release pump
2015-04-10 Hannes Magnusson <bjori@php.net>
* Add 0.4.1 release notes
2015-04-10 Jeremy Mikola <jmikola@gmail.com>
* Prep 0.4.1 release
2015-04-10 Hannes Magnusson <bjori@php.net>
* PHPC-236: 5.3-zts build broken
2015-04-10 Hannes Magnusson <bjori@php.net>
* Back to -dev
2015-04-10 Hannes Magnusson <bjori@php.net>
* prep 0.4.0 release
2015-04-10 Hannes Magnusson <bjori@php.net>
* Add 0.4.0 release notes
2015-04-10 Hannes Magnusson <bjori@php.net>
* Install ext/zlib so we can pecl install .tgz
2015-04-10 Hannes Magnusson <bjori@php.net>
* mo will automatically upgrade pymongo -- we need to downgrade
2015-04-10 Hannes Magnusson <bjori@php.net>
* mongo-orchestration isn't happy about the recent pymongo3.0 release
2015-04-10 Jeremy Mikola <jmikola@gmail.com>
* Update description for Cursor::getServer()
2015-04-09 Hannes Magnusson <bjori@php.net>
* PHPC-234: Run test suite automatically on FreeBSD 10.1
2015-04-09 Hannes Magnusson <bjori@php.net>
* PHPC-235: Fix out-of-src builds on FreeBSD
2015-04-09 Hannes Magnusson <bjori@php.net>
* Initial script to provision on FreeBSD
2015-04-09 Hannes Magnusson <bjori@php.net>
* Initial script to provision on Windows
2015-04-09 Hannes Magnusson <bjori@php.net>
* Fix windows build
2015-04-09 Hannes Magnusson <bjori@php.net>
* Simplify hash and fix windows build
2015-04-09 Hannes Magnusson <bjori@php.net>
* Rename the compat header - its much more then PHP5.3 issues now
2015-04-09 Hannes Magnusson <bjori@php.net>
* Fix build on windows -- no strtoll()
2015-04-09 Hannes Magnusson <bjori@php.net>
* Fix warning, return in noreturn function
2015-04-09 Hannes Magnusson <bjori@php.net>
* Fix zts build
2015-04-09 Hannes Magnusson <bjori@php.net>
* Fix php_flock() warning on windows
2015-04-09 Hannes Magnusson <bjori@php.net>
* PHPC-213: Disable extra bson type alignment
2015-04-09 Hannes Magnusson <bjori@php.net>
* Bumpidy bump
2015-04-09 Hannes Magnusson <bjori@php.net>
* PHPC-233: Mark the ctor as private for internally created value objects
2015-04-08 Hannes Magnusson <bjori@php.net>
* PHPC-80: Create distcheck target
2015-04-08 Hannes Magnusson <bjori@php.net>
* Convert int64 that overflow 32bit long to strings
2015-04-08 Hannes Magnusson <bjori@php.net>
* Convert overflown int64 to strings and print a warning
2015-04-08 Hannes Magnusson <bjori@php.net>
* Fix path to tests when executed through pecl run-tests
2015-04-08 Hannes Magnusson <bjori@php.net>
* Ignore untracked files in these repos
2015-04-08 Hannes Magnusson <bjori@php.net>
* libbson & mongoc seem to have fixed a lot of warnings -- enable all of ours
2015-04-08 Hannes Magnusson <bjori@php.net>
* Workaround CDRIVER-610
2015-04-08 Hannes Magnusson <bjori@php.net>
* Apparently there is a function for this!
2015-04-08 Hannes Magnusson <bjori@php.net>
* Fix zts build.. TSRMLS_FETCH_FROM_CTX declares variables and therefore must come first
2015-04-07 Hannes Magnusson <bjori@php.net>
* Remove noop log handler
2015-04-07 Hannes Magnusson <bjori@php.net>
* PHPC-231: Manager instances should not free streams that are still in use
2015-04-07 Hannes Magnusson <bjori@php.net>
* bump dependencies for PHPC-231 & PHPC-213
2015-04-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-232: Fix capitalization for WriteResult::getWriteConcern()
2015-04-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-231: Regression test for Manager destruct stream freeing
2015-04-06 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #33
2015-04-06 Jeremy Mikola <jmikola@gmail.com>
* Remove unnecessary php_phongo_cursor_free_current() call
2015-04-06 Jeremy Mikola <jmikola@gmail.com>
* Re-use cursor_free_current() in cursor_free()
2015-04-06 Jeremy Mikola <jmikola@gmail.com>
* PHPC-215: Fix Cursor iteration through IteratorIterator
2015-04-03 Jeremy Mikola <jmikola@gmail.com>
* PHPC-225: Test Cursor::isDead() and kill on destruct
2015-04-03 Jeremy Mikola <jmikola@gmail.com>
* PHPC-224: Consolidate Result and Cursor classes into one
2015-04-03 Jeremy Mikola <jmikola@gmail.com>
* PHPC-224: Remove Cursor class, which implements Iterator
2015-04-03 Hannes Magnusson <bjori@php.net>
* PHPC-207: Correct serialized data examples for ODS documentation
2015-04-03 Hannes Magnusson <bjori@php.net>
* PHPC-210 & PHPC-209 & PHPC-207 Fix BSON ODM/ODS
2015-04-03 Hannes Magnusson <bjori@php.net>
* PHPC-208: Restrict ODS to "__pclass" fieldnames
2015-04-03 Hannes Magnusson <bjori@php.net>
* PHPC-194: Implement Manager::selectServer() method to wrap SDAM server selection
2015-04-03 Hannes Magnusson <bjori@php.net>
* In PHP5.3 we hit the __wakeUp() which has slightly different exception
2015-04-03 Hannes Magnusson <bjori@10gen.com>
* Merge pull request #34 from serebro/patch-1
2015-04-03 Sergey <sergilyin@gmail.com>
* Docs small fix
2015-04-03 Hannes Magnusson <bjori@php.net>
* PHPC-190: Provide __wakeUp() to disable unserialize()
2015-04-03 Hannes Magnusson <bjori@php.net>
* This apt-get update is slow -- no need to execute it all the time
2015-04-03 Hannes Magnusson <bjori@php.net>
* PHPC-191 && PHPC-192: Add verify_expiry && verify_peer_name certificate verify options
2015-04-02 Hannes Magnusson <bjori@php.net>
* PHPC-223: Use explicit SSL options rather then stream context
2015-04-02 Hannes Magnusson <bjori@php.net>
* Fix setting debug logging as part of the driverOptions
2015-04-02 Hannes Magnusson <bjori@php.net>
* Private Public doesn't exists... This is supposed to be private :D
2015-04-02 Hannes Magnusson <bjori@php.net>
* Cleanup after test
2015-04-02 Hannes Magnusson <bjori@php.net>
* Make it possible to cleanup other db and collections used
2015-04-01 Hannes Magnusson <bjori@php.net>
* Fix tests when executed outside of srcroot
2015-04-01 Hannes Magnusson <bjori@php.net>
* PHPC-222: WriteConcernError can cause segfaults on Ubuntu Precise 32bit
2015-04-01 Hannes Magnusson <bjori@php.net>
* PHPC-220: BSON\UTCDatetime broken on 32bit
2015-04-01 Hannes Magnusson <bjori@php.net>
* Fix compile warning on 32bit
2015-04-01 Hannes Magnusson <bjori@php.net>
* Fix incompatible pointer type in PHP 5.3
2015-04-01 Hannes Magnusson <bjori@php.net>
* Include usable gdbinit
2015-04-01 Hannes Magnusson <bjori@php.net>
* PHPC-221: Add Ubuntu Precise (12.04.5) 32bit image
2015-04-01 Hannes Magnusson <bjori@php.net>
* PHPC-219 - BSON\Javascript segfaults on Ubuntu Precise 32bit
2015-04-01 Hannes Magnusson <bjori@php.net>
* PHPC-221: Rename the identifier to precise64 as we'll be adding 32bit soon
2015-03-31 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #32
2015-03-31 Jeremy Mikola <jmikola@gmail.com>
* PHPC-204: Result::toArray() should respect type map configuration
2015-03-31 Jeremy Mikola <jmikola@gmail.com>
* PHPC-203: Result::toArray() should proxy iterator_to_array($this)
2015-03-31 Hannes Magnusson <bjori@php.net>
* Make sure we install the latest package in case of multiple rebuilds of same name
2015-03-31 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #31
2015-03-30 Jeremy Mikola <jmikola@gmail.com>
* PHPC-214: Result does not need custom iterator classes
2015-03-30 Hannes Magnusson <bjori@php.net>
* Forcefully install the new archive, even though it exists
2015-03-30 Hannes Magnusson <bjori@php.net>
* PHPC-216: PHP5.5 change the prototype of get_current_key leading to
2015-03-30 Hannes Magnusson <bjori@php.net>
* PHPC-216: Include our pem files in the pecl archive
2015-03-30 Hannes Magnusson <bjori@php.net>
* PHPC-216: Use array(), not [], for PHP5.3 compatibility
2015-03-30 Hannes Magnusson <bjori@php.net>
* Split release target into release and packaging
2015-03-30 Hannes Magnusson <bjori@php.net>
* PHPC-218: Provision ubuntu image and install & run the test suite
2015-03-30 Hannes Magnusson <bjori@php.net>
* No need to sudo, run the scripts as priveleged
2015-03-30 Hannes Magnusson <bjori@php.net>
* PHPC-216: PHP5.3 test suite fixes
2015-03-30 Hannes Magnusson <bjori@php.net>
* PHPC-217: Include the connection tests in pecl package
2015-03-30 Hannes Magnusson <bjori@php.net>
* PHPC-213: Memory alignment issues on FreeBSD
2015-03-30 Hannes Magnusson <bjori@php.net>
* Fix stability name according to pecl rules
2015-03-30 Hannes Magnusson <bjori@php.net>
* PHPC-216: PHP5.3 test suite fixes
2015-03-27 Hannes Magnusson <bjori@php.net>
* Re align
2015-03-27 Hannes Magnusson <bjori@php.net>
* PHPC-212: undefined symbol: _mongoc_sasl_set_service_host - patch by remi@php.net
2015-03-26 Hannes Magnusson <bjori@php.net>
* Ignore coverage files
2015-03-25 Hannes Magnusson <bjori@php.net>
* bump version
2015-03-25 Hannes Magnusson <bjori@10gen.com>
* Merge pull request #28 from jmikola/phpc-201
2015-03-25 Hannes Magnusson <bjori@php.net>
* Add 0.3.1 release notes
2015-03-25 Hannes Magnusson <bjori@php.net>
* bump version for windows packaging fix
2015-03-25 Hannes Magnusson <bjori@php.net>
* PHPC-211: Windows libbson and mongoc config files missing in release archive
2015-03-25 Hannes Magnusson <bjori@php.net>
* Link to the docs on php.net
2015-03-25 Hannes Magnusson <bjori@php.net>
* Use pecl for installing
2015-03-25 Hannes Magnusson <bjori@php.net>
* Bump version
2015-03-25 Hannes Magnusson <bjori@php.net>
* Add 0.3.0 release notes
2015-03-25 Hannes Magnusson <bjori@php.net>
* Add config.w32 to package.xml
2015-03-25 Hannes Magnusson <bjori@php.net>
* Use absolute paths in skipifs too
2015-03-25 Jeremy Mikola <jmikola@gmail.com>
* PHPC-201: Rename Result::setTypemap() to setTypeMap()
2015-03-25 Hannes Magnusson <bjori@php.net>
* Update bundles for windows fixes
2015-03-25 Hannes Magnusson <bjori@php.net>
* PHPC-175: Fix header includes on Windows
2015-03-25 Hannes Magnusson <bjori@php.net>
* PHPC-175: Fix build on 32bit
2015-03-25 Hannes Magnusson <bjori@php.net>
* PHPC-175: Windows doesn't have these compiler attributes
2015-03-25 Hannes Magnusson <bjori@php.net>
* Fix windows bson config
2015-03-25 Hannes Magnusson <bjori@php.net>
* IPHPC-176: Copy build templates, add missing file & set build flags
2015-03-25 Hannes Magnusson <bjori@php.net>
* Use absolute paths on in tests so they can run easier on windows
2015-03-25 Hannes Magnusson <bjori@php.net>
* Absolute path is required to run tests on windows
2015-03-25 Hannes Magnusson <bjori@php.net>
* Allow mongoc_init() to not use our mm
2015-03-25 Hannes Magnusson <bjori@php.net>
* bump mongoc with windows fixes
2015-03-25 Hannes Magnusson <bjori@php.net>
* PHPC-200: Don't set stream initiator when creating client fails
2015-03-25 Hannes Magnusson <bjori@php.net>
* PHPC-199: Missing file from mongoc in config.m4
2015-03-24 Hannes Magnusson <bjori@php.net>
* Initial win32 attempt
2015-03-24 Hannes Magnusson <bjori@php.net>
* Bundle windows configs
2015-03-24 Hannes Magnusson <bjori@php.net>
* Improve code coverage
2015-03-23 Hannes Magnusson <bjori@php.net>
* Simplify
2015-03-23 Hannes Magnusson <bjori@php.net>
* Providing higher init size is worse then providing none
2015-03-23 Hannes Magnusson <bjori@php.net>
* Add raises() helper, similar to throws() except for php warnings/notices/deprecated/...
2015-03-24 Hannes Magnusson <bjori@php.net>
* ignore mongodb*tgz release files and "failed.txt" from run-tests
2015-03-24 Hannes Magnusson <bjori@php.net>
* Bump libbson with timeval fix and mongoc with various sdam fixes
2015-03-23 Jeremy Mikola <jmikola@gmail.com>
* Update PECL install instructions for alpha release
2015-03-23 Hannes Magnusson <bjori@php.net>
* Include the license file for next release
2015-03-23 Hannes Magnusson <bjori@php.net>
* Update naming after PHPC-174
2015-03-23 Hannes Magnusson <bjori@php.net>
* Bump version
2015-03-23 Hannes Magnusson <bjori@php.net>
* Add 0.2.0 release notes
2015-03-23 Hannes Magnusson <bjori@php.net>
* PHPC-174: Rename module registration, constants and so on to mongodb
2015-03-23 Hannes Magnusson <bjori@php.net>
* Bump release to 0.2.0-alpha
2015-03-23 Hannes Magnusson <bjori@php.net>
* Include the version and config templates
2015-03-23 Hannes Magnusson <bjori@php.net>
* Only run our tests as part of release for now
2015-03-23 Hannes Magnusson <bjori@php.net>
* PHPC-174: Rename phongo to mongodb
2015-03-23 Hannes Magnusson <bjori@php.net>
* PHPC-174: Use consistent extension names for PHP and HHVM drivers
2015-03-23 Hannes Magnusson <bjori@php.net>
* PHPC-195: Fix typo and couple of missing incldues
2015-03-23 Hannes Magnusson <bjori@php.net>
* PHPC-195: Remove mongoc/bson header file workarounds
2015-03-23 Hannes Magnusson <bjori@php.net>
* Test for PHPC-186
2015-03-23 Hannes Magnusson <bjori@php.net>
* Remove char * casting, the macro soup leads to incorrect sizeof
2015-03-20 Hannes Magnusson <bjori@php.net>
* Fix zts
2015-03-20 Hannes Magnusson <bjori@php.net>
* PHPC-183: Add -Wdeclaration-after-statement to --enable-developers-flags
2015-03-20 Hannes Magnusson <bjori@php.net>
* PHPC-183: Fix compiler warnings with -Wdeclaration-after-statement
2015-03-20 Hannes Magnusson <bjori@php.net>
* PHPC-189: Implement Manager->getServers()
2015-03-20 Hannes Magnusson <bjori@php.net>
* PHPC-188: Populate MongoDB\Driver\Server
2015-03-20 Hannes Magnusson <bjori@php.net>
* PHPC-24 PHPC-77 PHPC-69 Provide a functioning Server object
2015-03-19 Hannes Magnusson <bjori@php.net>
* bump submodule to mongoc 1.2.0-dev - includes sdam stuff
2015-03-18 Hannes Magnusson <bjori@php.net>
* PHPC-106: Comment out var_dump() data for now
2015-03-18 Hannes Magnusson <bjori@php.net>
* PHPC-106: Enable mongoc SDAM build
2015-03-18 Hannes Magnusson <bjori@php.net>
* PHPC-106: Connect asynchronouslyish
2015-03-19 Hannes Magnusson <bjori@php.net>
* PHPC-106: Implement the new poll callback
2015-03-18 Hannes Magnusson <bjori@php.net>
* In SDAM this is forbidden and throws exception
2015-03-18 Hannes Magnusson <bjori@php.net>
* Show the response when the test fails
2015-03-18 Hannes Magnusson <bjori@php.net>
* Store the original mongoc_uri_t not just the options bson
2015-03-18 Hannes Magnusson <bjori@php.net>
* Add a little tracing love
2015-03-18 Hannes Magnusson <bjori@php.net>
* Properly block on socket writes
2015-03-18 Hannes Magnusson <bjori@php.net>
* Fix null pointer exception
2015-03-17 Hannes Magnusson <bjori@php.net>
* Unhide this
2015-03-17 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #27
2015-03-17 Jeremy Mikola <jmikola@gmail.com>
* Return const struct pointers from zval getters
2015-03-17 Jeremy Mikola <jmikola@gmail.com>
* PHPC-181: Discard const qualifiers for PHP API
2015-03-17 Jeremy Mikola <jmikola@gmail.com>
* PHPC-181: Use const for pointer args where applicable
2015-03-16 Hannes Magnusson <bjori@php.net>
* PHPC-180: Fix limited batch import
2015-03-16 Hannes Magnusson <bjori@php.net>
* PHPC-180: No need to sleep anything, we get a fresh connection in next test
2015-03-16 Hannes Magnusson <bjori@php.net>
* PHPC-180: We now load 1024 users
2015-03-16 Hannes Magnusson <bjori@php.net>
* PHPC-180: We now generate 1024 users, only load the first 100
2015-03-16 Hannes Magnusson <bjori@php.net>
* PHPC-180: Cache the fixtures
2015-03-16 Hannes Magnusson <bjori@php.net>
* Surpress timezone warning by adding it to the ini
2015-03-16 Hannes Magnusson <bjori@php.net>
* PHPC-180: Rename constant and pass the cleanup uri explicitly
2015-03-16 Hannes Magnusson <bjori@php.net>
* PHPC-180: Replace this Orchestration wrapper with significantly simpler code
2015-03-16 Hannes Magnusson <bjori@php.net>
* Use underscore for the id so we can declare them as constants in php
2015-03-16 Hannes Magnusson <bjori@php.net>
* Use readable name for the replicaset nodes
2015-03-16 Hannes Magnusson <bjori@php.net>
* Minor README updates
2015-03-13 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #26
2015-03-12 Jeremy Mikola <jmikola@gmail.com>
* PHPC-168: Implement WriteResult::isAcknowledged()
2015-03-12 Jeremy Mikola <jmikola@gmail.com>
* PHPC-170: Don't set write concern on bulk unnecessarily
2015-03-12 Jeremy Mikola <jmikola@gmail.com>
* PHPC-177: Include all fields in WriteConcern debug output
2015-03-12 Jeremy Mikola <jmikola@gmail.com>
* Remove unnecessary Manager and apply EXPECTF patterns
2015-03-12 Jeremy Mikola <jmikola@gmail.com>
* Update Ubuntu's package repository before installing
2015-03-12 Hannes Magnusson <bjori@php.net>
* Fixed missing type specifier warning
2015-03-12 Hannes Magnusson <bjori@php.net>
* Fix build on MacOSX
2015-03-11 Hannes Magnusson <bjori@php.net>
* Its a bulk
2015-03-11 Hannes Magnusson <bjori@php.net>
* post release bump
2015-03-11 Hannes Magnusson <bjori@php.net>
* Add 0.1.5 release notes
2015-03-11 Hannes Magnusson <bjori@php.net>
* MO now actually creates this initial user, use correct subject to fix the X509 tests
2015-03-11 Hannes Magnusson <bjori@php.net>
* libbson 1.1.2 & mongoc 1.1.2
2015-03-11 Hannes Magnusson <bjori@php.net>
* Add "make help" since I always forget the names
2015-03-05 Hannes Magnusson <bjori@mongodb.com>
* PHP5.6 change serveral TLS verfication defaults
2015-03-05 Hannes Magnusson <bjori@mongodb.com>
* PHPC-171: SSL Doesn't work in PHP5.6
2015-03-04 Hannes Magnusson <bjori@mongodb.com>
* Bump submodules
2015-03-04 Hannes Magnusson <bjori@mongodb.com>
* Bump bundled version
2015-03-04 Hannes Magnusson <bjori@mongodb.com>
* Fix tests for MongoDB 3.0.0
2015-03-04 Hannes Magnusson <bjori@mongodb.com>
* PHPC-129: Fix tests for HIPPO can't throw InvalidArgumentException on argument errors
2015-03-03 Hannes Magnusson <bjori@mongodb.com>
* Bump mongoc for PHPC-167
2015-03-03 Hannes Magnusson <bjori@mongodb.com>
* Add micro-optimization tip for the future
2015-03-03 Hannes Magnusson <bjori@mongodb.com>
* PHPC-129: HIPPO can't throw InvalidArgumentException on argument errors
2015-03-03 Hannes Magnusson <bjori@mongodb.com>
* Simplify debug logging logic when running tests standalone
2015-03-03 Hannes Magnusson <bjori@mongodb.com>
* PHPC-163: Throw BulkWriteException on BulkWrite failure
2015-02-27 Hannes Magnusson <bjori@mongodb.com>
* PHPC-166: Disable (un)serializing of phongo objects
2015-02-20 Hannes Magnusson <bjori@mongodb.com>
* PHPC-165: Rename WriteBatch to BulkWrite
2015-02-19 Hannes Magnusson <bjori@mongodb.com>
* PHPC-164: Throw MongoDB\Driver\ConnectionTimeoutException
2015-02-19 Hannes Magnusson <bjori@mongodb.com>
* This is a Manager, not MongoClient
2015-02-19 Hannes Magnusson <bjori@mongodb.com>
* Ignore me. Trim trailing space
2015-02-19 Hannes Magnusson <bjori@mongodb.com>
* PHPC-107: Throw ExecutionTimeoutException for maxTimeMs
2015-02-18 Hannes Magnusson <bjori@mongodb.com>
* PHPC-159: memleak on failed path resolving
2015-02-18 Hannes Magnusson <bjori@mongodb.com>
* PHPC-158: Split queryFlags bitmask option into specific options
2015-02-18 Hannes Magnusson <bjori@mongodb.com>
* PHPC-157: Consolidate CommandResult and QueryResult classes
2015-02-18 Hannes Magnusson <bjori@mongodb.com>
* PHPC-157: QueryResult and CommandResult are now Result
2015-02-18 Hannes Magnusson <bjori@mongodb.com>
* rebase with Result.c
2015-02-18 Hannes Magnusson <bjori@mongodb.com>
* PHPC-157: Renamed getResponseDocument() to toArray()
2015-02-18 Hannes Magnusson <bjori@mongodb.com>
* PHPC-157: Consolidate CommandResult and QueryResult classes
2015-02-18 Hannes Magnusson <bjori@mongodb.com>
* PHPC-157: Remove QueryResult
2015-02-18 Hannes Magnusson <bjori@mongodb.com>
* bump mongoc
2015-02-18 Hannes Magnusson <bjori@mongodb.com>
* PHPC-155: WriteConcernError->getInfo() can be scalar
2015-02-18 Hannes Magnusson <bjori@mongodb.com>
* Add a note about PHPC-72
2015-02-18 Hannes Magnusson <bjori@mongodb.com>
* PHPC-154: WriteError can have info field
2015-02-06 Hannes Magnusson <bjori@mongodb.com>
* PHPC-153: Rename cursorFlags to queryFlags in Query
2015-02-06 Hannes Magnusson <bjori@mongodb.com>
* PHPC-152: Throw MongoDB\Driver\InvalidArgumentException on argument errors
2015-02-06 Hannes Magnusson <bjori@mongodb.com>
* Throw our RuntimeException, not SPL
2015-02-02 Hannes Magnusson <bjori@mongodb.com>
* post release bump
2015-02-02 Hannes Magnusson <bjori@mongodb.com>
* Add 0.1.4 release notes
2015-02-02 Hannes Magnusson <bjori@mongodb.com>
* prep for 0.1.4 release
2015-02-02 Hannes Magnusson <bjori@mongodb.com>
* PHPC-151: Bump to libbson-1.1.0 and mongoc-1.1.0 and fix build
2015-02-02 Hannes Magnusson <bjori@mongodb.com>
* This is a result iterator, not cursor
2015-02-02 Hannes Magnusson <bjori@mongodb.com>
* PHPC-149: Iterator holding on to dead results
2015-01-30 Hannes Magnusson <bjori@mongodb.com>
* NULLify after destroy and clear
2015-01-30 Hannes Magnusson <bjori@mongodb.com>
* 0.1.3 is the current release...
2015-01-29 Hannes Magnusson <bjori@mongodb.com>
* PHPC-148: var_dump()ing ObjectID should show the ObjectID
2015-01-29 Hannes Magnusson <bjori@mongodb.com>
* PHPC-144: MO first-user changes
2015-01-29 Hannes Magnusson <bjori@mongodb.com>
* Make sure we have a document before dumping it
2015-01-29 Hannes Magnusson <bjori@mongodb.com>
* Add SSL to the persistance hash
2015-01-28 Hannes Magnusson <bjori@mongodb.com>
* Quick note about var_dump()ing the cursor, rather then calling iterator_to_array()
2015-01-28 Hannes Magnusson <bjori@mongodb.com>
* PHPC-147: Document the ODS
2015-01-28 Hannes Magnusson <bjori@mongodb.com>
* PHPC-146: ReadPreferences swapped
2015-01-28 Hannes Magnusson <bjori@mongodb.com>
* PHPC-145: Typo in example, operators need to use single quotes
2015-01-28 Hannes Magnusson <bjori@mongodb.com>
* PHPC-143: skip auth tests when the server configuration required isn't available
2015-01-27 Hannes Magnusson <bjori@mongodb.com>
* Most of our issues with MO seem to be fixed in master
2015-01-27 Hannes Magnusson <bjori@mongodb.com>
* PHPC-142: add 'list-servers' target to enumerate all running MO servers
2015-01-27 Hannes Magnusson <bjori@mongodb.com>
* PHPC-140: var_dump()ing WriteConcernError and WriteError
2015-01-27 Hannes Magnusson <bjori@mongodb.com>
* PHPC-139: var_dump()ing WriteBatch
2015-01-27 Hannes Magnusson <bjori@mongodb.com>
* PHPC-138: var_dump()ing WriteConcern
2015-01-27 Hannes Magnusson <bjori@mongodb.com>
* PHPC-138: var_dump()ing ReadPreference
2015-01-26 Hannes Magnusson <bjori@mongodb.com>
* PHPC-137: var_dump()ing CursorID should show the Cursor ID
2015-01-09 Hannes Magnusson <bjori@mongodb.com>
* simplify
2015-01-09 Hannes Magnusson <bjori@mongodb.com>
* PHPC-134: Add the internal results here too
2015-01-09 Hannes Magnusson <bjori@mongodb.com>
* PHPC-136: var_dump() CommandResult and QueryResult
2015-01-09 Hannes Magnusson <bjori@mongodb.com>
* PHPC-133: var_dump()ing cursor
2015-01-09 Hannes Magnusson <bjori@mongodb.com>
* PHPC-135: Fix memory leak var_dump()ing Command
2015-01-09 Hannes Magnusson <bjori@mongodb.com>
* PHPC-135: Fix memory leak var_dump()ing Query and add test
2015-01-09 Hannes Magnusson <bjori@mongodb.com>
* PHPC-134: Add debug info for WriteResult
2015-01-08 Hannes Magnusson <bjori@mongodb.com>
* PHPC-110: Fix segfault on standalone nodes :)
2015-01-08 Hannes Magnusson <bjori@mongodb.com>
* PHPC-135: Implement debug handler for Query and Command
2015-01-08 Hannes Magnusson <bjori@mongodb.com>
* PHPC-110: Fix segfault when var_dump()ing before connecting
2015-01-07 Hannes Magnusson <bjori@mongodb.com>
* PHPC-110: Add var_dump() support for MongoDB\Driver\Manager
2015-01-07 Hannes Magnusson <bjori@mongodb.com>
* Revert "PHPC-131: Place the rendered files out of this dir"
2015-01-07 Hannes Magnusson <bjori@mongodb.com>
* PHPC-131: Place the rendered files out of this dir
2015-01-07 Hannes Magnusson <bjori@mongodb.com>
* PHPC-131: Add jira issue collector
2015-01-06 Hannes Magnusson <bjori@mongodb.com>
* PHPC-128: MO presets directory needs to be configurable
2015-01-06 Hannes Magnusson <bjori@mongodb.com>
* PHPC-128: if there is no cleanup uri then skipit
2015-01-06 Hannes Magnusson <bjori@mongodb.com>
* PHPC-128: Maybe orchestration doesn't like IPs?
2015-01-06 Hannes Magnusson <bjori@mongodb.com>
* PHPC-128: more travis debugging
2015-01-06 Hannes Magnusson <bjori@mongodb.com>
* PHPC-128: ping should be fast
2015-01-06 Hannes Magnusson <bjori@mongodb.com>
* PHPC-130: Update the get_current_key handler to support pre-5.5
2015-01-06 Hannes Magnusson <bjori@mongodb.com>
* PHPC-128: Debugging why mo on travis doesn't start
2015-01-06 Hannes Magnusson <bjori@mongodb.com>
* PHPC-128: use consistent env variable
2015-01-06 Hannes Magnusson <bjori@mongodb.com>
* PHPC-128: Start the nodes using MO
2015-01-06 Hannes Magnusson <bjori@mongodb.com>
* PHPC-128: -See if this works better for travis
2015-01-06 Hannes Magnusson <bjori@mongodb.com>
* PHPC-128: Fix travis setup
2015-01-06 Hannes Magnusson <bjori@mongodb.com>
* PHPC-116: Cursor methods should call their respective iterator function handlers
2015-01-06 Hannes Magnusson <bjori@mongodb.com>
* Smiplify cursor/results to prep for PHPC-116
2015-01-06 Hannes Magnusson <bjori@mongodb.com>
* We don't need to debug this test anymore
2015-01-06 Hannes Magnusson <bjori@mongodb.com>
* PHPC-116: Implement invalidate_current handler to reduce code
2015-01-06 Hannes Magnusson <bjori@mongodb.com>
* PHPC-128: Startup the mongodb-org freshly installed mongodb
2015-01-05 Hannes Magnusson <bjori@mongodb.com>
* PHPC-128: Set the uri to use on travis
2015-01-05 Hannes Magnusson <bjori@mongodb.com>
* PHPC-128: Fix running tests on travis
2015-01-05 Hannes Magnusson <bjori@mongodb.com>
* We use corporate coverity now
2015-01-05 Hannes Magnusson <bjori@mongodb.com>
* PHP-127: Fix test, use the string stderr, not resource STDERR
2015-01-05 Hannes Magnusson <bjori@mongodb.com>
* PHPC-42: Implement root level (full document) ODM style serialization
2015-01-05 Hannes Magnusson <bjori@mongodb.com>
* PHPC-125: pointer to out of scope variable :]
2015-01-05 Hannes Magnusson <bjori@mongodb.com>
* PHPC-123: Wrong sizeof argument
2015-01-05 Hannes Magnusson <bjori@mongodb.com>
* PHPC-124: Buffer not null terminated
2015-01-05 Hannes Magnusson <bjori@mongodb.com>
* PHPC-126: Fixed unchecked return
2015-01-02 Hannes Magnusson <bjori@mongodb.com>
* PHPC-42: BSON Serialization for classes
2014-12-31 Hannes Magnusson <bjori@mongodb.com>
* PHPC-121: Use BSON\Serialize::bsonSerialize() during serialization
2014-12-31 Hannes Magnusson <bjori@mongodb.com>
* PHPC-96: Add QueryResult->setTypemap() to overwrite array/object mapping
2014-12-31 Hannes Magnusson <bjori@mongodb.com>
* WriteConcernError test
2014-12-31 Hannes Magnusson <bjori@mongodb.com>
* initialize correctly
2014-12-31 Hannes Magnusson <bjori@mongodb.com>
* fix title
2014-12-31 Hannes Magnusson <bjori@mongodb.com>
* PHPC-96 & PHPC-119 call the new bsonUnserialize method and optimize things a little
2014-12-31 Hannes Magnusson <bjori@mongodb.com>
* PHPC-120: BSON\toArray should support classmap to unserialize as
2014-12-31 Hannes Magnusson <bjori@mongodb.com>
* PHPC-119 && PHPC-49: Create PHP interfaces for BSON (un-)serialization
2014-12-31 Hannes Magnusson <bjori@mongodb.com>
* Fix array return
2014-12-30 Hannes Magnusson <bjori@mongodb.com>
* No need for these anymore
2014-12-30 Hannes Magnusson <bjori@mongodb.com>
* PHPC-118: Use MongoDB\Driver namespace for phongo
2014-12-30 Hannes Magnusson <bjori@mongodb.com>
* PHPC-96: Retrieve arrays as custom objects
2014-12-29 Hannes Magnusson <bjori@mongodb.com>
* PHPC-117: Simplify bson deserialization code
2014-12-23 Hannes Magnusson <bjori@mongodb.com>
* PHPC-50: Implement checking socket state handler
2014-12-23 Hannes Magnusson <bjori@mongodb.com>
* latest and gratest libmongoc fixes
2014-12-23 Hannes Magnusson <bjori@mongodb.com>
* PHPC-115: Remove now-useless GeneratedId
2014-12-23 Hannes Magnusson <bjori@mongodb.com>
* If there is no error, pass null to avoid the type hint
2014-12-22 Hannes Magnusson <bjori@mongodb.com>
* PHPC-113: WriteConcernError is just one error, not multiple
2014-12-23 Hannes Magnusson <bjori@mongodb.com>
* PHPC-114: Implement WriteConcernError->getMessage()
2014-12-23 Hannes Magnusson <bjori@mongodb.com>
* Avoid invalid read when logging from replicaset
2014-12-23 Hannes Magnusson <bjori@mongodb.com>
* Simplify cli debugging
2014-12-22 Hannes Magnusson <bjori@mongodb.com>
* PHPC-112: Sping up ReplicaSet
2014-12-22 Hannes Magnusson <bjori@mongodb.com>
* Bump version
2014-12-22 Hannes Magnusson <bjori@mongodb.com>
* The development of this driver is now under the PHPC jira project
2014-12-22 Hannes Magnusson <bjori@mongodb.com>
* Bump release version in the docs
2014-12-22 Hannes Magnusson <bjori@mongodb.com>
* Add 0.1.3 release notes
2014-12-22 Hannes Magnusson <bjori@mongodb.com>
* Fix paths to root dir .phar
2014-12-22 Hannes Magnusson <bjori@mongodb.com>
* Add new files to the packager
2014-12-22 Hannes Magnusson <bjori@mongodb.com>
* Update composer after the repo renaming
2014-12-22 Hannes Magnusson <bjori@mongodb.com>
* mongoc requires newer libbson now
2014-12-22 Hannes Magnusson <bjori@mongodb.com>
* bump mongoc
2014-12-22 Hannes Magnusson <bjori@mongodb.com>
* rename the Mongo Orchestration name to 'mo'
2014-12-22 Hannes Magnusson <bjori@mongodb.com>
* MO PR#161 includes fixes from 155, and adds ssl auth support
2014-12-22 Hannes Magnusson <bjori@mongodb.com>
* PHPC-33: Implement X509 support via PHP streams
2014-12-22 Hannes Magnusson <bjori@mongodb.com>
* Fix typo in persistent hash
2014-12-19 Jeremy Mikola <jmikola@gmail.com>
* Add Apache 2 license
2014-12-19 Hannes Magnusson <bjori@mongodb.com>
* PHPC-33: Add tests for X509
2014-12-19 Hannes Magnusson <bjori@mongodb.com>
* bump mongoc
2014-12-19 Hannes Magnusson <bjori@mongodb.com>
* PHPC-104: Throw MongoDB\AuthenticationException on auth failure
2014-12-19 Hannes Magnusson <bjori@mongodb.com>
* Fix test titles
2014-12-18 Hannes Magnusson <bjori@mongodb.com>
* bump mongoc
2014-12-18 Hannes Magnusson <bjori@mongodb.com>
* Remove useless stuff
2014-12-18 Hannes Magnusson <bjori@mongodb.com>
* Workaround https://github.com/10gen/mongo-orchestration/issues/154
2014-12-18 Hannes Magnusson <bjori@mongodb.com>
* PHPC-31: Implement PLAIN authentication via PHP streams
2014-12-18 Hannes Magnusson <bjori@mongodb.com>
* PHPC-31: Test for PLAIN authentication mechanism
2014-12-18 Hannes Magnusson <bjori@mongodb.com>
* PHPC-45: Orchestrate LDAP/PLAIN servers
2014-12-18 Hannes Magnusson <bjori@mongodb.com>
* PHPC-45: Orchestarte PLAIN/LDAP authentication mechanism
2014-12-18 Hannes Magnusson <bjori@mongodb.com>
* PHPC-103: Virtualize OpenLDAP server using CentOS
2014-12-18 Hannes Magnusson <bjori@mongodb.com>
* Reorganize Vagrantfile to make room for more images
2014-12-18 Hannes Magnusson <bjori@mongodb.com>
* PHPC-2: Persist connection by the dsn
2014-12-18 Hannes Magnusson <bjori@mongodb.com>
* PHPC-101: throw MongoDB\DuplicateKeyException
2014-12-18 Hannes Magnusson <bjori@mongodb.com>
* Enable test and fixit
2014-12-17 Hannes Magnusson <bjori@mongodb.com>
* PHON-85: Improve test
2014-12-17 Hannes Magnusson <bjori@mongodb.com>
* ignore ctags and local vimrc
2014-12-17 Hannes Magnusson <bjori@mongodb.com>
* PHON-99: Add & Implement SSLConnectionException
2014-12-17 Hannes Magnusson <bjori@mongodb.com>
* PHON-31: Add stream context options
2014-12-17 Hannes Magnusson <bjori@mongodb.com>
* PHON-100: Implement connectiontimeoutms
2014-12-17 Hannes Magnusson <bjori@mongodb.com>
* PHON-31: Do not overload the stream_initiator with tsrm, we want it for stream context later
2014-12-17 Hannes Magnusson <bjori@mongodb.com>
* PHON-98: Implement and properly throw MongoDB\ConnectionException
2014-12-17 Hannes Magnusson <bjori@mongodb.com>
* PHON-97: Add MongoDB\RuntimeException
2014-12-17 Hannes Magnusson <bjori@mongodb.com>
* PHON-96: Create MongoDB\Exception interface
2014-12-16 Hannes Magnusson <bjori@mongodb.com>
* PHON-22: New test to verify standard authentication
2014-12-16 Hannes Magnusson <bjori@mongodb.com>
* PHON-23: Add test for connecting to SSL server
2014-12-16 Hannes Magnusson <bjori@mongodb.com>
* PHON-6: Split normal SSL and X509 servers
2014-12-16 Hannes Magnusson <bjori@mongodb.com>
* PHON-3: Orchestrate standard authentication
2014-12-16 Hannes Magnusson <bjori@mongodb.com>
* PHON-6: Orchestrate SSL and X509
2014-12-16 Hannes Magnusson <bjori@mongodb.com>
* PHON-7: Trivial Monog Orchestration abstraction
2014-12-16 Hannes Magnusson <bjori@mongodb.com>
* exit on failure - and include a greppable error
2014-12-16 Hannes Magnusson <bjori@mongodb.com>
* PHON-92: Create standalone MongoDB server
2014-12-16 Hannes Magnusson <bjori@mongodb.com>
* PHONG-91: Yes to all questions when installing mongodb
2014-12-16 Hannes Magnusson <bjori@mongodb.com>
* PHON-91: Use the vm by default, allow it to be overridden by the environment variable
2014-12-16 Hannes Magnusson <bjori@mongodb.com>
* PHON-5: Whopsy, missing file for startting servers hidden by gitignore
2014-12-16 Hannes Magnusson <bjori@mongodb.com>
* PHON-91: Use Vagrant to virtualise mongod
2014-12-16 Hannes Magnusson <bjori@mongodb.com>
* return true on success
2014-12-15 Hannes Magnusson <bjori@mongodb.com>
* Use the MONGODB_URI constant
2014-12-15 Hannes Magnusson <bjori@mongodb.com>
* PHON-5: Use Mongo Orchestration to manage MongoDB servers
2014-12-15 Hannes Magnusson <bjori@mongodb.com>
* Seperate code from functions
2014-12-16 Hannes Magnusson <bjori@mongodb.com>
* remove hyperbole description
2014-12-15 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #24 from hannesvdvreken/master
2014-12-15 Hannes Van De Vreken <vandevreken.hannes@gmail.com>
* Fixed spelling mistake
2014-12-12 Hannes Magnusson <bjori@mongodb.com>
* PHP-1337: Implement killing a MongoDB Cursor
2014-12-12 Hannes Magnusson <bjori@mongodb.com>
* PHP-1336: Use Cursor->getId(), not Cursor->getCursorId()
2014-12-12 Hannes Magnusson <bjori@mongodb.com>
* Call the bson module init
2014-12-12 Hannes Magnusson <bjori@mongodb.com>
* PHP-1338: There is actually no DBRef BSON type, its a convention
2014-12-12 Hannes Magnusson <bjori@mongodb.com>
* PHP-1181: Improve coverage for BSON\UTCDateTime
2014-12-12 Hannes Magnusson <bjori@mongodb.com>
* PHP-1181: Improve coverage for BSON\Timestamp
2014-12-12 Hannes Magnusson <bjori@mongodb.com>
* PHP-1181: Improve coverage for BSON\Regex
2014-12-12 Hannes Magnusson <bjori@mongodb.com>
* PHP-1181: Improve coverage for BSON\ObjectID
2014-12-12 Hannes Magnusson <bjori@mongodb.com>
* Improve exception testing
2014-12-12 Hannes Magnusson <bjori@mongodb.com>
* PHP-1181: uhm.. This is minkey test!
2014-12-12 Hannes Magnusson <bjori@mongodb.com>
* PHP-1181: Increse BSON\Binary testcoverage
2014-12-12 Jeremy Mikola <jmikola@gmail.com>
* Fix composer update and test execution for userland library
2014-12-12 Hannes Magnusson <bjori@mongodb.com>
* Proper librt linking on platforms that need it
2014-12-12 Jeremy Mikola <jmikola@gmail.com>
* Reformat composer.json and remove redundant autoload block
2014-12-12 Hannes Magnusson <bjori@mongodb.com>
* Skip phpunit tests for now, its a bit of an chicken-and-egg issue
2014-12-12 Hannes Magnusson <bjori@mongodb.com>
* Update links after moving the repo to 10gen-labs from bjori
2014-12-11 Hannes Magnusson <bjori@mongodb.com>
* Fix instructions
2014-12-11 Hannes Magnusson <bjori@mongodb.com>
* PHP-1334: Fix build on MacOSX: Don't hardcode librt, we already conditionally check for it
2014-12-10 Jeremy Mikola <jmikola@gmail.com>
* Require composer deps before test tasks
2014-12-10 Jeremy Mikola <jmikola@gmail.com>
* Use CRUD's PHPUnit config when running tests
2014-12-10 Jeremy Mikola <jmikola@gmail.com>
* Use composer update instead of install
2014-12-09 Hannes Magnusson <bjori@mongodb.com>
* I have no idea what made me make BSON\Pool
2014-12-09 Hannes Magnusson <bjori@mongodb.com>
* Run the phongo-crud tests to
2014-12-09 Hannes Magnusson <bjori@mongodb.com>
* PHP-1324: Embed phongo-crud tests under 'testunit' and 'testall' targets
2014-12-09 Hannes Magnusson <bjori@mongodb.com>
* Add the phongo-crud to the composer autoloader
2014-12-09 Hannes Magnusson <bjori@mongodb.com>
* bump libmongoc without ssl=prefer
2014-12-09 Hannes Magnusson <bjori@mongodb.com>
* PHP-1329: Remove ssl=prefer option
2014-12-09 Hannes Magnusson <bjori@mongodb.com>
* Fetch phongo-crud to share its tests
2014-12-09 Hannes Magnusson <bjori@mongodb.com>
* Search for composer.phar too for those not with it globally installed
2014-12-09 Hannes Magnusson <bjori@mongodb.com>
* PHP-1323: Document install instructions from vcs
2014-12-08 Hannes Magnusson <bjori@mongodb.com>
* Add documentation build and release targets
2014-12-08 Hannes Magnusson <bjori@mongodb.com>
* Bump install instructions
2014-12-08 Hannes Magnusson <bjori@mongodb.com>
* Add couple of more reminders
2014-12-08 Hannes Magnusson <bjori@mongodb.com>
* Bump version
2014-12-08 Hannes Magnusson <bjori@mongodb.com>
* Fix argument passing :]
2014-12-08 Hannes Magnusson <bjori@mongodb.com>
* Add release notes
2014-12-08 Hannes Magnusson <bjori@mongodb.com>
* PHP-1322: More renaming
2014-12-08 Hannes Magnusson <bjori@mongodb.com>
* PHP-1322 Rename count methods in WriteResults
2014-12-08 Hannes Magnusson <bjori@mongodb.com>
* PHP-1320: $batch->update() fails when replacing entire document
2014-12-08 Hannes Magnusson <bjori@mongodb.com>
* PHP-1319: Convert this into normalish cursor
2014-12-05 Hannes Magnusson <bjori@mongodb.com>
* PHP-1319: Implement command cursors
2014-12-08 Hannes Magnusson <bjori@mongodb.com>
* Add tracing to mongoc
2014-12-05 Hannes Magnusson <bjori@mongodb.com>
* We are throwing exception here, doesn't matter if we are assigning return value
2014-12-05 Hannes Magnusson <bjori@mongodb.com>
* Throw exception on failure
2014-12-05 Hannes Magnusson <bjori@mongodb.com>
* Make phongo_throw_exception variadic to improve error messages
2014-12-05 Hannes Magnusson <bjori@mongodb.com>
* Fix reference counting of nested bson objects
2014-12-04 Hannes Magnusson <bjori@mongodb.com>
* Bump version
2014-12-04 Hannes Magnusson <bjori@mongodb.com>
* Commit the release notes
2014-12-03 Hannes Magnusson <bjori@mongodb.com>
* Take the release notes from the release file
2014-12-03 Hannes Magnusson <bjori@mongodb.com>
* Lets not actually tag automatically, just ask politely
2014-12-03 Hannes Magnusson <bjori@mongodb.com>
* Whopsy, we need $$ to read the output
2014-12-03 Hannes Magnusson <bjori@mongodb.com>
* Update toc and run syntax highlitghting automatically
2014-12-03 Hannes Magnusson <bjori@mongodb.com>
* Add command docs
2014-12-03 Hannes Magnusson <bjori@mongodb.com>
* WS
2014-12-03 Hannes Magnusson <bjori@mongodb.com>
* Initial documentation
2014-12-03 Hannes Magnusson <bjori@mongodb.com>
* Move docs to old-docs making way for actual documentation
2014-12-03 Hannes Magnusson <bjori@mongodb.com>
* Remove unused command
2014-12-02 Hannes Magnusson <bjori@mongodb.com>
* Integer IDs can also be int32
2014-12-02 Hannes Magnusson <bjori@mongodb.com>
* Fix 32bit builds
2014-12-02 Hannes Magnusson <bjori@mongodb.com>
* PHP-1195: Integers are now represented as int32, as long as they fit
2014-12-02 Hannes Magnusson <bjori@mongodb.com>
* Differenciate the connection type by the SSL option
2014-12-02 Hannes Magnusson <bjori@mongodb.com>
* Bail out when we cannot connect to the server!
2014-12-02 Hannes Magnusson <bjori@mongodb.com>
* PHP-1195: Error out on 32bit platforms if we cannot represent the int
2014-12-02 Hannes Magnusson <bjori@mongodb.com>
* PHP-1195: Remove Int32 and Int64 classess
2014-12-02 Hannes Magnusson <bjori@mongodb.com>
* Remove misterious BSON\Log class
2014-12-02 Hannes Magnusson <bjori@mongodb.com>
* bump libmongoc with ssl fix
2014-12-02 Hannes Magnusson <bjori@mongodb.com>
* PHP-1175: Add Support for SSL=true and SSL=prefer
2014-12-02 Hannes Magnusson <bjori@mongodb.com>
* PHP-1175: Compile against OpenSSL
2014-12-01 Hannes Magnusson <bjori@mongodb.com>
* Improve API consistency between WriteConcern and ReadPreference
2014-11-26 Hannes Magnusson <bjori@mongodb.com>
* PHP-1296: Implement WriteConcerns
2014-11-26 Hannes Magnusson <bjori@mongodb.com>
* PHP-1295: Memory leak when generating ID for inserts
2014-11-26 Hannes Magnusson <bjori@mongodb.com>
* PHP-1294: Emtpy Query Result should still return QueryResult
2014-11-26 Hannes Magnusson <bjori@mongodb.com>
* Add an example "document browser"
2014-11-26 Hannes Magnusson <bjori@mongodb.com>
* PHP-1293: Writing all debug info is not a good default
2014-11-26 Hannes Magnusson <bjori@mongodb.com>
* WS
2014-11-26 Hannes Magnusson <bjori@mongodb.com>
* We only allow object/array here, not need for this extra code
2014-11-26 Hannes Magnusson <bjori@mongodb.com>
* PHP-1292: BSON Arrays should be... PHP Arrays
2014-11-26 Hannes Magnusson <bjori@mongodb.com>
* PHP-1291: memleak when serializing nested objects/array
2014-11-26 Hannes Magnusson <bjori@mongodb.com>
* Initialize to NULL
2014-11-26 Hannes Magnusson <bjori@mongodb.com>
* Enable the corrupt BSON handler for debugging
2014-11-26 Hannes Magnusson <bjori@mongodb.com>
* Add missing arginfo for the BSON encoding functions
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* List commits per release in the RELEASE file
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* Bump version
2014-11-26 Hannes Magnusson <bjori@10gen.com>
* Update README for current situation
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* Ignore the run-tests php.ini
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* We haven't executed the test target yet!
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* Fix coverage build
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* Create the tag at the end of making the release ball
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* Compiler warnings
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* Running the tests is of course part of a release
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* Ignore generated files
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* Expose version constants and stability
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* Fix version number
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* Get the release number from the module
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* Update travis for build system changes
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* Fix building out of root
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* Generate package.xml and release archive
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* Don't Move this to a dedicated patch target
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* Add CREDITS
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* Add a target to generate a ChangeLog
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* Add a custom build target dependency
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* This seems to be the conventional wisdom setting ulimit on travis
2014-11-25 Hannes Magnusson <bjori@mongodb.com>
* PHP-1289: Automatically apply our required patches
2014-11-24 Hannes Magnusson <bjori@mongodb.com>
* No longer needed
2014-11-24 Hannes Magnusson <bjori@mongodb.com>
* PHP-1289: Revamp the build system to embed libmongoc, libbson and yajl
2014-11-24 Hannes Magnusson <bjori@mongodb.com>
* Set ulimit before our trap
2014-11-24 Hannes Magnusson <bjori@mongodb.com>
* Don't include libbson or libmongoc in the coverage report
2014-11-24 Hannes Magnusson <bjori@mongodb.com>
* Fixed CID-60852: Pointer to local outside scope
2014-11-24 Hannes Magnusson <bjori@mongodb.com>
* This is the master branch
2014-11-24 Hannes Magnusson <bjori@mongodb.com>
* Fix ZTS - and all the segfaults
2014-11-21 Hannes Magnusson <bjori@mongodb.com>
* Attempt to fix stream closing in zts
2014-11-21 Hannes Magnusson <bjori@mongodb.com>
* Fix zts builds
2014-11-21 Hannes Magnusson <bjori@mongodb.com>
* Use my libmongoc fork for now
2014-11-21 Hannes Magnusson <bjori@mongodb.com>
* bump libmongoc in my fork
2014-11-21 Hannes Magnusson <bjori@mongodb.com>
* Fixed various memory leaks and compiler warnings
2014-11-21 Hannes Magnusson <bjori@mongodb.com>
* PHP-1189: Implement BSON regex type
2014-11-21 Hannes Magnusson <bjori@mongodb.com>
* Fixed couple of constify, and renamed a functino to be consistent with'em all
2014-11-11 Jeremy Mikola <jmikola@gmail.com>
* PHP-1189: BSON Regex type
2014-11-21 Hannes Magnusson <bjori@mongodb.com>
* PHP-1187: Implement BSON binary type
2014-11-21 Hannes Magnusson <bjori@mongodb.com>
* Move the helpers up rather then in the middle of the vtable
2014-11-21 Hannes Magnusson <bjori@mongodb.com>
* Fix some compiler warnings: (de-)constify
2014-11-20 Hannes Magnusson <bjori@mongodb.com>
* bump libbson
2014-11-20 Hannes Magnusson <bjori@mongodb.com>
* PHP-1188: Implement BSON code and code with scope types
2014-11-20 Hannes Magnusson <bjori@mongodb.com>
* Fixed zts macros
2014-11-20 Hannes Magnusson <bjori@mongodb.com>
* PHP-1191: Implement BSON timestamp type
2014-11-20 Hannes Magnusson <bjori@mongodb.com>
* Fix arginfo and proto
2014-11-20 Hannes Magnusson <bjori@mongodb.com>
* Fix test: Whoopsy. Missed the DONE section
2014-11-20 Hannes Magnusson <bjori@mongodb.com>
* PHP-1194: Implement BSON MaxKey and MinKey types
2014-11-20 Hannes Magnusson <bjori@mongodb.com>
* Bump libmongoc, and temporary switch to my fork with the needed patches
2014-11-20 Hannes Magnusson <bjori@mongodb.com>
* Fixed PHP-1174: Implement WriteBatch::count()
2014-11-19 Hannes Magnusson <bjori@mongodb.com>
* PHP-1190: Implement BSON\UTCDateTime
2014-11-19 Hannes Magnusson <bjori@mongodb.com>
* PHP-1185: Add more Cursor related methods
2014-11-19 Hannes Magnusson <bjori@mongodb.com>
* Fixed PHP-1185: Implement Cursor class
2014-11-19 Hannes Magnusson <bjori@mongodb.com>
* PHP-1183: Implement default Iterator class for QueryResult & CommandResult
2014-11-19 Hannes Magnusson <bjori@mongodb.com>
* Avoid compiler warnings
2014-11-19 Hannes Magnusson <bjori@mongodb.com>
* Fixed PHP-1232: Implement the TODO
2014-11-19 Hannes Magnusson <bjori@mongodb.com>
* Do not test the error messages from the server
2014-11-19 Hannes Magnusson <bjori@mongodb.com>
* Tell PHP this is indeed an exposed stream that it doesn't have to worry about
2014-11-19 Hannes Magnusson <bjori@mongodb.com>
* Fix memory leak when splitting a ns
2014-11-18 Hannes Magnusson <bjori@mongodb.com>
* Make sure we have something to free
2014-11-04 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #22 from hannesvdvreken/patch-1
2014-11-03 Hannes Van De Vreken <vandevreken.hannes@gmail.com>
* Typo in readme? "admit" instead of "admin"
2014-10-20 Hannes Magnusson <bjori@10gen.com>
* Merge pull request #21 from christkv/master
2014-10-20 Christian Kvalheim <christkv@gmail.com>
* Fixed build for OSX and llvm
2014-10-19 Jeremy Mikola <jmikola@gmail.com>
* Rewrite README and document install/test process
2014-10-17 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #18 from bjori/php1236-test-fixtures
2014-10-16 Jeremy Mikola <jmikola@gmail.com>
* PHP-1180: Create make target to install Composer dependencies (for tests)
2014-08-05 Jeremy Mikola <jmikola@gmail.com>
* Functional tests for sorted queries
2014-08-05 Jeremy Mikola <jmikola@gmail.com>
* Use Faker to create user data fixtures
2014-08-05 Jeremy Mikola <jmikola@gmail.com>
* Use require_once in skip test includes
2014-08-06 Jeremy Mikola <jmikola@gmail.com>
* Use "phongo_test" as default test database
2014-08-06 Jeremy Mikola <jmikola@gmail.com>
* Use preg_replace() for generating collection name from test file
2014-08-05 Jeremy Mikola <jmikola@gmail.com>
* Clean up hex_dump() source and add citation
2014-10-03 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #20
2014-10-03 Jeremy Mikola <jmikola@gmail.com>
* PHP-1173: Use string "majority" for WriteConcern::MAJORITY
2014-10-03 Jeremy Mikola <jmikola@gmail.com>
* Remove unused class properties in WriteConcern
2014-10-02 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #19 from bjori/php1230-take-two
2014-10-02 Jeremy Mikola <jmikola@gmail.com>
* PHP-1230: Clean up WriteResult property storage on WriteException
2014-09-30 Jeremy Mikola <jmikola@gmail.com>
* Merge branch 'dry-run'
2014-09-30 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #16
2014-09-29 Jeremy Mikola <jmikola@gmail.com>
* Use correct return types for WriteResult-related init functions
2014-09-25 Jeremy Mikola <jmikola@gmail.com>
* PHP-1142: Dump WriteResult object in write tests
2014-09-25 Jeremy Mikola <jmikola@gmail.com>
* PHP-1142: Support upserted ids in WriteResult
2014-09-25 Jeremy Mikola <jmikola@gmail.com>
* PHP-1142: Implement WriteResult getter for meta information
2014-09-25 Jeremy Mikola <jmikola@gmail.com>
* PHP-1142: Memory cleanup and getters for WriteResult error zvals
2014-09-25 Jeremy Mikola <jmikola@gmail.com>
* Fix tab indentation for generated C code
2014-09-24 Jeremy Mikola <jmikola@gmail.com>
* Throw WriteException on failed write ops
2014-09-24 Jeremy Mikola <jmikola@gmail.com>
* PHP-1230: Implement WriteException class
2014-09-24 Jeremy Mikola <jmikola@gmail.com>
* Return exceptions after throwing in case we need to modify them
2014-09-24 Jeremy Mikola <jmikola@gmail.com>
* PHP-1142: Init WriteError and WriteConcernError arrays for WriteResult
2014-09-24 Jeremy Mikola <jmikola@gmail.com>
* PHP-1171: Move WriteConcernError init function to php_phongo.c
2014-09-24 Jeremy Mikola <jmikola@gmail.com>
* PHP-1172: Implement WriteError class
2014-09-24 Jeremy Mikola <jmikola@gmail.com>
* Fix typo in constant name
2014-09-23 Jeremy Mikola <jmikola@gmail.com>
* Ensure libmongoc structs get freed in WriteBatch and WriteConcern
2014-09-18 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #14 from bjori/php-1171-writeconcernerror
2014-09-17 Jeremy Mikola <jmikola@gmail.com>
* PHP-1171: Implement WriteConcernError class
2014-09-05 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #13 from bjori/php-1068
2014-09-05 Jeremy Mikola <jmikola@gmail.com>
* PHP-1068: Test that CommandResult is iterable
2014-08-25 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #12
2014-08-21 Jeremy Mikola <jmikola@gmail.com>
* Always wrap query filter with $query modifier
2014-08-21 Jeremy Mikola <jmikola@gmail.com>
* Use array helpers instead of hash iteration in Query option parsing
2014-08-21 Jeremy Mikola <jmikola@gmail.com>
* Error if phongo_query_init() filter isn't array or object
2014-08-14 Jeremy Mikola <jmikola@gmail.com>
* Use ZEND_STRS() when passing string/size arguments
2014-08-14 Jeremy Mikola <jmikola@gmail.com>
* Fix setting of zvals with zend_hash_update() when constructing query
2014-08-11 Jeremy Mikola <jmikola@gmail.com>
* Update tests for revised Query constructor API
2014-08-11 Jeremy Mikola <jmikola@gmail.com>
* Change Query constructor args based on CRUD API spec
2014-08-11 Jeremy Mikola <jmikola@gmail.com>
* Rename query document field in query struct
2014-08-22 Hannes Magnusson <bjori@mongodb.com>
* bump submodules
2014-08-20 Hannes Magnusson <bjori@mongodb.com>
* WS
2014-08-20 Hannes Magnusson <bjori@mongodb.com>
* Fix segfault when no namespace is passed
2014-08-20 Hannes Magnusson <bjori@mongodb.com>
* BSON: Fix serializing arrays inside of objects
2014-08-13 Hannes Magnusson <bjori@mongodb.com>
* Move BSON encode/decode stuff into BSON namespace
2014-08-13 Hannes Magnusson <bjori@mongodb.com>
* Enable a waterfall of compiler instructions for libbson and mongoc
2014-08-13 Hannes Magnusson <bjori@mongodb.com>
* Supress the initialization output
2014-08-12 Hannes Magnusson <bjori@mongodb.com>
* These dirs are required for all normal 'make' targets
2014-08-12 Hannes Magnusson <bjori@mongodb.com>
* Overwrite the path to libbson that should be linked against
2014-08-12 Hannes Magnusson <bjori@mongodb.com>
* debugging travis
2014-08-12 Hannes Magnusson <bjori@mongodb.com>
* Build against bundled.. just not mongoc bundled
2014-08-12 Hannes Magnusson <bjori@mongodb.com>
* Remove empty dir since there is nothing to make there
2014-08-12 Hannes Magnusson <bjori@mongodb.com>
* Hack around mongo-c-driver not allowing us specify libbson location
2014-08-12 Hannes Magnusson <bjori@mongodb.com>
* Link against libbson and make it available to mongo-c-driver
2014-08-12 Hannes Magnusson <bjori@mongodb.com>
* Missed a file
2014-08-12 Hannes Magnusson <bjori@mongodb.com>
* We submodule these now and automatically build it
2014-08-12 Hannes Magnusson <bjori@mongodb.com>
* submodule mongo-c-driver and libbson and build it into phongo
2014-08-08 Hannes Magnusson <bjori@mongodb.com>
* Fix zts
2014-08-08 Hannes Magnusson <bjori@mongodb.com>
* Reduce mongoc stuff we compile and install
2014-08-08 Hannes Magnusson <bjori@mongodb.com>
* Link against libmongoc-priv so we can go into the gory details
2014-08-06 Hannes Magnusson <bjori@mongodb.com>
* Implement BSON\ObjectID properly
2014-08-04 Hannes Magnusson <bjori@mongodb.com>
* Fix installing lcov
2014-07-31 Hannes Magnusson <bjori@mongodb.com>
* Only skip it on travis
2014-07-30 Hannes Magnusson <bjori@mongodb.com>
* CID-24876: Actually check for the return value and raise a warning now
2014-07-30 Hannes Magnusson <bjori@mongodb.com>
* Simplify logging domain
2014-07-30 Hannes Magnusson <bjori@mongodb.com>
* CID-39604: Fixed possible null dereferencing
2014-07-30 Hannes Magnusson <bjori@mongodb.com>
* s/executeWrite/executeWriteBatch/g as the class is called WriteBatch
2014-07-30 Hannes Magnusson <bjori@mongodb.com>
* Only collect and return the _id if requested - and never $this
2014-07-30 Hannes Magnusson <bjori@mongodb.com>
* optimize BSON class' and allow ObjectID to have other then _id key
2014-07-30 Hannes Magnusson <bjori@mongodb.com>
* Sprinkly tad bit more logging and fix coupleof protos
2014-07-30 Hannes Magnusson <bjori@mongodb.com>
* Add json_to_bson() function
2014-07-30 Hannes Magnusson <bjori@mongodb.com>
* Try properly to read as much data as requested
2014-07-30 Hannes Magnusson <bjori@mongodb.com>
* Copy the oid
2014-07-30 Hannes Magnusson <bjori@mongodb.com>
* Make BSON types implement BSON\Type interface
2014-07-22 Hannes Magnusson <bjori@mongodb.com>
* Remove dirty hack and add a more dirty hack to fetch usable run-tests
2014-07-22 Hannes Magnusson <bjori@mongodb.com>
* make sure a empty file doesn't break our build
2014-07-22 Hannes Magnusson <bjori@mongodb.com>
* Don't run tests under valgrind on travis... bug in valgrind+libmongoc
2014-07-21 Hannes Magnusson <bjori@mongodb.com>
* Install libmongoc using mci generated packages
2014-07-21 Hannes Magnusson <bjori@mongodb.com>
* Fix bson buffer
2014-07-21 Hannes Magnusson <bjori@mongodb.com>
* Implement WriteConcern
2014-07-21 Hannes Magnusson <bjori@mongodb.com>
* new tests
2014-07-21 Hannes Magnusson <bjori@mongodb.com>
* Fix zts
2014-07-21 Hannes Magnusson <bjori@mongodb.com>
* Fix constant generator & regenerate
2014-07-21 Hannes Magnusson <bjori@mongodb.com>
* Implement readPreferences
2014-07-21 Hannes Magnusson <bjori@mongodb.com>
* Improve ignore paths
2014-07-21 Hannes Magnusson <bjori@mongodb.com>
* Travis CI fixes
2014-07-19 Hannes Magnusson <bjori@mongodb.com>
* fix path to ignore
2014-07-19 Hannes Magnusson <bjori@mongodb.com>
* fix zts
2014-07-18 Hannes Magnusson <bjori@mongodb.com>
* Add __toString() for ObjectID
2014-07-19 Hannes Magnusson <bjori@mongodb.com>
* Returned generate _id when adding objects to batches
2014-07-19 Hannes Magnusson <bjori@mongodb.com>
* Improve example
2014-07-19 Hannes Magnusson <bjori@mongodb.com>
* Add ObjectID support
2014-07-19 Hannes Magnusson <bjori@mongodb.com>
* Forgotten things for new classes
2014-07-18 Hannes Magnusson <bjori@mongodb.com>
* Fix \0 in property names (private props, ...)
2014-07-18 Hannes Magnusson <bjori@mongodb.com>
* Add the ability to automatically generate _id
2014-07-17 Hannes Magnusson <bjori@mongodb.com>
* Better way to run the tests through valgrind
2014-07-18 Hannes Magnusson <bjori@mongodb.com>
* Missing new class
2014-07-18 Hannes Magnusson <bjori@mongodb.com>
* Add BSON objects and move generated classes into its own folders
2014-07-18 Jeremy Mikola <jmikola@gmail.com>
* Only use GeneratedId for upserts, not inserts
2014-07-18 Jeremy Mikola <jmikola@gmail.com>
* Replace createFromServers() factory method with getServers()
2014-07-17 Jeremy Mikola <jmikola@gmail.com>
* Create WriteConcern value object
2014-07-17 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #10 from bjori/make-testclean
2014-07-17 Jeremy Mikola <jmikola@gmail.com>
* Replace clean-tests.sh with make target
2014-07-17 Hannes Magnusson <bjori@mongodb.com>
* Run the tests under valgrind on travis
2014-07-17 Jeremy Mikola <jmikola@gmail.com>
* Revise Manager::executeUpdate() error test
2014-07-17 Jeremy Mikola <jmikola@gmail.com>
* Fix warning for bson_uint32_to_string() string pointer arg
2014-07-17 Jeremy Mikola <jmikola@gmail.com>
* Shell script to clean up leftover test files
2014-07-16 Hannes Magnusson <bjori@mongodb.com>
* Fix constants value
2014-07-16 Hannes Magnusson <bjori@mongodb.com>
* Regenerate after coverity fixes
2014-07-17 Hannes Magnusson <bjori@mongodb.com>
* Ignore the bundled zval array helper header
2014-07-16 Hannes Magnusson <bjori@mongodb.com>
* tralalalllala. It really needs to be dedicated branch
2014-07-16 Hannes Magnusson <bjori@mongodb.com>
* make clean first as it had already been built by compile.sh
2014-07-16 Hannes Magnusson <bjori@mongodb.com>
* Get coverity to build the dry-run branch automatically
2014-07-16 Hannes Magnusson <bjori@mongodb.com>
* I just learned about trap
2014-07-16 Hannes Magnusson <bjori@mongodb.com>
* CID-24870: Unchecked return value from library
2014-07-16 Hannes Magnusson <bjori@mongodb.com>
* CID-24872: Comment out not-yet-implemented code
2014-07-16 Hannes Magnusson <bjori@mongodb.com>
* CID-24873: Unreachable code whoopsy!
2014-07-16 Hannes Magnusson <bjori@mongodb.com>
* CID-24875: Fix uninitialized variable
2014-07-16 Hannes Magnusson <bjori@mongodb.com>
* Avoid a deadcode warning from coverity
2014-07-16 Hannes Magnusson <bjori@mongodb.com>
* Coverity link
2014-07-16 Hannes Magnusson <bjori@mongodb.com>
* Update API listing
2014-07-16 Hannes Magnusson <bjori@mongodb.com>
* Who doesn't like badges
2014-07-16 Hannes Magnusson <bjori@mongodb.com>
* skip on travis..
2014-07-16 Hannes Magnusson <bjori@mongodb.com>
* Fix constants value
2014-07-16 Hannes Magnusson <bjori@mongodb.com>
* Add a new none flag
2014-07-15 Hannes Magnusson <bjori@mongodb.com>
* Generate all the C objects based on the PHP code
2014-07-15 Hannes Magnusson <bjori@mongodb.com>
* Add the actual implementation into the PHP API docs
2014-07-15 Hannes Magnusson <bjori@mongodb.com>
* Add a compare_objects handler for Server objects and always try to have a mongoc_host_t for it
2014-07-15 Hannes Magnusson <bjori@mongodb.com>
* CS
2014-07-15 Hannes Magnusson <bjori@mongodb.com>
* No need for this hack anymore
2014-07-15 Hannes Magnusson <bjori@mongodb.com>
* We want latest and greatest mongodb
2014-07-15 Hannes Magnusson <bjori@mongodb.com>
* Use bson_uint32_to_string() rather the spprintf()
2014-07-15 Hannes Magnusson <bjori@mongodb.com>
* Fix the remaining tests
2014-07-15 Hannes Magnusson <bjori@mongodb.com>
* Get tests to pass
2014-07-15 Hannes Magnusson <bjori@mongodb.com>
* fix test
2014-07-14 Hannes Magnusson <bjori@mongodb.com>
* fix tests
2014-07-14 Hannes Magnusson <bjori@mongodb.com>
* whopsy
2014-07-14 Hannes Magnusson <bjori@mongodb.com>
* revert accidental removal
2014-07-14 Hannes Magnusson <bjori@mongodb.com>
* Revert accidental removal
2014-07-14 Hannes Magnusson <bjori@mongodb.com>
* Extract the hint from the cursor
2014-07-14 Hannes Magnusson <bjori@mongodb.com>
* No longer needed
2014-07-14 Hannes Magnusson <bjori@mongodb.com>
* api changes
2014-07-14 Hannes Magnusson <bjori@mongodb.com>
* Easier to maintain in a single file
2014-07-14 Hannes Magnusson <bjori@mongodb.com>
* Regenerated
2014-07-14 Hannes Magnusson <bjori@mongodb.com>
* Update bootsrapper
2014-07-14 Hannes Magnusson <bjori@mongodb.com>
* Fix classname
2014-07-14 Hannes Magnusson <bjori@mongodb.com>
* Add a zval array helper
2014-07-14 Hannes Magnusson <bjori@mongodb.com>
* Add support for delete options
2014-07-09 Jeremy Mikola <jmikola@gmail.com>
* PHP-1136: Allow custom cursor classes from command/query results
2014-07-09 Jeremy Mikola <jmikola@gmail.com>
* Remove *.php from gitignore
2014-07-11 Hannes Magnusson <bjori@mongodb.com>
* Initial Server implementation (as read-only object..)
2014-07-11 Hannes Magnusson <bjori@mongodb.com>
* Fix test
2014-07-11 Hannes Magnusson <bjori@mongodb.com>
* We have to save the results so they don't get posted to qa.php.net
2014-07-11 Hannes Magnusson <bjori@mongodb.com>
* pretend object_properties_init() exists on PHP5.3
2014-07-11 Hannes Magnusson <bjori@mongodb.com>
* Only run coveralls on success
2014-07-10 Hannes Magnusson <bjori@mongodb.com>
* Fix zts
2014-07-10 Hannes Magnusson <bjori@mongodb.com>
* Install libbson and libmongoc masters rather then releases
2014-07-10 Hannes Magnusson <bjori@mongodb.com>
* Cosmetics and remove dead function
2014-07-10 Hannes Magnusson <bjori@mongodb.com>
* Remove batch hacks & added single_[insert|update|delete]
2014-07-09 Hannes Magnusson <bjori@mongodb.com>
* Touch up WriteResult as return value
2014-07-09 Hannes Magnusson <bjori@mongodb.com>
* Fixed PHP-1138: Use Zend MM for libbson
2014-07-09 Hannes Magnusson <bjori@mongodb.com>
* Fixed PHP-1137: Removed ugly private API hacks
2014-07-08 Hannes Magnusson <bjori@mongodb.com>
* Return correct Result class
2014-07-08 Hannes Magnusson <bjori@mongodb.com>
* Initialize optional arg as NULL
2014-07-08 Hannes Magnusson <bjori@mongodb.com>
* Fix tests and push getServer() info down
2014-07-08 Hannes Magnusson <bjori@mongodb.com>
* Remove no-longer valid classes
2014-07-08 Hannes Magnusson <bjori@mongodb.com>
* Add ReadPreferences and full Query support
2014-07-08 Jeremy Mikola <jmikola@gmail.com>
* Consolidate write result classes into WriteResult
2014-07-07 Jeremy Mikola <jmikola@gmail.com>
* Add phpt files to gitignore
2014-07-07 Jeremy Mikola <jmikola@gmail.com>
* Tests for constants and Server/Manager execute methods
2014-07-08 Hannes Magnusson <bjori@mongodb.com>
* Fix calling continue in global scope
2014-07-08 Hannes Magnusson <bjori@mongodb.com>
* Return MongoDB\Result when executing commands too
2014-07-03 Hannes Magnusson <bjori@mongodb.com>
* print out our configure output
2014-07-03 Hannes Magnusson <bjori@mongodb.com>
* Batch test and fix skipping test during cleanup phase
2014-07-03 Hannes Magnusson <bjori@mongodb.com>
* Dead code
2014-07-03 Hannes Magnusson <bjori@mongodb.com>
* Imlement batch execution
2014-07-03 Hannes Magnusson <bjori@mongodb.com>
* FIXME: libmongoc workarounds...
2014-07-03 Hannes Magnusson <bjori@mongodb.com>
* Fix type hint
2014-07-03 Hannes Magnusson <bjori@mongodb.com>
* Missing batch ctor
2014-07-03 Hannes Magnusson <bjori@mongodb.com>
* avoid bogus files showing up on coverage reports
2014-07-02 Hannes Magnusson <bjori@mongodb.com>
* Simplify Batch interface
2014-07-02 Hannes Magnusson <bjori@mongodb.com>
* See if this has any affect on coveralls..
2014-07-02 Hannes Magnusson <bjori@mongodb.com>
* we need newer lcov then howmany decades old the one in repo is
2014-07-02 Hannes Magnusson <bjori@mongodb.com>
* Missing lcov on travis for coverage
2014-07-02 Hannes Magnusson <bjori@mongodb.com>
* Bump to latest release
2014-07-02 Hannes Magnusson <bjori@mongodb.com>
* guess the directory needs to exist
2014-07-02 Hannes Magnusson <bjori@mongodb.com>
* Compile libmongoc from the src/ dir so we can steal the private header
2014-07-02 Hannes Magnusson <bjori@mongodb.com>
* Rename it to _default so we don't conflict the actual defaults
2014-07-02 Hannes Magnusson <bjori@mongodb.com>
* Make sure spl is loaded before we are in static builds
2014-07-02 Hannes Magnusson <bjori@mongodb.com>
* fix zts
2014-07-02 Hannes Magnusson <bjori@mongodb.com>
* Renamed error const
2014-07-02 Hannes Magnusson <bjori@mongodb.com>
* Some zts fixes
2014-07-02 Hannes Magnusson <bjori@mongodb.com>
* Fix building as a static extension
2014-07-02 Hannes Magnusson <bjori@mongodb.com>
* ignore test files
2014-07-02 Hannes Magnusson <bjori@mongodb.com>
* Simplify testing
2014-07-02 Hannes Magnusson <bjori@mongodb.com>
* Better logging
2014-07-01 Hannes Magnusson <bjori@mongodb.com>
* Return a result object and implement an iterator for it
2014-06-30 Hannes Magnusson <bjori@mongodb.com>
* remove useless code
2014-06-30 Hannes Magnusson <bjori@mongodb.com>
* rly?
2014-06-30 Hannes Magnusson <bjori@mongodb.com>
* New class
2014-06-30 Hannes Magnusson <bjori@mongodb.com>
* semicolon
2014-06-30 Hannes Magnusson <bjori@mongodb.com>
* make it final and update to match the docs
2014-06-30 Hannes Magnusson <bjori@mongodb.com>
* fqd
2014-06-30 Hannes Magnusson <bjori@mongodb.com>
* wip query
2014-06-27 Hannes Magnusson <bjori@mongodb.com>
* wip
2014-06-30 Hannes Magnusson <bjori@mongodb.com>
* Add a generic result object that can be iterated over via iteratoraggregate
2014-06-30 Hannes Magnusson <bjori@mongodb.com>
* This cursor needs a firstBatch, just like the CommandCursor
2014-06-27 Hannes Magnusson <bjori@mongodb.com>
* fixed warnings and alloc
2014-06-27 Hannes Magnusson <bjori@mongodb.com>
* blah
2014-06-27 Hannes Magnusson <bjori@mongodb.com>
* wip
2014-06-26 Hannes Magnusson <bjori@mongodb.com>
* Added logging to files and command executing
2014-06-24 Hannes Magnusson <bjori@mongodb.com>
* Create a mongoc_client from URI
2014-06-24 Hannes Magnusson <bjori@mongodb.com>
* More cruft for objects
2014-06-24 Hannes Magnusson <bjori@mongodb.com>
* Remove duplicate include
2014-06-24 Hannes Magnusson <bjori@mongodb.com>
* phongo api...
2014-06-24 Hannes Magnusson <bjori@mongodb.com>
* Register default object handlers
2014-06-24 Hannes Magnusson <bjori@mongodb.com>
* Add runtime error domain enum - and a wrapper to get exception type
2014-06-20 Hannes Magnusson <bjori@mongodb.com>
* Fix zts
2014-06-20 Hannes Magnusson <bjori@mongodb.com>
* Lets not enable developers flags on travis until we get a valid build first :)
2014-06-19 Hannes Magnusson <bjori@mongodb.com>
* Add BSON tests
2014-06-18 Hannes Magnusson <bjori@mongodb.com>
* Initial BSON implementation
2014-06-20 Hannes Magnusson <bjori@mongodb.com>
* Fix include path
2014-06-20 Hannes Magnusson <bjori@mongodb.com>
* Quick hack to install libmongoc on travis
2014-06-20 Hannes Magnusson <bjori@mongodb.com>
* Add travis and coveralls support
2014-06-19 Hannes Magnusson <bjori@mongodb.com>
* Update description per review from Jeremy
2014-06-19 Hannes Magnusson <bjori@mongodb.com>
* Implement basics of phongo_exception_from_mongoc_domain()
2014-06-18 Hannes Magnusson <bjori@mongodb.com>
* Implement the phongo_exception_from_phongo_domain() function
2014-06-18 Hannes Magnusson <bjori@mongodb.com>
* Isolate all PHP compatability stuff into its own file
2014-06-18 Hannes Magnusson <bjori@mongodb.com>
* PHP Extension CRUFT for phongo
2014-06-17 Hannes Magnusson <bjori@mongodb.com>
* Add config.m4
2014-06-18 Hannes Magnusson <bjori@mongodb.com>
* Skeleton implementation of the userland classes/methods
2014-06-18 Hannes Magnusson <bjori@mongodb.com>
* Add .gitignore
2014-06-19 Hannes Magnusson <bjori@mongodb.com>
* Add descriptions
2014-06-19 Hannes Magnusson <bjori@php.net>
* Merge pull request #5 from bjori/fix-query-flags
2014-06-19 Jeremy Mikola <jmikola@gmail.com>
* Fix bit values for query flags
2014-06-17 Hannes Magnusson <bjori@php.net>
* Merge pull request #3 from bjori/docblocks
2014-06-16 Hannes Magnusson <bjori@mongodb.com>
* Change some @see into @param or @param and add some descriptions
2014-06-16 Hannes Magnusson <bjori@mongodb.com>
* Lets not start out with complicated zpp...
2014-06-16 Hannes Magnusson <bjori@mongodb.com>
* Fix return value
2014-06-16 Hannes Magnusson <bjori@mongodb.com>
* Fix docblock param order
2014-06-16 Hannes Magnusson <bjori@mongodb.com>
* Add a bootstrapping file that includes all other files
2014-06-16 Hannes Magnusson <bjori@mongodb.com>
* Pass through php -l
2014-06-16 Jeremy Mikola <jmikola@gmail.com>
* Merge pull request #2 from bjori/split-classes
2014-06-13 Jeremy Mikola <jmikola@gmail.com>
* Specity write options in execute methods, not batch constructors
2014-06-13 Jeremy Mikola <jmikola@gmail.com>
* Command execution takes a database name, not a namespace
2014-06-13 Jeremy Mikola <jmikola@gmail.com>
* Add cursor flag constants
2014-06-12 Jeremy Mikola <jmikola@gmail.com>
* Implement review feedback
2014-06-12 Jeremy Mikola <jmikola@gmail.com>
* Split API classes and interfaces
2014-05-14 Derick Rethans <github@derickrethans.nl>
* Fixed unintialized variable
2014-05-13 Hannes Magnusson <bjori@php.net>
* The CRUD examples are now multiple separate files
2014-05-13 Hannes Magnusson <bjori@php.net>
* Merge pull request #1 from bjori/split-crud
2014-05-13 Jeremy Mikola <jmikola@gmail.com>
* Query constructor should take query object, not just criteria
2014-05-13 Jeremy Mikola <jmikola@gmail.com>
* Use value objects and make QueryResult IteratorAggregate
2014-05-13 Jeremy Mikola <jmikola@gmail.com>
* Split and modify CRUD examples
2014-05-06 Hannes Magnusson <bjori@mongodb.com>
* Add basic .gitignore
2014-05-06 Hannes Magnusson <bjori@mongodb.com>
* Initial draft of suggested API
2014-05-06 Hannes Magnusson <bjori@mongodb.com>
* Example of a wishful API
2014-05-06 Hannes Magnusson <bjori@mongodb.com>
* Initial commit
diff --git a/mongodb-1.1.1/LICENSE b/mongodb-1.1.2/LICENSE
similarity index 100%
rename from mongodb-1.1.1/LICENSE
rename to mongodb-1.1.2/LICENSE
diff --git a/mongodb-1.1.1/Makefile.frag b/mongodb-1.1.2/Makefile.frag
similarity index 100%
rename from mongodb-1.1.1/Makefile.frag
rename to mongodb-1.1.2/Makefile.frag
diff --git a/mongodb-1.1.1/README.md b/mongodb-1.1.2/README.md
similarity index 100%
rename from mongodb-1.1.1/README.md
rename to mongodb-1.1.2/README.md
diff --git a/mongodb-1.1.1/RELEASE-0 b/mongodb-1.1.2/RELEASE-0
similarity index 100%
rename from mongodb-1.1.1/RELEASE-0
rename to mongodb-1.1.2/RELEASE-0
diff --git a/mongodb-1.1.1/RELEASE-1.0 b/mongodb-1.1.2/RELEASE-1.0
similarity index 100%
rename from mongodb-1.1.1/RELEASE-1.0
rename to mongodb-1.1.2/RELEASE-1.0
diff --git a/mongodb-1.1.1/RELEASE-1.1.1 b/mongodb-1.1.2/RELEASE-1.1
similarity index 50%
rename from mongodb-1.1.1/RELEASE-1.1.1
rename to mongodb-1.1.2/RELEASE-1.1
index a83fff5e..82f7fd46 100644
--- a/mongodb-1.1.1/RELEASE-1.1.1
+++ b/mongodb-1.1.2/RELEASE-1.1
@@ -1,558 +1,399 @@
RELEASE 1.1.1
-------------
2015-12-22 Jeremy Mikola <jmikola@gmail.com>
* Bump extension version to 1.1.1
2015-12-22 Jeremy Mikola <jmikola@gmail.com>
* PHPC-285: Allow for PHP 7.x support in package.xml
2015-12-16 Jeremy Mikola <jmikola@gmail.com>
* Fix protos for ReadPreference and WriteConcern
2015-12-22 Kanin Peanviriyakulkit <dogrocker@users.noreply.github.com>
* Remove "beta" in doc.
2015-12-21 Jeremy Mikola <jmikola@gmail.com>
* PHPC-285: VC14 needs timezone defined for SSL function
2015-12-21 Jeremy Mikola <jmikola@gmail.com>
* PHPC-285: Fix syntax for empty struct initializer
2015-12-18 Derick Rethans <github@derickrethans.nl>
* Fixed test case, where PHP 5 and PHP 7 call the type differently
2015-12-18 Derick Rethans <github@derickrethans.nl>
* Fixed 'dump on uninitialised value' with BSON deserialisation
2015-12-16 Derick Rethans <github@derickrethans.nl>
* Fixed issues with PHP 7 and the new ReadConcern
2015-12-18 Derick Rethans <github@derickrethans.nl>
* Fixed CS from Joe's patch
2015-12-14 Joe Watkins <krakjoe@php.net>
* fix leaks and logical errors for PHP 7
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-400: Compare WriteConcern journal arg with IS_TRUE
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-405: Additional zval* to zval changes
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-397: Additional RETURN_STRING updates
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-393: Don't BSON-encode non-public properties in PHP 7
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-390: Fix OnUpdateString calls within OnUpdateDebug
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-373: Additional MAKE_STD_ZVAL() cleanup
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-374: zend_string updates for OnUpdateDebug
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-404: Additional hash API changes
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-370: Additionally return_value_ptr and return_value_used suppressions
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-369: Additional Z_<CLASSNAME>_OBJ_P() macros
2015-11-07 Jeremy Mikola <jmikola@gmail.com>
* PHPC-399: Additional zval_used_for_init cleanup
2015-09-24 Hannes Magnusson <bjori@php.net>
* PHPC-431: Add the testcase from the report
2015-09-24 Hannes Magnusson <bjori@php.net>
* PHPC-431: Segfault when using Manager through singleton class
2015-09-02 Hannes Magnusson <bjori@php.net>
* Use ZVAL_COPY_VALUE()
2015-09-01 Hannes Magnusson <bjori@php.net>
* Enable PHP7 on Travis
2015-09-01 Hannes Magnusson <bjori@php.net>
* PHPC-391 & PHPC-389: Stream and SSL API changes
2015-09-01 Hannes Magnusson <bjori@php.net>
* PHPC-387: Properly init the iterator, and don't free it on dtor
2015-09-01 Hannes Magnusson <bjori@php.net>
* _id doesn't have to be object
2015-09-01 Hannes Magnusson <bjori@php.net>
* Fix incorrect version checks
2015-09-01 Hannes Magnusson <bjori@php.net>
* PHPC-405: zval drop a level; zval*->zval, zval**->zval*
2015-09-01 Hannes Magnusson <bjori@php.net>
* PHPC-404: off-by-one hash api changes
2015-09-01 Hannes Magnusson <bjori@php.net>
* PHPC-390: php.ini updates
2015-08-31 Hannes Magnusson <bjori@php.net>
* littlebit to eager on the zend_string, this is PHP5
2015-08-31 Hannes Magnusson <bjori@php.net>
* Get the zend_string value
2015-08-31 Hannes Magnusson <bjori@php.net>
* hash API changes, off-by-ones
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-380: Use the compatability macros to get the object
2015-08-31 Hannes Magnusson <bjori@php.net>
* Properly initialize the zval* we are working with
2015-08-31 Hannes Magnusson <bjori@php.net>
* +1 in PHP5, not PHP7
2015-08-31 Hannes Magnusson <bjori@php.net>
* Include numeric keys as well
2015-09-01 Patrick Boyd <pboyd04@gmail.com>
* Object property names missing due to lack of key length
2015-08-31 Hannes Magnusson <bjori@php.net>
* Should all compile now!
2015-08-31 Hannes Magnusson <bjori@php.net>
* Simpilfy iterating over a zval
2015-08-31 Hannes Magnusson <bjori@php.net>
* Use Z_ISUNDEF() to check the zval
2015-08-31 Hannes Magnusson <bjori@php.net>
* WS
2015-08-31 Patrick Boyd <pboyd04@gmail.com>
* PHPC-400: Handle IS_TRUE and IS_FALSE
2015-08-31 Hannes Magnusson <bjori@php.net>
* Simplify IS_ARRAY/IS_OBJECT discovery for PHP7
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-373: MAKE_STD_ZVAL() and zval* -> zval upgrades
2015-08-31 Hannes Magnusson <bjori@php.net>
* We already know the length
2015-08-31 Patrick Boyd <pboyd04@gmail.com>
* str_efree() not defined in PHP7
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-397: RETURN_*() should RETURN ! :)
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-399: zval_used_for_init is no longer needed (or defined)
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-398: zend_parse_parameter 's' expects a char* and size_t now
2015-08-28 Patrick Boyd <pboyd04@gmail.com>
* PHP7 upgrades
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-373: MAKE_STD_ZVAL() is gone
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-397: RETURN_STRING() duplicate argument removed
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-387: get_current_data() API changes
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-397: dup argument in most string macros removed
2015-08-31 Patrick Boyd <pboyd04@gmail.com>
* PHPC-380: Use our bc type for free_object argument
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-397: dup argument in most string macros removed
2015-08-31 Patrick Boyd <pboyd04@gmail.com>
* PHPC-396: HashTable no longer contains nApplyCount
2015-08-27 Patrick Boyd <pboyd04@gmail.com>
* PHPC-394: Fix issue with WriteException and zend_read_property
2015-08-31 Hannes Magnusson <bjori@php.net>
* PHPC-380: PHP7 create/free object changes
2015-08-27 Patrick Boyd <pboyd04@gmail.com>
* PHPC-380: create/free object handlers for PHP7
2015-08-27 Hannes Magnusson <bjori@php.net>
* Define the TODOs for PHP5, these are PHP7 TODOs
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-385: Remove leftover braces
2015-08-27 Hannes Magnusson <bjori@php.net>
* Sprinkle TODOs -- it compiles now!
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-374: php_stream_xport_create() now wants zend_string
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-388 - dtor on bson_to_zval() failure
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-387: Iterator API changes
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-386: Forward port Z_PHPDATE_P() to get php_date_obj
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-385: add_assoc_string_ex() doesn't have a duplicate param in PHP7
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-384: php_stream's no longer have resource ids
2015-08-27 Hannes Magnusson <bjori@php.net>
* PHPC-383: Simplify getting the current exception zval*
2015-08-26 Hannes Magnusson <bjori@php.net>
* PHPC-376: Cursor var_dump() is weird
2015-08-25 Hannes Magnusson <bjori@php.net>
* PHPC-373: Remove MAKE_STD_ZVAL() usage
2015-08-25 Hannes Magnusson <bjori@php.net>
* PHPC-374: zend_string* vs char* PHP API changes (1/many)
2015-08-25 Hannes Magnusson <bjori@php.net>
* PHPC-375: TSRMLS_FETCH_FROM_CTX() not applicable in PHP7
2015-08-25 Hannes Magnusson <bjori@php.net>
* PHPC-372: zend_throw_exception() return value changes
2015-08-25 Hannes Magnusson <bjori@php.net>
* PHP7: Start a phongo_compat.c with things that shouldn't be done in headers
2015-08-25 Hannes Magnusson <bjori@php.net>
* PHP7: Lets start with just php_phongo.c for now
2015-08-24 Hannes Magnusson <bjori@php.net>
* PHPC-371: Prep for PHP7 resource changes
2015-08-24 Hannes Magnusson <bjori@php.net>
* PHPC-370: Hardcode return_value_used to 1 in PHP7
2015-08-24 Hannes Magnusson <bjori@php.net>
* PHPC-370: return_value_ptr and return_value_used removed in PHP7
2015-08-24 Hannes Magnusson <bjori@php.net>
* PHPC-369: Use the new Z_<CLASSNAME>_OBJ_P() macros
2015-08-24 Hannes Magnusson <bjori@php.net>
* PHPC-369: Split PHP5 and PHP7 style custom object struct declrations
2015-08-24 Hannes Magnusson <bjori@php.net>
* PHPC-368: Refactor MongoDB\Driver\Manager ctor
2015-08-24 Hannes Magnusson <bjori@php.net>
* Fix const casting warning in php_array_api
2015-08-24 Hannes Magnusson <bjori@php.net>
* Resync with GitHub: https://github.com/sgolemon/php-array-api
2015-12-15 Jeremy Mikola <jmikola@gmail.com>
* Back to -dev
2015-12-15 Jeremy Mikola <jmikola@gmail.com>
* Include libbson and libmongoc version files in PECL package
2015-12-15 Jeremy Mikola <jmikola@gmail.com>
* Add 1.1.0 release notes
-RELEASE 1.1.1
+RELEASE 1.1.0
-------------
-2015-12-22 Jeremy Mikola <jmikola@gmail.com>
- * Bump extension version to 1.1.1
-
-2015-12-22 Jeremy Mikola <jmikola@gmail.com>
- * PHPC-285: Allow for PHP 7.x support in package.xml
-
-2015-12-16 Jeremy Mikola <jmikola@gmail.com>
- * Fix protos for ReadPreference and WriteConcern
-
-2015-12-22 Kanin Peanviriyakulkit <dogrocker@users.noreply.github.com>
- * Remove "beta" in doc.
-
-2015-12-21 Jeremy Mikola <jmikola@gmail.com>
- * PHPC-285: VC14 needs timezone defined for SSL function
-
-2015-12-21 Jeremy Mikola <jmikola@gmail.com>
- * PHPC-285: Fix syntax for empty struct initializer
-
-2015-12-18 Derick Rethans <github@derickrethans.nl>
- * Fixed test case, where PHP 5 and PHP 7 call the type differently
-
-2015-12-18 Derick Rethans <github@derickrethans.nl>
- * Fixed 'dump on uninitialised value' with BSON deserialisation
-
-2015-12-16 Derick Rethans <github@derickrethans.nl>
- * Fixed issues with PHP 7 and the new ReadConcern
-
-2015-12-18 Derick Rethans <github@derickrethans.nl>
- * Fixed CS from Joe's patch
-
-2015-12-14 Joe Watkins <krakjoe@php.net>
- * fix leaks and logical errors for PHP 7
-
-2015-11-07 Jeremy Mikola <jmikola@gmail.com>
- * PHPC-400: Compare WriteConcern journal arg with IS_TRUE
-
-2015-11-07 Jeremy Mikola <jmikola@gmail.com>
- * PHPC-405: Additional zval* to zval changes
-
-2015-11-07 Jeremy Mikola <jmikola@gmail.com>
- * PHPC-397: Additional RETURN_STRING updates
-
-2015-11-07 Jeremy Mikola <jmikola@gmail.com>
- * PHPC-393: Don't BSON-encode non-public properties in PHP 7
-
-2015-11-07 Jeremy Mikola <jmikola@gmail.com>
- * PHPC-390: Fix OnUpdateString calls within OnUpdateDebug
-
-2015-11-07 Jeremy Mikola <jmikola@gmail.com>
- * PHPC-373: Additional MAKE_STD_ZVAL() cleanup
-
-2015-11-07 Jeremy Mikola <jmikola@gmail.com>
- * PHPC-374: zend_string updates for OnUpdateDebug
-
-2015-11-07 Jeremy Mikola <jmikola@gmail.com>
- * PHPC-404: Additional hash API changes
-
-2015-11-07 Jeremy Mikola <jmikola@gmail.com>
- * PHPC-370: Additionally return_value_ptr and return_value_used suppressions
-
-2015-11-07 Jeremy Mikola <jmikola@gmail.com>
- * PHPC-369: Additional Z_<CLASSNAME>_OBJ_P() macros
-
-2015-11-07 Jeremy Mikola <jmikola@gmail.com>
- * PHPC-399: Additional zval_used_for_init cleanup
-
-2015-09-24 Hannes Magnusson <bjori@php.net>
- * PHPC-431: Add the testcase from the report
-
-2015-09-24 Hannes Magnusson <bjori@php.net>
- * PHPC-431: Segfault when using Manager through singleton class
-
-2015-09-02 Hannes Magnusson <bjori@php.net>
- * Use ZVAL_COPY_VALUE()
-
-2015-09-01 Hannes Magnusson <bjori@php.net>
- * Enable PHP7 on Travis
-
-2015-09-01 Hannes Magnusson <bjori@php.net>
- * PHPC-391 & PHPC-389: Stream and SSL API changes
-
-2015-09-01 Hannes Magnusson <bjori@php.net>
- * PHPC-387: Properly init the iterator, and don't free it on dtor
-
-2015-09-01 Hannes Magnusson <bjori@php.net>
- * _id doesn't have to be object
-
-2015-09-01 Hannes Magnusson <bjori@php.net>
- * Fix incorrect version checks
-
-2015-09-01 Hannes Magnusson <bjori@php.net>
- * PHPC-405: zval drop a level; zval*->zval, zval**->zval*
-
-2015-09-01 Hannes Magnusson <bjori@php.net>
- * PHPC-404: off-by-one hash api changes
-
-2015-09-01 Hannes Magnusson <bjori@php.net>
- * PHPC-390: php.ini updates
-
-2015-08-31 Hannes Magnusson <bjori@php.net>
- * littlebit to eager on the zend_string, this is PHP5
-
-2015-08-31 Hannes Magnusson <bjori@php.net>
- * Get the zend_string value
-
-2015-08-31 Hannes Magnusson <bjori@php.net>
- * hash API changes, off-by-ones
-
-2015-08-31 Hannes Magnusson <bjori@php.net>
- * PHPC-380: Use the compatability macros to get the object
-
-2015-08-31 Hannes Magnusson <bjori@php.net>
- * Properly initialize the zval* we are working with
-
-2015-08-31 Hannes Magnusson <bjori@php.net>
- * +1 in PHP5, not PHP7
-
-2015-08-31 Hannes Magnusson <bjori@php.net>
- * Include numeric keys as well
+2015-12-15 Jeremy Mikola <jmikola@gmail.com>
+ * Initial release notes for 1.1 series
-2015-09-01 Patrick Boyd <pboyd04@gmail.com>
- * Object property names missing due to lack of key length
+2015-12-15 Jeremy Mikola <jmikola@gmail.com>
+ * Bump extension version to 1.1.0
-2015-08-31 Hannes Magnusson <bjori@php.net>
- * Should all compile now!
+2015-12-14 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-509: Default Manager URI to "mongodb://localhost:27017/"
-2015-08-31 Hannes Magnusson <bjori@php.net>
- * Simpilfy iterating over a zval
+2015-12-14 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-448: Fix arginfo for ReadConcern constructor
-2015-08-31 Hannes Magnusson <bjori@php.net>
- * Use Z_ISUNDEF() to check the zval
+2015-12-12 Jorgen Evens <jorgen@evens.eu>
+ * PHPC-514: Fix --with-mongodb-sasl flag
-2015-08-31 Hannes Magnusson <bjori@php.net>
- * WS
+2015-12-14 Hannes Magnusson <bjori@php.net>
+ * PHPC-512: Disable async stream connections
-2015-08-31 Patrick Boyd <pboyd04@gmail.com>
- * PHPC-400: Handle IS_TRUE and IS_FALSE
+2015-12-14 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-508: Construct valid stream URI for IPv6 literals
-2015-08-31 Hannes Magnusson <bjori@php.net>
- * Simplify IS_ARRAY/IS_OBJECT discovery for PHP7
+2015-12-10 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-448: Manager::getReadConcern() and URI test
-2015-08-31 Hannes Magnusson <bjori@php.net>
- * PHPC-373: MAKE_STD_ZVAL() and zval* -> zval upgrades
+2015-12-10 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-448: Support readConcern option on Query
-2015-08-31 Hannes Magnusson <bjori@php.net>
- * We already know the length
+2015-12-10 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-448: Implement ReadConcern class
-2015-08-31 Patrick Boyd <pboyd04@gmail.com>
- * str_efree() not defined in PHP7
+2015-12-10 Jeremy Mikola <jmikola@gmail.com>
+ * Fix include for mongoc-write-concern-private.h
-2015-08-31 Hannes Magnusson <bjori@php.net>
- * PHPC-397: RETURN_*() should RETURN ! :)
+2015-12-11 Hannes Magnusson <bjori@php.net>
+ * Fix package license to be consistent with the source files
-2015-08-31 Hannes Magnusson <bjori@php.net>
- * PHPC-399: zval_used_for_init is no longer needed (or defined)
+2015-12-11 Hannes Magnusson <bjori@php.net>
+ * Accept MongoDB 3.2 package repo public keys on test VM
-2015-08-31 Hannes Magnusson <bjori@php.net>
- * PHPC-398: zend_parse_parameter 's' expects a char* and size_t now
+2015-12-05 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-443: Support "bypassDocumentValidation" option in BulkWrite
-2015-08-28 Patrick Boyd <pboyd04@gmail.com>
- * PHP7 upgrades
+2015-12-10 Jeremy Mikola <jmikola@gmail.com>
+ * Update package repo public key for Travis CI builds
-2015-08-31 Hannes Magnusson <bjori@php.net>
- * PHPC-373: MAKE_STD_ZVAL() is gone
+2015-12-10 Jeremy Mikola <jmikola@gmail.com>
+ * Define STANDALONE as MongoDB 3.2 on Travis CI
-2015-08-31 Hannes Magnusson <bjori@php.net>
- * PHPC-397: RETURN_STRING() duplicate argument removed
+2015-12-09 Jeremy Mikola <jmikola@gmail.com>
+ * Bump libmongoc for CDRIVER-1046 memory leak fix
-2015-08-31 Hannes Magnusson <bjori@php.net>
- * PHPC-387: get_current_data() API changes
+2015-12-09 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-450: failReceivedGetmore does not support getMore commands
-2015-08-31 Hannes Magnusson <bjori@php.net>
- * PHPC-397: dup argument in most string macros removed
+2015-12-09 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-450: Don't assert exact isMaster response when dumping Servers
-2015-08-31 Patrick Boyd <pboyd04@gmail.com>
- * PHPC-380: Use our bc type for free_object argument
+2015-12-09 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-450: Split query tests for OP_QUERY and find command
-2015-08-31 Hannes Magnusson <bjori@php.net>
- * PHPC-397: dup argument in most string macros removed
+2015-12-09 Jeremy Mikola <jmikola@gmail.com>
+ * Add MongoDB 3.0 replica set test environment
-2015-08-31 Patrick Boyd <pboyd04@gmail.com>
- * PHPC-396: HashTable no longer contains nApplyCount
+2015-12-09 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-450: Profiled aggregate commands log the collection NS in 3.2
-2015-08-27 Patrick Boyd <pboyd04@gmail.com>
- * PHPC-394: Fix issue with WriteException and zend_read_property
+2015-12-08 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-450: Update open cursor check for MongoDB 3.2
-2015-08-31 Hannes Magnusson <bjori@php.net>
- * PHPC-380: PHP7 create/free object changes
+2015-12-10 Derick Rethans <github@derickrethans.nl>
+ * Use more descriptive unused value
-2015-08-27 Patrick Boyd <pboyd04@gmail.com>
- * PHPC-380: create/free object handlers for PHP7
+2015-12-07 Hannes Magnusson <bjori@php.net>
+ * Fixed PHPC-502: bson_init_static(): precondition failed: data
-2015-08-27 Hannes Magnusson <bjori@php.net>
- * Define the TODOs for PHP5, these are PHP7 TODOs
+2015-12-09 Jeremy Mikola <jmikola@gmail.com>
+ * Use consistent name for MongoDB 3.0 test server
-2015-08-27 Hannes Magnusson <bjori@php.net>
- * PHPC-385: Remove leftover braces
+2015-12-08 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-450: Enable majority read concern by default in MO
-2015-08-27 Hannes Magnusson <bjori@php.net>
- * Sprinkle TODOs -- it compiles now!
+2015-12-08 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-450: Use MongoDB 3.2 final for testing
-2015-08-27 Hannes Magnusson <bjori@php.net>
- * PHPC-374: php_stream_xport_create() now wants zend_string
+2015-12-08 Jeremy Mikola <jmikola@gmail.com>
+ * Make server startup via MO more robust
-2015-08-27 Hannes Magnusson <bjori@php.net>
- * PHPC-388 - dtor on bson_to_zval() failure
+2015-12-08 Jeremy Mikola <jmikola@gmail.com>
+ * Register STANDALONE-3.0 with the test suite
-2015-08-27 Hannes Magnusson <bjori@php.net>
- * PHPC-387: Iterator API changes
-
-2015-08-27 Hannes Magnusson <bjori@php.net>
- * PHPC-386: Forward port Z_PHPDATE_P() to get php_date_obj
-
-2015-08-27 Hannes Magnusson <bjori@php.net>
- * PHPC-385: add_assoc_string_ex() doesn't have a duplicate param in PHP7
-
-2015-08-27 Hannes Magnusson <bjori@php.net>
- * PHPC-384: php_stream's no longer have resource ids
-
-2015-08-27 Hannes Magnusson <bjori@php.net>
- * PHPC-383: Simplify getting the current exception zval*
-
-2015-08-26 Hannes Magnusson <bjori@php.net>
- * PHPC-376: Cursor var_dump() is weird
+2015-12-08 Jeremy Mikola <jmikola@gmail.com>
+ * STANDALONE-3.0 port conflicted with STANDALONE-2.4
-2015-08-25 Hannes Magnusson <bjori@php.net>
- * PHPC-373: Remove MAKE_STD_ZVAL() usage
+2015-12-08 Derick Rethans <github@derickrethans.nl>
+ * Bump libmongoc and libbson to 1.3.0 releases
-2015-08-25 Hannes Magnusson <bjori@php.net>
- * PHPC-374: zend_string* vs char* PHP API changes (1/many)
+2015-12-02 Derick Rethans <github@derickrethans.nl>
+ * This code has changed in 3.2, and make the error message clear
-2015-08-25 Hannes Magnusson <bjori@php.net>
- * PHPC-375: TSRMLS_FETCH_FROM_CTX() not applicable in PHP7
+2015-12-02 Derick Rethans <github@derickrethans.nl>
+ * Added 3.2.0rc5 to our Mongo Orchestration suite
-2015-08-25 Hannes Magnusson <bjori@php.net>
- * PHPC-372: zend_throw_exception() return value changes
+2015-12-02 Derick Rethans <github@derickrethans.nl>
+ * Added some more phpt test leftovers to .gitignore
-2015-08-25 Hannes Magnusson <bjori@php.net>
- * PHP7: Start a phongo_compat.c with things that shouldn't be done in headers
+2015-12-08 Remi Collet <fedora@famillecollet.com>
+ * libmongoc 1.3 is not compatible
-2015-08-25 Hannes Magnusson <bjori@php.net>
- * PHP7: Lets start with just php_phongo.c for now
+2015-12-07 Jeremy Mikola <jmikola@gmail.com>
+ * Revise prep-release.php handling
-2015-08-24 Hannes Magnusson <bjori@php.net>
- * PHPC-371: Prep for PHP7 resource changes
-
-2015-08-24 Hannes Magnusson <bjori@php.net>
- * PHPC-370: Hardcode return_value_used to 1 in PHP7
-
-2015-08-24 Hannes Magnusson <bjori@php.net>
- * PHPC-370: return_value_ptr and return_value_used removed in PHP7
-
-2015-08-24 Hannes Magnusson <bjori@php.net>
- * PHPC-369: Use the new Z_<CLASSNAME>_OBJ_P() macros
-
-2015-08-24 Hannes Magnusson <bjori@php.net>
- * PHPC-369: Split PHP5 and PHP7 style custom object struct declrations
-
-2015-08-24 Hannes Magnusson <bjori@php.net>
- * PHPC-368: Refactor MongoDB\Driver\Manager ctor
-
-2015-08-24 Hannes Magnusson <bjori@php.net>
- * Fix const casting warning in php_array_api
-
-2015-08-24 Hannes Magnusson <bjori@php.net>
- * Resync with GitHub: https://github.com/sgolemon/php-array-api
-
-2015-12-15 Jeremy Mikola <jmikola@gmail.com>
+2015-12-07 Jeremy Mikola <jmikola@gmail.com>
* Back to -dev
-2015-12-15 Jeremy Mikola <jmikola@gmail.com>
- * Include libbson and libmongoc version files in PECL package
-
-2015-12-15 Jeremy Mikola <jmikola@gmail.com>
- * Add 1.1.0 release notes
+2015-12-07 Jeremy Mikola <jmikola@gmail.com>
+ * Add 1.0.1 release notes
diff --git a/mongodb-1.1.2/RELEASE-1.1.2 b/mongodb-1.1.2/RELEASE-1.1.2
new file mode 100644
index 00000000..390b5fff
--- /dev/null
+++ b/mongodb-1.1.2/RELEASE-1.1.2
@@ -0,0 +1,42 @@
+RELEASE 1.1.2
+-------------
+2016-01-07 Jeremy Mikola <jmikola@gmail.com>
+ * Bump extension version to 1.1.2
+
+2016-01-06 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-496: Revert "Temporary workaround for warning in mongoc"
+
+2016-01-06 Jeremy Mikola <jmikola@gmail.com>
+ * Improve other config.m4 check messages
+
+2015-12-31 Lior Kaplan <kaplanlior@gmail.com>
+ * PHPC-534: Enable configure without SASL and support --with-mongodb-sasl=no
+
+2015-12-31 Lior Kaplan <kaplanlior@gmail.com>
+ * Improve SASL check message
+
+2015-12-31 Lior Kaplan <kaplanlior@gmail.com>
+ * Don't print pcre-dir usage during configure check
+
+2016-01-01 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-529: Prefix BSON functions to avoid symbol conflicts
+
+2015-12-30 Jeremy Mikola <jmikola@gmail.com>
+ * phongo_bson_append() can be static and get zval type internally
+
+2015-12-30 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-528: Support zval references when appending BSON
+
+2015-12-30 Remi Collet <fedora@famillecollet.com>
+ * PHPC-527: fix call to add_index_stringl
+
+2015-12-26 Remi Collet <fedora@famillecollet.com>
+ * PHPC-527: Fix PHP 7 / 32bits build
+
+2015-12-22 Jeremy Mikola <jmikola@gmail.com>
+ * Back to -dev
+
+2015-12-22 Jeremy Mikola <jmikola@gmail.com>
+ * Add 1.1.1 release notes
+
+
diff --git a/mongodb-1.1.2/RELEASE-1.1.2-dev b/mongodb-1.1.2/RELEASE-1.1.2-dev
new file mode 100644
index 00000000..1477390e
--- /dev/null
+++ b/mongodb-1.1.2/RELEASE-1.1.2-dev
@@ -0,0 +1,81 @@
+RELEASE 1.1.2-dev
+-------------
+2016-01-06 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-496: Revert "Temporary workaround for warning in mongoc"
+
+2016-01-06 Jeremy Mikola <jmikola@gmail.com>
+ * Improve other config.m4 check messages
+
+2015-12-31 Lior Kaplan <kaplanlior@gmail.com>
+ * PHPC-534: Enable configure without SASL and support --with-mongodb-sasl=no
+
+2015-12-31 Lior Kaplan <kaplanlior@gmail.com>
+ * Improve SASL check message
+
+2015-12-31 Lior Kaplan <kaplanlior@gmail.com>
+ * Don't print pcre-dir usage during configure check
+
+2016-01-01 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-529: Prefix BSON functions to avoid symbol conflicts
+
+2015-12-30 Jeremy Mikola <jmikola@gmail.com>
+ * phongo_bson_append() can be static and get zval type internally
+
+2015-12-30 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-528: Support zval references when appending BSON
+
+2015-12-30 Remi Collet <fedora@famillecollet.com>
+ * PHPC-527: fix call to add_index_stringl
+
+2015-12-26 Remi Collet <fedora@famillecollet.com>
+ * PHPC-527: Fix PHP 7 / 32bits build
+
+2015-12-22 Jeremy Mikola <jmikola@gmail.com>
+ * Back to -dev
+
+2015-12-22 Jeremy Mikola <jmikola@gmail.com>
+ * Add 1.1.1 release notes
+
+
+RELEASE 1.1.2-dev
+-------------
+2016-01-07 Jeremy Mikola <jmikola@gmail.com>
+ * Bump extension version to 1.1.2
+
+2016-01-06 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-496: Revert "Temporary workaround for warning in mongoc"
+
+2016-01-06 Jeremy Mikola <jmikola@gmail.com>
+ * Improve other config.m4 check messages
+
+2015-12-31 Lior Kaplan <kaplanlior@gmail.com>
+ * PHPC-534: Enable configure without SASL and support --with-mongodb-sasl=no
+
+2015-12-31 Lior Kaplan <kaplanlior@gmail.com>
+ * Improve SASL check message
+
+2015-12-31 Lior Kaplan <kaplanlior@gmail.com>
+ * Don't print pcre-dir usage during configure check
+
+2016-01-01 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-529: Prefix BSON functions to avoid symbol conflicts
+
+2015-12-30 Jeremy Mikola <jmikola@gmail.com>
+ * phongo_bson_append() can be static and get zval type internally
+
+2015-12-30 Jeremy Mikola <jmikola@gmail.com>
+ * PHPC-528: Support zval references when appending BSON
+
+2015-12-30 Remi Collet <fedora@famillecollet.com>
+ * PHPC-527: fix call to add_index_stringl
+
+2015-12-26 Remi Collet <fedora@famillecollet.com>
+ * PHPC-527: Fix PHP 7 / 32bits build
+
+2015-12-22 Jeremy Mikola <jmikola@gmail.com>
+ * Back to -dev
+
+2015-12-22 Jeremy Mikola <jmikola@gmail.com>
+ * Add 1.1.1 release notes
+
+
diff --git a/mongodb-1.1.1/Vagrantfile b/mongodb-1.1.2/Vagrantfile
similarity index 100%
rename from mongodb-1.1.1/Vagrantfile
rename to mongodb-1.1.2/Vagrantfile
diff --git a/mongodb-1.1.1/config.m4 b/mongodb-1.1.2/config.m4
similarity index 95%
rename from mongodb-1.1.1/config.m4
rename to mongodb-1.1.2/config.m4
index e8c4e79f..4d03388e 100644
--- a/mongodb-1.1.1/config.m4
+++ b/mongodb-1.1.2/config.m4
@@ -1,569 +1,573 @@
dnl config.m4 for extension mongodb
PHP_ARG_ENABLE(mongodb, whether to enable mongodb support,
[ --enable-mongodb Enable mongodb support])
PHP_ARG_WITH(openssl-dir, OpenSSL dir for mongodb,
[ --with-openssl-dir[=DIR] openssl install prefix], yes, no)
dnl borrowed from PHP acinclude.m4
AC_DEFUN([PHP_BSON_BIGENDIAN],
[AC_CACHE_CHECK([whether byte ordering is bigendian], ac_cv_c_bigendian_php,
[
ac_cv_c_bigendian_php=unknown
AC_TRY_RUN(
[
int main(void)
{
short one = 1;
char *cp = (char *)&one;
if (*cp == 0) {
return(0);
} else {
return(1);
}
}
], [ac_cv_c_bigendian_php=yes], [ac_cv_c_bigendian_php=no], [ac_cv_c_bigendian_php=unknown])
])
if test $ac_cv_c_bigendian_php = yes; then
BSON_BYTE_ORDER=4321
else
BSON_BYTE_ORDER=1234
fi
AC_SUBST(BSON_BYTE_ORDER)
])
dnl Borrowed from sapi/fpm/config.m4
AC_DEFUN([PHP_BSON_CLOCK],
[
have_clock_gettime=no
AC_MSG_CHECKING([for clock_gettime])
AC_TRY_LINK([ #include <time.h> ], [struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts);], [
have_clock_gettime=yes
AC_MSG_RESULT([yes])
], [
AC_MSG_RESULT([no])
])
if test "$have_clock_gettime" = "no"; then
AC_MSG_CHECKING([for clock_gettime in -lrt])
SAVED_LIBS="$LIBS"
LIBS="$LIBS -lrt"
AC_TRY_LINK([ #include <time.h> ], [struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts);], [
have_clock_gettime=yes
AC_MSG_RESULT([yes])
], [
LIBS="$SAVED_LIBS"
AC_MSG_RESULT([no])
])
fi
if test "$have_clock_gettime" = "yes"; then
BSON_HAVE_CLOCK_GETTIME=1
AC_SUBST(BSON_HAVE_CLOCK_GETTIME)
fi
])
MONGOC_SYMBOL_SUFFIX="priv"
AC_MSG_CHECKING(PHP version)
PHP_FOUND_VERSION=`${PHP_CONFIG} --version`
PHP_FOUND_VERNUM=`echo "${PHP_FOUND_VERSION}" | $AWK 'BEGIN { FS = "."; } { printf "%d", ([$]1 * 100 + [$]2) * 100 + [$]3;}'`
AC_MSG_RESULT($PHP_FOUND_VERNUM)
if test "$MONGODB" != "no"; then
PHP_ARG_ENABLE(developer-flags, whether to enable developer build flags,
[ --enable-developer-flags Enable developer flags],, no)
if test "$PHP_DEVELOPER_FLAGS" = "yes"; then
dnl Warn about functions which might be candidates for format attributes
PHP_CHECK_GCC_ARG(-Wmissing-format-attribute, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wmissing-format-attribute")
dnl Avoid duplicating values for an enum
PHP_CHECK_GCC_ARG(-Wduplicate-enum, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wduplicate-enum")
dnl Warns on mismatches between #ifndef and #define header guards
PHP_CHECK_GCC_ARG(-Wheader-guard, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wheader-guard")
dnl logical not of a non-boolean expression
PHP_CHECK_GCC_ARG(-Wlogical-not-parentheses, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wlogical-not-parentheses")
dnl Warn about suspicious uses of logical operators in expressions
PHP_CHECK_GCC_ARG(-Wlogical-op, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wlogical-op")
dnl memory error detector.
dnl FIXME: -fsanitize=address,undefined for clang. The PHP_CHECK_GCC_ARG macro isn't happy about that string :(
PHP_CHECK_GCC_ARG(-fsanitize-address, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -fsanitize-address")
dnl Enable frame debugging
PHP_CHECK_GCC_ARG(-fno-omit-frame-pointer, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -fno-omit-frame-pointer")
dnl Make sure we don't optimize calls
PHP_CHECK_GCC_ARG(-fno-optimize-sibling-calls, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -fno-optimize-sibling-calls")
PHP_CHECK_GCC_ARG(-Wlogical-op-parentheses, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wlogical-op-parentheses")
PHP_CHECK_GCC_ARG(-Wbool-conversion, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wbool-conversion")
PHP_CHECK_GCC_ARG(-Wloop-analysis, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wloop-analysis")
PHP_CHECK_GCC_ARG(-Wsizeof-array-argument, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wsizeof-array-argument")
PHP_CHECK_GCC_ARG(-Wstring-conversion, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wstring-conversion")
PHP_CHECK_GCC_ARG(-Wno-variadic-macros, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wno-variadic-macros")
PHP_CHECK_GCC_ARG(-Wno-sign-compare, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wno-sign-compare")
PHP_CHECK_GCC_ARG(-fstack-protector, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -fstack-protector")
PHP_CHECK_GCC_ARG(-fno-exceptions, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -fno-exceptions")
PHP_CHECK_GCC_ARG(-Wformat-security, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wformat-security")
PHP_CHECK_GCC_ARG(-Wformat-nonliteral, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wformat-nonliteral")
PHP_CHECK_GCC_ARG(-Winit-self, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Winit-self")
PHP_CHECK_GCC_ARG(-Wwrite-strings, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wwrite-strings")
PHP_CHECK_GCC_ARG(-Wenum-compare, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wenum-compare")
PHP_CHECK_GCC_ARG(-Wempty-body, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wempty-body")
PHP_CHECK_GCC_ARG(-Wparentheses, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wparentheses")
PHP_CHECK_GCC_ARG(-Wdeclaration-after-statement, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Wdeclaration-after-statement")
if test "$PHP_FOUND_VERNUM" -ge "50400"; then
PHP_CHECK_GCC_ARG(-Werror, _MAINTAINER_CFLAGS="$_MAINTAINER_CFLAGS -Werror")
fi
MAINTAINER_CFLAGS="-Wextra $_MAINTAINER_CFLAGS -Wno-unused-parameter -Wno-unused-but-set-variable -Wno-missing-field-initializers"
STD_CFLAGS="-g -O0 -Wall"
dnl EXTRA_LDFLAGS="-Wl,--no-undefined"
fi
PHP_ARG_ENABLE(coverage, whether to enable code coverage,
[ --enable-coverage Enable developer code coverage information],, no)
if test "$PHP_COVERAGE" = "yes"; then
PHP_CHECK_GCC_ARG(-fprofile-arcs, COVERAGE_CFLAGS="$COVERAGE_CFLAGS -fprofile-arcs")
PHP_CHECK_GCC_ARG(-ftest-coverage, COVERAGE_CFLAGS="$COVERAGE_CFLAGS -ftest-coverage")
EXTRA_LDFLAGS="$COVERAGE_CFLAGS"
fi
MONGODB_BSON="\
src/bson.c \
";
MONGODB_BSON_CLASSES="\
src/BSON/Type.c \
src/BSON/Unserializable.c \
src/BSON/Serializable.c \
src/BSON/Persistable.c \
src/BSON/Binary.c \
src/BSON/Javascript.c \
src/BSON/MaxKey.c \
src/BSON/MinKey.c \
src/BSON/ObjectID.c \
src/BSON/Regex.c \
src/BSON/Timestamp.c \
src/BSON/UTCDateTime.c \
";
MONGODB_ROOT="\
php_phongo.c \
phongo_compat.c \
";
MONGODB_CONTRIB="\
src/contrib/php-ssl.c \
";
MONGODB_MONGODB_CLASSES="\
src/MongoDB/Command.c \
src/MongoDB/Cursor.c \
src/MongoDB/CursorId.c \
src/MongoDB/Manager.c \
src/MongoDB/Query.c \
src/MongoDB/ReadConcern.c \
src/MongoDB/ReadPreference.c \
src/MongoDB/Server.c \
src/MongoDB/BulkWrite.c \
src/MongoDB/WriteConcern.c \
src/MongoDB/WriteConcernError.c \
src/MongoDB/WriteError.c \
src/MongoDB/WriteResult.c \
";
MONGODB_MONGODB_EXCEPTIONS="\
src/MongoDB/Exception/Exception.c \
src/MongoDB/Exception/LogicException.c \
src/MongoDB/Exception/RuntimeException.c \
src/MongoDB/Exception/UnexpectedValueException.c \
src/MongoDB/Exception/InvalidArgumentException.c \
src/MongoDB/Exception/ConnectionException.c \
src/MongoDB/Exception/AuthenticationException.c \
src/MongoDB/Exception/SSLConnectionException.c \
src/MongoDB/Exception/ExecutionTimeoutException.c \
src/MongoDB/Exception/ConnectionTimeoutException.c \
src/MongoDB/Exception/WriteException.c \
src/MongoDB/Exception/BulkWriteException.c \
";
YAJL_SOURCES="\
yajl_version.c \
yajl.c \
yajl_encode.c \
yajl_lex.c \
yajl_parser.c \
yajl_buf.c \
yajl_tree.c \
yajl_alloc.c \
yajl_gen.c
";
BSON_SOURCES="\
bcon.c \
bson.c \
bson-atomic.c \
bson-clock.c \
bson-context.c \
bson-error.c \
bson-iter.c \
bson-iso8601.c \
bson-json.c \
bson-keys.c \
bson-md5.c \
bson-memory.c \
bson-oid.c \
bson-reader.c \
bson-string.c \
bson-timegm.c \
bson-utf8.c \
bson-value.c \
bson-version-functions.c \
bson-writer.c
";
MONGOC_SOURCES="\
mongoc-array.c \
mongoc-async.c \
mongoc-async-cmd.c \
mongoc-buffer.c \
mongoc-bulk-operation.c \
mongoc-b64.c \
mongoc-client.c \
mongoc-client-pool.c \
mongoc-cluster.c \
mongoc-collection.c \
mongoc-counters.c \
mongoc-cursor.c \
mongoc-cursor-array.c \
mongoc-cursor-transform.c \
mongoc-cursor-cursorid.c \
mongoc-database.c \
mongoc-find-and-modify.c \
mongoc-init.c \
mongoc-gridfs.c \
mongoc-gridfs-file.c \
mongoc-gridfs-file-page.c \
mongoc-gridfs-file-list.c \
mongoc-host-list.c \
mongoc-index.c \
mongoc-list.c \
mongoc-log.c \
mongoc-matcher-op.c \
mongoc-matcher.c \
mongoc-memcmp.c \
mongoc-opcode.c \
mongoc-queue.c \
mongoc-read-concern.c \
mongoc-read-prefs.c \
mongoc-rpc.c \
mongoc-set.c \
mongoc-server-description.c \
mongoc-server-stream.c \
mongoc-socket.c \
mongoc-stream.c \
mongoc-stream-buffered.c \
mongoc-stream-file.c \
mongoc-stream-gridfs.c \
mongoc-stream-socket.c \
mongoc-topology.c \
mongoc-topology-scanner.c \
mongoc-topology-description.c \
mongoc-uri.c \
mongoc-util.c \
mongoc-version-functions.c \
mongoc-write-command.c \
mongoc-write-concern.c
";
MONGOC_SOURCES_SSL="\
mongoc-rand.c \
mongoc-scram.c \
mongoc-stream-tls.c \
mongoc-ssl.c
";
MONGOC_SOURCES_SASL=mongoc-sasl.c
if test "$ext_shared" = "no"; then
PHP_ADD_SOURCES(PHP_EXT_DIR(mongodb), $MONGODB_BSON)
PHP_ADD_SOURCES(PHP_EXT_DIR(mongodb), $MONGODB_BSON_CLASSES)
PHP_ADD_SOURCES(PHP_EXT_DIR(mongodb), $MONGODB_MONGODB_CLASSES)
PHP_ADD_SOURCES(PHP_EXT_DIR(mongodb), $MONGODB_MONGODB_EXCEPTIONS)
PHP_ADD_SOURCES(PHP_EXT_DIR(mongodb), $MONGODB_CONTRIB)
else
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb), $MONGODB_BSON, [$STD_CFLAGS $MAINTAINER_CFLAGS $COVERAGE_CFLAGS], shared_objects_mongodb, yes)
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb), $MONGODB_BSON_CLASSES, [$STD_CFLAGS $MAINTAINER_CFLAGS $COVERAGE_CFLAGS], shared_objects_mongodb, yes)
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb), $MONGODB_MONGODB_CLASSES, [$STD_CFLAGS $MAINTAINER_CFLAGS $COVERAGE_CFLAGS], shared_objects_mongodb, yes)
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb), $MONGODB_MONGODB_EXCEPTIONS, [$STD_CFLAGS $MAINTAINER_CFLAGS $COVERAGE_CFLAGS], shared_objects_mongodb, yes)
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb), $MONGODB_CONTRIB, [$STD_CFLAGS $MAINTAINER_CFLAGS $COVERAGE_CFLAGS], shared_objects_mongodb, yes)
fi
-PHP_ARG_WITH(libbson, Use system libbson,
+PHP_ARG_WITH(libbson, whether to use system libbson,
[ --with-libbson Use system libbson], no, no)
if test "$PHP_LIBBSON" != "no"; then
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
AC_MSG_CHECKING(for libbson)
if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libbson-1.0; then
if $PKG_CONFIG libbson-1.0 --atleast-version 1.3.0; then
LIBBSON_INC=`$PKG_CONFIG libbson-1.0 --cflags`
LIBBSON_LIB=`$PKG_CONFIG libbson-1.0 --libs`
LIBBSON_VER=`$PKG_CONFIG libbson-1.0 --modversion`
AC_MSG_RESULT(version $LIBBSON_VER found)
else
AC_MSG_ERROR(system libbson must be upgraded to version >= 1.3.0)
fi
else
AC_MSG_ERROR(pkgconfig and libbson must be installed)
fi
PHP_EVAL_INCLINE($LIBBSON_INC)
PHP_EVAL_LIBLINE($LIBBSON_LIB, MONGODB_SHARED_LIBADD)
AC_DEFINE(HAVE_SYSTEM_LIBBSON, 1, [Use system libbson])
else
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libbson/src/yajl], $YAJL_SOURCES, [$STD_CFLAGS], shared_objects_mongodb, yes)
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libbson/src/bson], $BSON_SOURCES, [$STD_CFLAGS], shared_objects_mongodb, yes)
fi
dnl libmongoc stuff {{{
AC_MSG_CHECKING(configuring libmongoc)
AC_MSG_RESULT(...)
-PHP_ARG_WITH(libmongoc, Use system libmongoc,
+PHP_ARG_WITH(libmongoc, whether to use system libmongoc,
[ --with-libmongoc Use system libmongoc], no, no)
AC_DEFINE(HAVE_MONGOC, 1, [Kinda useless extension without it..])
if test "$PHP_LIBMONGOC" != "no"; then
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
AC_MSG_CHECKING(for libmongoc)
if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libmongoc-1.0 && $PKG_CONFIG --exists libmongoc-priv; then
if $PKG_CONFIG libmongoc-1.0 --atleast-version 1.3.0; then
LIBMONGOC_INC=`$PKG_CONFIG libmongoc-priv --cflags`
LIBMONGOC_LIB=`$PKG_CONFIG libmongoc-priv --libs`
LIBMONGOC_VER=`$PKG_CONFIG libmongoc-priv --modversion`
AC_MSG_RESULT(version $LIBMONGOC_VER found)
CFLAGS="$CFLAGS -DMONGOC_I_AM_A_DRIVER"
else
AC_MSG_ERROR(system libmongoc must be upgraded to version >= 1.3.0)
fi
else
AC_MSG_ERROR(pkgconfig and mongoc must be installed)
fi
PHP_EVAL_INCLINE($LIBMONGOC_INC)
PHP_EVAL_LIBLINE($LIBMONGOC_LIB, MONGODB_SHARED_LIBADD)
AC_DEFINE(HAVE_SYSTEM_LIBMONGOC, 1, [Use system libmongoc])
else
CPPFLAGS="$CPPFLAGS -DBSON_COMPILATION -DMONGOC_COMPILATION -DMONGOC_TRACE"
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES, [$STD_CFLAGS], shared_objects_mongodb, yes)
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_SSL, [$STD_CFLAGS], shared_objects_mongodb, yes)
PHP_ADD_SOURCES_X(PHP_EXT_DIR(mongodb)[src/libmongoc/src/mongoc], $MONGOC_SOURCES_SASL, [$STD_CFLAGS], shared_objects_mongodb, yes)
PHP_SETUP_OPENSSL(MONGODB_SHARED_LIBADD)
MONGOC_ENABLE_SSL=1
AC_SUBST(MONGOC_ENABLE_SSL)
fi
-PHP_ARG_WITH(pcre-dir, pcre-dir install prefix
+PHP_ARG_WITH(pcre-dir, for pcre-dir install prefix,
[ --with-pcre-dir[=DIR] mongodb: pcre install prefix], auto, yes)
if test "$PHP_PCRE_DIR" != "no"; then
AC_MSG_CHECKING(for pcre)
for i in $PHP_PCRE_DIR /usr /usr/local; do
if test -f $i/include/pcre.h; then
MONGODB_PCRE_DIR=$i/include
AC_MSG_RESULT(found in $i)
break
fi
done
if test -z "$MONGODB_PCRE_DIR"; then
AC_MSG_RESULT(not found)
else
PHP_ADD_INCLUDE($MONGODB_PCRE_DIR)
fi
fi
-PHP_ARG_WITH(mongodb-sasl, Build with Cyrus SASL support,
-[ --with-mongodb-sasl[=DIR] mongodb: Include Cyrus SASL support], auto, yes)
+PHP_ARG_WITH(mongodb-sasl, for Cyrus SASL support,
+[ --with-mongodb-sasl[=DIR] mongodb: Include Cyrus SASL support], auto, no)
if test "$PHP_MONGODB_SASL" != "no"; then
AC_MSG_CHECKING(for SASL)
for i in $PHP_MONGODB_SASL /usr /usr/local; do
if test -f $i/include/sasl/sasl.h; then
MONGODB_SASL_DIR=$i
AC_MSG_RESULT(found in $i)
break
fi
done
if test -z "$MONGODB_SASL_DIR"; then
AC_MSG_RESULT(not found)
- if test "$MONGODB_SASL" != "auto"; then
+ if test "$PHP_MONGODB_SASL" != "auto"; then
AC_MSG_ERROR([sasl.h not found!])
+ else
+ AC_SUBST(MONGOC_ENABLE_SASL, 0)
+ AC_SUBST(MONGOC_HAVE_SASL_CLIENT_DONE, 0)
fi
- fi
+ else
- PHP_CHECK_LIBRARY(sasl2, sasl_version,
- [
- PHP_ADD_INCLUDE($MONGODB_SASL_DIR)
- PHP_ADD_LIBRARY_WITH_PATH(sasl2, $MONGODB_SASL_DIR/$PHP_LIBDIR, MONGODB_SHARED_LIBADD)
- MONGOC_ENABLE_SASL=1
- AC_SUBST(MONGOC_ENABLE_SASL)
- ], [
- if test "$MONGODB_SASL" != "auto"; then
- AC_MSG_ERROR([MONGO SASL check failed. Please check config.log for more information.])
- fi
- ], [
- -L$MONGODB_SASL_DIR/$PHP_LIBDIR
- ])
+ PHP_CHECK_LIBRARY(sasl2, sasl_version,
+ [
+ PHP_ADD_INCLUDE($MONGODB_SASL_DIR)
+ PHP_ADD_LIBRARY_WITH_PATH(sasl2, $MONGODB_SASL_DIR/$PHP_LIBDIR, MONGODB_SHARED_LIBADD)
+ MONGOC_ENABLE_SASL=1
+ AC_SUBST(MONGOC_ENABLE_SASL)
+ ], [
+ if test "$MONGODB_SASL" != "auto"; then
+ AC_MSG_ERROR([MONGO SASL check failed. Please check config.log for more information.])
+ fi
+ ], [
+ -L$MONGODB_SASL_DIR/$PHP_LIBDIR
+ ])
- PHP_CHECK_LIBRARY(sasl2, sasl_client_done,
- [
- AC_SUBST(MONGOC_HAVE_SASL_CLIENT_DONE, 1)
- ], [
- AC_SUBST(MONGOC_HAVE_SASL_CLIENT_DONE, 0)
- ])
+ PHP_CHECK_LIBRARY(sasl2, sasl_client_done,
+ [
+ AC_SUBST(MONGOC_HAVE_SASL_CLIENT_DONE, 1)
+ ], [
+ AC_SUBST(MONGOC_HAVE_SASL_CLIENT_DONE, 0)
+ ])
+ fi
else
AC_SUBST(MONGOC_ENABLE_SASL, 0)
AC_SUBST(MONGOC_HAVE_SASL_CLIENT_DONE, 0)
fi
m4_include(src/libmongoc/build/autotools/WeakSymbols.m4)
m4_include(src/libmongoc/build/autotools/m4/ax_pthread.m4)
AX_PTHREAD
AC_CHECK_FUNCS([shm_open], [SHM_LIB=], [AC_CHECK_LIB([rt], [shm_open], [SHM_LIB=-lrt], [SHM_LIB=])])
MONGODB_SHARED_LIBADD="$MONGODB_SHARED_LIBADD $SHM_LIB"
dnl PHP_ADD_LIBRARY_WITH_PATH(bson-1.0, src/libbson/.libs, MONGODB_SHARED_LIBADD)
dnl PHP_ADD_LIBRARY_WITH_PATH(mongoc-priv, src/libmongoc/.libs, MONGODB_SHARED_LIBADD)
EXTRA_CFLAGS="$PTHREAD_CFLAGS $SASL_CFLAGS"
PHP_SUBST(EXTRA_CFLAGS)
PHP_SUBST(EXTRA_LDFLAGS)
MONGODB_SHARED_LIBADD="$MONGODB_SHARED_LIBADD $PTHREAD_LIBS $SASL_LIBS"
PHP_SUBST(MONGODB_SHARED_LIBADD)
dnl }}}
PHP_NEW_EXTENSION(mongodb, $MONGODB_ROOT, $ext_shared,, [$STD_CFLAGS $MAINTAINER_CFLAGS $COVERAGE_CFLAGS])
PHP_ADD_EXTENSION_DEP(mongodb, spl)
PHP_ADD_INCLUDE([$ext_srcdir/src/BSON/])
PHP_ADD_INCLUDE([$ext_srcdir/src/MongoDB/])
PHP_ADD_INCLUDE([$ext_srcdir/src/MongoDB/Exception/])
PHP_ADD_INCLUDE([$ext_srcdir/src/contrib/])
PHP_ADD_BUILD_DIR([$ext_builddir/src/BSON/])
PHP_ADD_BUILD_DIR([$ext_builddir/src/MongoDB/])
PHP_ADD_BUILD_DIR([$ext_builddir/src/MongoDB/Exception/])
PHP_ADD_BUILD_DIR([$ext_builddir/src/contrib/])
if test "$PHP_LIBMONGOC" == "no"; then
PHP_ADD_INCLUDE([$ext_srcdir/src/libmongoc/src/mongoc/])
PHP_ADD_BUILD_DIR([$ext_builddir/src/libmongoc/src/mongoc/])
fi
if test "$PHP_LIBBSON" == "no"; then
m4_include(src/libbson/build/autotools/CheckAtomics.m4)
m4_include(src/libbson/build/autotools/FindDependencies.m4)
m4_include(src/libbson/build/autotools/m4/ac_compile_check_sizeof.m4)
m4_include(src/libbson/build/autotools/m4/ac_create_stdint_h.m4)
AC_CREATE_STDINT_H([$srcdir/src/libbson/src/bson/bson-stdint.h])
PHP_ADD_INCLUDE([$ext_srcdir/src/libbson/src/])
PHP_ADD_INCLUDE([$ext_srcdir/src/libbson/src/yajl/])
PHP_ADD_INCLUDE([$ext_srcdir/src/libbson/src/bson/])
PHP_ADD_BUILD_DIR([$ext_builddir/src/libbson/src/])
PHP_ADD_BUILD_DIR([$ext_builddir/src/libbson/src/yajl/])
PHP_ADD_BUILD_DIR([$ext_builddir/src/libbson/src/bson/])
fi
dnl MONGODB_SHARED_DEPENDENCIES="mongodbdep"
dnl PHP_SUBST(MONGODB_SHARED_DEPENDENCIES)
PHP_BSON_BIGENDIAN
AC_HEADER_STDBOOL
BSON_EXTRA_ALIGN=0
AC_SUBST(BSON_EXTRA_ALIGN)
if test "$ac_cv_header_stdbool_h" = "yes"; then
BSON_HAVE_STDBOOL_H=1
else
BSON_HAVE_STDBOOL_H=0
fi
AC_SUBST(BSON_HAVE_STDBOOL_H)
BSON_OS=1
AC_SUBST(BSON_OS)
PHP_BSON_CLOCK
AC_CHECK_FUNC(strnlen,ac_cv_func_strnlen=yes,ac_cv_func_strnlen=no)
if test "$ac_cv_func_strnlen" = "yes"; then
BSON_HAVE_STRNLEN=1
fi
AC_SUBST(BSON_HAVE_STRNLEN)
AC_CHECK_FUNC(snprintf,ac_cv_func_snprintf=yes,ac_cv_func_snprintf=no)
if test "$ac_cv_func_snprintf" = "yes"; then
BSON_HAVE_SNPRINTF=1
fi
AC_SUBST(BSON_HAVE_SNPRINTF)
if test "$PHP_LIBMONGOC" == "no"; then
backup_srcdir=${srcdir}
srcdir=${srcdir}/src/libmongoc/
m4_include(src/libmongoc/build/autotools/Versions.m4)
srcdir=${backup_srcdir}
MONGOC_API_VERSION=1.0
AC_SUBST(MONGOC_MAJOR_VERSION)
AC_SUBST(MONGOC_MINOR_VERSION)
AC_SUBST(MONGOC_MICRO_VERSION)
AC_SUBST(MONGOC_API_VERSION)
AC_SUBST(MONGOC_VERSION)
AC_OUTPUT($srcdir/src/libmongoc/src/mongoc/mongoc-config.h)
AC_OUTPUT($srcdir/src/libmongoc/src/mongoc/mongoc-version.h)
fi
if test "$PHP_LIBBSON" == "no"; then
backup_srcdir=${srcdir}
srcdir=${srcdir}/src/libbson/
m4_include(src/libbson/build/autotools/Versions.m4)
srcdir=${backup_srcdir}
BSON_API_VERSION=1.0
AC_SUBST(BSON_MAJOR_VERSION)
AC_SUBST(BSON_MINOR_VERSION)
AC_SUBST(BSON_MICRO_VERSION)
AC_SUBST(BSON_API_VERSION)
AC_SUBST(BSON_VERSION)
AC_OUTPUT($srcdir/src/libbson/src/bson/bson-config.h)
AC_OUTPUT($srcdir/src/libbson/src/bson/bson-version.h)
fi
dnl This must come after PHP_NEW_EXTENSION, otherwise the srcdir won't be set
PHP_ADD_MAKEFILE_FRAGMENT
AC_CONFIG_COMMANDS_POST([echo "
mongodb was configured with the following options:
Build configuration:
CFLAGS : $CFLAGS
Extra CFLAGS : $STD_CFLAGS $EXTRA_CFLAGS
Developers flags (slow) : $MAINTAINER_CFLAGS
Code Coverage flags (extra slow) : $COVERAGE_CFLAGS
System mongoc : $PHP_LIBMONGOC
System libbson : $PHP_LIBBSON
LDFLAGS : $LDFLAGS
EXTRA_LDFLAGS : $EXTRA_LDFLAGS
MONGODB_SHARED_LIBADD : $MONGODB_SHARED_LIBADD
Please submit bugreports at:
https://jira.mongodb.org/browse/PHPC
"])
fi
dnl: vim: et sw=2
diff --git a/mongodb-1.1.1/config.w32 b/mongodb-1.1.2/config.w32
similarity index 100%
rename from mongodb-1.1.1/config.w32
rename to mongodb-1.1.2/config.w32
diff --git a/mongodb-1.1.1/phongo_compat.c b/mongodb-1.1.2/phongo_compat.c
similarity index 100%
rename from mongodb-1.1.1/phongo_compat.c
rename to mongodb-1.1.2/phongo_compat.c
diff --git a/mongodb-1.1.1/phongo_compat.h b/mongodb-1.1.2/phongo_compat.h
similarity index 96%
rename from mongodb-1.1.1/phongo_compat.h
rename to mongodb-1.1.2/phongo_compat.h
index da4aed1d..b865b88f 100644
--- a/mongodb-1.1.1/phongo_compat.h
+++ b/mongodb-1.1.2/phongo_compat.h
@@ -1,220 +1,224 @@
/*
+---------------------------------------------------------------------------+
| PHP Driver for MongoDB |
+---------------------------------------------------------------------------+
| Copyright 2013-2015 MongoDB, Inc. |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); |
| you may not use this file except in compliance with the License. |
| You may obtain a copy of the License at |
| |
| http://www.apache.org/licenses/LICENSE-2.0 |
| |
| Unless required by applicable law or agreed to in writing, software |
| distributed under the License is distributed on an "AS IS" BASIS, |
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| See the License for the specific language governing permissions and |
| limitations under the License. |
+---------------------------------------------------------------------------+
| Copyright (c) 2015 MongoDB, Inc. |
+---------------------------------------------------------------------------+
*/
#ifndef PHONGO_COMPAT_H
#define PHONGO_COMPAT_H
#include <php.h>
#include <Zend/zend_string.h>
#if PHP_VERSION_ID >= 70000
#include <Zend/zend_portability.h>
#endif
#ifdef PHP_WIN32
# include "config.w32.h"
#else
# include <php_config.h>
#endif
#ifndef PHP_FE_END
# define PHP_FE_END { NULL, NULL, NULL }
#endif
#ifndef HASH_KEY_NON_EXISTENT
# define HASH_KEY_NON_EXISTENT HASH_KEY_NON_EXISTANT
#endif
#if PHP_VERSION_ID < 50400
# define object_properties_init(_std, _class_type) \
zend_hash_copy(*_std.properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
#endif
#if PHP_VERSION_ID >= 70000
# define str_efree(s) efree((char*)s)
#elif PHP_VERSION_ID < 50400
# define str_efree(s) efree((char*)s)
#else
# include <Zend/zend_string.h>
#endif
#if PHP_VERSION_ID >= 50500
#define ITERATOR_GET_CURRENT_KEY(it, z) \
(it).funcs->get_current_key(&(it), z TSRMLS_CC);
#else
#define ITERATOR_GET_CURRENT_KEY(it, z) \
{ \
char *str_key; \
uint str_key_len; \
ulong int_key; \
switch ((it).funcs->get_current_key(&(it), &str_key, &str_key_len, &int_key TSRMLS_CC)) { \
case HASH_KEY_IS_LONG: \
ZVAL_LONG(z, int_key); \
break; \
case HASH_KEY_IS_STRING: \
ZVAL_STRINGL(z, str_key, str_key_len-1, 0); \
break; \
default: \
RETURN_NULL(); \
} \
}
#endif
/* There was a very bad bug in 5.6.0 through 5.6.6 downgrading
* METHOD_SSLv23 to SSLv2 and SSLv3 exclusively */
#if PHP_VERSION_ID >= 50600 && PHP_VERSION_ID < 50607
# define PHONGO_CRYPTO_METHOD STREAM_CRYPTO_METHOD_ANY_CLIENT
#else
# define PHONGO_CRYPTO_METHOD STREAM_CRYPTO_METHOD_SSLv23_CLIENT
#endif
#if defined(__GNUC__)
# define ARG_UNUSED __attribute__ ((unused))
#else
# define ARG_UNUSED
#endif
#if SIZEOF_LONG == 4
# define ADD_INDEX_INT64(zval, index, value) \
if (value > LONG_MAX || value < LONG_MIN) { \
char *tmp; \
int tmp_len; \
mongoc_log(MONGOC_LOG_LEVEL_WARNING, MONGOC_LOG_DOMAIN, "Integer overflow detected on your platform: %lld", value); \
tmp_len = spprintf(&tmp, 0, "%lld", value); \
- add_index_stringl(zval, index, tmp, tmp_len, 0); \
+ ADD_INDEX_STRINGL(zval, index, tmp, tmp_len); \
+ efree(tmp); \
} else { \
add_index_long(zval, index, val); \
}
# define ADD_ASSOC_INT64(zval, key, value) \
if (value > LONG_MAX || value < LONG_MIN) { \
char *tmp; \
int tmp_len; \
mongoc_log(MONGOC_LOG_LEVEL_WARNING, MONGOC_LOG_DOMAIN, "Integer overflow detected on your platform: %lld", value); \
tmp_len = spprintf(&tmp, 0, "%lld", value); \
- add_assoc_stringl(zval, key, tmp, tmp_len, 0); \
+ ADD_ASSOC_STRINGL(zval, key, tmp, tmp_len); \
+ efree(tmp); \
} else { \
add_assoc_long(zval, key, value); \
}
#else
# define ADD_INDEX_INT64(zval, index, value) add_index_long(zval, index, value)
# define ADD_ASSOC_INT64(zval, key, value) add_assoc_long(zval, key, value);
#endif
#ifdef HAVE_ATOLL
# define STRTOLL(s) atoll(s)
#else
# if defined(PHP_WIN32)
# define STRTOLL(s) _atoi64(s)
# else
# define STRTOLL(s) strtoll(s, NULL, 10)
# endif
#endif
#if PHP_VERSION_ID < 50400
# define GET_DEFAULT_CONTEXT() \
ctx = FG(default_context) ? FG(default_context) : php_stream_context_alloc()
#else
# define GET_DEFAULT_CONTEXT() \
ctx = FG(default_context) ? FG(default_context) : php_stream_context_alloc(TSRMLS_C)
#endif
#ifndef php_ignore_value
# if defined(__GNUC__) && __GNUC__ >= 4
# define php_ignore_value(x) (({ __typeof__ (x) __x = (x); (void) __x; }))
# else
# define php_ignore_value(x) ((void) (x))
# endif
#endif
#if PHP_VERSION_ID >= 70000
# define phongo_char zend_string
# define phongo_char_pdup(str) pestrdup(filename->val, 1)
# define phongo_char_free(str) zend_string_release(str)
# define phongo_str(str) str->val
# define phongo_create_object_retval zend_object*
# define PHONGO_ALLOC_OBJECT_T(_obj_t, _class_type) (_obj_t *)ecalloc(1, sizeof(_obj_t)+zend_object_properties_size(_class_type))
# define PHONGO_TSRMLS_FETCH_FROM_CTX(user_data)
# define SUPPRESS_UNUSED_WARNING(x)
# define DECLARE_RETURN_VALUE_USED int return_value_used = 1;
# define EXCEPTION_P(_ex, _zp) ZVAL_OBJ(&_zp, _ex)
# define PHONGO_STREAM_ID(stream) stream->res ? stream->res->handle : -1
# define ADD_ASSOC_STRING(_zv, _key, _value) add_assoc_string_ex(_zv, ZEND_STRL(_key), _value);
# define ADD_ASSOC_STRINGL(_zv, _key, _value, _len) add_assoc_stringl_ex(_zv, ZEND_STRL(_key), _value, _len);
# define ADD_ASSOC_LONG_EX(_zv, _key, _value) add_assoc_long_ex(_zv, ZEND_STRL(_key), _value);
# define ADD_ASSOC_STRING_EX(_zv, _key, _key_len, _value, _value_len) add_assoc_stringl_ex(_zv, _key, _key_len, _value, _value_len);
# define ADD_ASSOC_ZVAL_EX(_zv, _key, _value) add_assoc_zval_ex(_zv, ZEND_STRL(_key), _value);
# define ADD_ASSOC_ZVAL(_zv, _key, _value) add_assoc_zval(_zv, _key, _value);
# define ADD_ASSOC_NULL_EX(_zv, _key) add_assoc_null_ex(_zv, ZEND_STRL(_key));
# define ADD_ASSOC_BOOL_EX(_zv, _key, _value) add_assoc_bool_ex(_zv, ZEND_STRL(_key), _value);
+# define ADD_INDEX_STRINGL(_zv, _ind, _value, _len) add_index_stringl(_zv, _ind, _value, _len);
# define phongo_free_object_arg zend_object
# define phongo_zpp_char_len size_t
# define ZEND_HASH_APPLY_COUNT(ht) (ht)->u.v.nApplyCount
# define PHONGO_RETVAL_STRINGL(s, slen) RETVAL_STRINGL(s, slen)
# define PHONGO_RETURN_STRINGL(s, slen) RETURN_STRINGL(s, slen)
# define PHONGO_RETURN_STRING(s) RETURN_STRING(s)
#else
# define phongo_char char
# define phongo_char_pdup(str) pestrdup(filename, 1)
# define phongo_char_free(str) _efree(str ZEND_FILE_LINE_CC ZEND_FILE_LINE_CC)
# define phongo_str(str) str
# define phongo_create_object_retval zend_object_value
# define PHONGO_ALLOC_OBJECT_T(_obj_t, _class_type) (_obj_t *)ecalloc(1, sizeof(_obj_t))
# define PHONGO_TSRMLS_FETCH_FROM_CTX(user_data) TSRMLS_FETCH_FROM_CTX(user_data)
# define SUPPRESS_UNUSED_WARNING(x) (void)x;
# define DECLARE_RETURN_VALUE_USED
# define EXCEPTION_P(_ex, _zp) _zp = _ex
# define PHONGO_STREAM_ID(stream) stream->rsrc_id
# define ADD_ASSOC_STRING(_zv, _key, _value) add_assoc_string_ex(_zv, ZEND_STRS(_key), _value, 1);
# define ADD_ASSOC_STRINGL(_zv, _key, _value, _len) add_assoc_stringl_ex(_zv, ZEND_STRS(_key), _value, _len, 1);
# define ADD_ASSOC_STRING_EX(_zv, _key, _key_len, _value, _value_len) add_assoc_stringl_ex(_zv, _key, _key_len+1, _value, _value_len, 1);
# define ADD_ASSOC_LONG_EX(_zv, _key, _value) add_assoc_long_ex(_zv, ZEND_STRS(_key), _value);
# define ADD_ASSOC_ZVAL_EX(_zv, _key, _value) add_assoc_zval_ex(_zv, ZEND_STRS(_key), _value);
# define ADD_ASSOC_ZVAL(_zv, _key, _value) add_assoc_zval(_zv, _key, _value);
# define ADD_ASSOC_NULL_EX(_zv, _key) add_assoc_null_ex(_zv, ZEND_STRS(_key));
# define ADD_ASSOC_BOOL_EX(_zv, _key, _value) add_assoc_bool_ex(_zv, ZEND_STRS(_key), _value);
+# define ADD_INDEX_STRINGL(_zv, _ind, _value, _len) add_index_stringl(_zv, _ind, _value, _len, 0);
# define Z_PHPDATE_P(object) zend_object_store_get_object(object TSRMLS_CC)
# define Z_ISUNDEF(x) !x
# define phongo_free_object_arg void
# define phongo_zpp_char_len int
# define ZEND_HASH_APPLY_COUNT(ht) (ht)->nApplyCount
# define PHONGO_RETVAL_STRINGL(s, slen) RETVAL_STRINGL(s, slen, 1)
# define PHONGO_RETURN_STRINGL(s, slen) RETURN_STRINGL(s, slen, 1)
# define PHONGO_RETURN_STRING(s) RETURN_STRING(s, 1)
# define PHP_STREAM_CONTEXT(stream) ((php_stream_context*) (stream)->context)
#endif
void *x509_from_zval(zval *zval TSRMLS_DC);
void phongo_add_exception_prop(const char *prop, int prop_len, zval *value TSRMLS_DC);
#endif /* PHONGO_COMPAT_H */
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/
diff --git a/mongodb-1.1.1/php_bson.h b/mongodb-1.1.2/php_bson.h
similarity index 85%
rename from mongodb-1.1.1/php_bson.h
rename to mongodb-1.1.2/php_bson.h
index 5d532849..f6208e2b 100644
--- a/mongodb-1.1.1/php_bson.h
+++ b/mongodb-1.1.2/php_bson.h
@@ -1,103 +1,103 @@
/*
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
| Copyright (c) 20142015 Hannes Magnusson |
+----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
| http://www.php.net/license/3_01.txt |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| license@php.net so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Author: Hannes Magnusson <bjori@php.net> |
+----------------------------------------------------------------------+
*/
/* $Id$ */
#ifndef PHONGO_BSON_H
#define PHONGO_BSON_H
#include <bson.h>
/* PHP Core stuff */
#include <php.h>
/* Check if we are part of pecl/mongodb or standalone (pecl/bson) */
#ifdef HAVE_MONGOC
#define BSON_NAMESPACE "MongoDB\\BSON"
#else
#define BSON_NAMESPACE "BSON"
#endif
#define BSON_UNSERIALIZE_FUNC_NAME "bsonUnserialize"
#define BSON_SERIALIZE_FUNC_NAME "bsonSerialize"
typedef enum {
PHONGO_BSON_NONE = 0x00,
PHONGO_BSON_ADD_ID = 0x01,
PHONGO_BSON_RETURN_ID = 0x02,
PHONGO_BSON_ADD_ODS = 0x04,
PHONGO_BSON_ADD_CHILD_ODS = 0x08
} php_phongo_bson_flags_t;
typedef enum {
PHONGO_TYPEMAP_NONE,
PHONGO_TYPEMAP_NATIVE_ARRAY,
PHONGO_TYPEMAP_NATIVE_OBJECT,
PHONGO_TYPEMAP_CLASS
} php_phongo_bson_typemap_types;
typedef struct {
php_phongo_bson_typemap_types document_type;
zend_class_entry *document;
php_phongo_bson_typemap_types array_type;
zend_class_entry *array;
php_phongo_bson_typemap_types root_type;
zend_class_entry *root;
} php_phongo_bson_typemap;
typedef struct {
#if PHP_VERSION_ID >= 70000
zval zchild;
#else
zval *zchild;
#endif
php_phongo_bson_typemap map;
zend_class_entry *odm;
} php_phongo_bson_state;
#if PHP_VERSION_ID >= 70000
#define PHONGO_BSON_STATE_INITIALIZER { {{ 0 }}, { PHONGO_TYPEMAP_NONE, NULL, PHONGO_TYPEMAP_NONE, NULL, PHONGO_TYPEMAP_NONE, NULL}, NULL}
#else
#define PHONGO_BSON_STATE_INITIALIZER { NULL, { PHONGO_TYPEMAP_NONE, NULL, PHONGO_TYPEMAP_NONE, NULL, PHONGO_TYPEMAP_NONE, NULL}, NULL}
#endif
-PHONGO_API void zval_to_bson(zval *data, php_phongo_bson_flags_t flags, bson_t *bson, bson_t **bson_out TSRMLS_DC);
-PHONGO_API int bson_to_zval_ex(const unsigned char *data, int data_len, php_phongo_bson_state *state);
+PHONGO_API void phongo_zval_to_bson(zval *data, php_phongo_bson_flags_t flags, bson_t *bson, bson_t **bson_out TSRMLS_DC);
+PHONGO_API int phongo_bson_to_zval_ex(const unsigned char *data, int data_len, php_phongo_bson_state *state);
#if PHP_VERSION_ID >= 70000
-PHONGO_API int bson_to_zval(const unsigned char *data, int data_len, zval *out);
+PHONGO_API int phongo_bson_to_zval(const unsigned char *data, int data_len, zval *out);
#else
-PHONGO_API int bson_to_zval(const unsigned char *data, int data_len, zval **out);
+PHONGO_API int phongo_bson_to_zval(const unsigned char *data, int data_len, zval **out);
#endif
-PHONGO_API void php_phongo_bson_typemap_to_state(zval *typemap, php_phongo_bson_typemap *map TSRMLS_DC);
+PHONGO_API void phongo_bson_typemap_to_state(zval *typemap, php_phongo_bson_typemap *map TSRMLS_DC);
PHP_FUNCTION(toPHP);
PHP_FUNCTION(fromPHP);
PHP_FUNCTION(toJSON);
PHP_FUNCTION(fromJSON);
#endif /* PHONGO_BSON_H */
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/
diff --git a/mongodb-1.1.1/php_phongo.c b/mongodb-1.1.2/php_phongo.c
similarity index 98%
rename from mongodb-1.1.1/php_phongo.c
rename to mongodb-1.1.2/php_phongo.c
index c646f7a6..1cd066f2 100644
--- a/mongodb-1.1.1/php_phongo.c
+++ b/mongodb-1.1.2/php_phongo.c
@@ -1,2565 +1,2565 @@
/*
+---------------------------------------------------------------------------+
| PHP Driver for MongoDB |
+---------------------------------------------------------------------------+
| Copyright 2013-2015 MongoDB, Inc. |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); |
| you may not use this file except in compliance with the License. |
| You may obtain a copy of the License at |
| |
| http://www.apache.org/licenses/LICENSE-2.0 |
| |
| Unless required by applicable law or agreed to in writing, software |
| distributed under the License is distributed on an "AS IS" BASIS, |
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| See the License for the specific language governing permissions and |
| limitations under the License. |
+---------------------------------------------------------------------------+
| Copyright (c) 2014-2015 MongoDB, Inc. |
+---------------------------------------------------------------------------+
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
/* External libs */
#include "bson.h"
#include "mongoc.h"
#include "mongoc-cursor-cursorid-private.h"
#include "mongoc-read-prefs-private.h"
#include "mongoc-bulk-operation-private.h"
#include "mongoc-read-concern-private.h"
#include "mongoc-write-concern-private.h"
#include "mongoc-uri-private.h"
#include "mongoc-trace.h"
/* PHP Core stuff */
#include <php.h>
#include <php_ini.h>
#include <ext/standard/info.h>
#include <ext/standard/file.h>
#include <Zend/zend_hash.h>
#include <Zend/zend_interfaces.h>
#include <Zend/zend_exceptions.h>
#include <ext/spl/spl_iterators.h>
#include <ext/spl/spl_exceptions.h>
/* Stream wrapper */
#include <main/php_streams.h>
#include <main/php_network.h>
/* Debug log writing */
#include <main/php_open_temporary_file.h>
/* For formating timestamp in the log */
#include <ext/date/php_date.h>
/* String manipulation */
#include <Zend/zend_string.h>
/* PHP array helpers */
#include "php_array_api.h"
/* For our stream verifications */
#include <openssl/x509.h>
/* Our Compatability header */
#include "phongo_compat.h"
/* Our stuffz */
#include "php_phongo.h"
#include "php_bson.h"
#include "php-ssl.h"
#undef MONGOC_LOG_DOMAIN
#define MONGOC_LOG_DOMAIN "PHONGO"
#define PHONGO_DEBUG_INI "mongodb.debug"
#define PHONGO_DEBUG_INI_DEFAULT ""
#define PHONGO_STREAM_BUFFER_SIZE 4096
ZEND_DECLARE_MODULE_GLOBALS(mongodb)
#if PHP_VERSION_ID >= 70000
#if defined(ZTS) && defined(COMPILE_DL_MONGODB)
ZEND_TSRMLS_CACHE_DEFINE();
#endif
#endif
/* {{{ phongo_std_object_handlers */
zend_object_handlers phongo_std_object_handlers;
PHONGO_API zend_object_handlers *phongo_get_std_object_handlers(void)
{
return &phongo_std_object_handlers;
}
/* }}} */
/* {{{ Error reporting and logging */
zend_class_entry* phongo_exception_from_phongo_domain(php_phongo_error_domain_t domain)
{
switch (domain) {
case PHONGO_ERROR_INVALID_ARGUMENT:
return php_phongo_invalidargumentexception_ce;
case PHONGO_ERROR_LOGIC:
return php_phongo_logicexception_ce;
case PHONGO_ERROR_RUNTIME:
return php_phongo_runtimeexception_ce;
case PHONGO_ERROR_UNEXPECTED_VALUE:
return php_phongo_unexpectedvalueexception_ce;
case PHONGO_ERROR_MONGOC_FAILED:
return php_phongo_runtimeexception_ce;
case PHONGO_ERROR_WRITE_FAILED:
return php_phongo_bulkwriteexception_ce;
case PHONGO_ERROR_CONNECTION_FAILED:
return php_phongo_connectionexception_ce;
}
MONGOC_ERROR("Resolving unknown phongo error domain: %d", domain);
return php_phongo_runtimeexception_ce;
}
zend_class_entry* phongo_exception_from_mongoc_domain(uint32_t /* mongoc_error_domain_t */ domain, uint32_t /* mongoc_error_code_t */ code)
{
switch(code) {
case 50: /* ExceededTimeLimit */
return php_phongo_executiontimeoutexception_ce;
case MONGOC_ERROR_STREAM_SOCKET:
return php_phongo_connectiontimeoutexception_ce;
case MONGOC_ERROR_CLIENT_AUTHENTICATE:
return php_phongo_authenticationexception_ce;
case MONGOC_ERROR_STREAM_INVALID_TYPE:
case MONGOC_ERROR_STREAM_INVALID_STATE:
case MONGOC_ERROR_STREAM_NAME_RESOLUTION:
case MONGOC_ERROR_STREAM_CONNECT:
case MONGOC_ERROR_STREAM_NOT_ESTABLISHED:
return php_phongo_connectionexception_ce;
case MONGOC_ERROR_CLIENT_NOT_READY:
case MONGOC_ERROR_CLIENT_TOO_BIG:
case MONGOC_ERROR_CLIENT_TOO_SMALL:
case MONGOC_ERROR_CLIENT_GETNONCE:
case MONGOC_ERROR_CLIENT_NO_ACCEPTABLE_PEER:
case MONGOC_ERROR_CLIENT_IN_EXHAUST:
case MONGOC_ERROR_PROTOCOL_INVALID_REPLY:
case MONGOC_ERROR_PROTOCOL_BAD_WIRE_VERSION:
case MONGOC_ERROR_CURSOR_INVALID_CURSOR:
case MONGOC_ERROR_QUERY_FAILURE:
/*case MONGOC_ERROR_PROTOCOL_ERROR:*/
case MONGOC_ERROR_BSON_INVALID:
case MONGOC_ERROR_MATCHER_INVALID:
case MONGOC_ERROR_NAMESPACE_INVALID:
case MONGOC_ERROR_COMMAND_INVALID_ARG:
case MONGOC_ERROR_COLLECTION_INSERT_FAILED:
case MONGOC_ERROR_GRIDFS_INVALID_FILENAME:
case MONGOC_ERROR_QUERY_COMMAND_NOT_FOUND:
case MONGOC_ERROR_QUERY_NOT_TAILABLE:
return php_phongo_runtimeexception_ce;
}
switch (domain) {
case MONGOC_ERROR_CLIENT:
case MONGOC_ERROR_STREAM:
case MONGOC_ERROR_PROTOCOL:
case MONGOC_ERROR_CURSOR:
case MONGOC_ERROR_QUERY:
case MONGOC_ERROR_INSERT:
case MONGOC_ERROR_SASL:
case MONGOC_ERROR_BSON:
case MONGOC_ERROR_MATCHER:
case MONGOC_ERROR_NAMESPACE:
case MONGOC_ERROR_COMMAND:
case MONGOC_ERROR_COLLECTION:
case MONGOC_ERROR_GRIDFS:
/* FIXME: We don't have the Exceptions mocked yet.. */
#if 0
return phongo_ce_mongo_connection_exception;
#endif
default:
return php_phongo_runtimeexception_ce;
}
}
void phongo_throw_exception(php_phongo_error_domain_t domain TSRMLS_DC, const char *format, ...)
{
va_list args;
char *message;
int message_len;
va_start(args, format);
message_len = vspprintf(&message, 0, format, args);
zend_throw_exception(phongo_exception_from_phongo_domain(domain), message, 0 TSRMLS_CC);
efree(message);
va_end(args);
}
void phongo_throw_exception_from_bson_error_t(bson_error_t *error TSRMLS_DC)
{
zend_throw_exception(phongo_exception_from_mongoc_domain(error->domain, error->code), error->message, error->code TSRMLS_CC);
}
static void php_phongo_log(mongoc_log_level_t log_level, const char *log_domain, const char *message, void *user_data)
{
PHONGO_TSRMLS_FETCH_FROM_CTX(user_data);
(void)user_data;
switch(log_level) {
case MONGOC_LOG_LEVEL_ERROR:
case MONGOC_LOG_LEVEL_CRITICAL:
phongo_throw_exception(PHONGO_ERROR_MONGOC_FAILED TSRMLS_CC, "%s", message);
return;
case MONGOC_LOG_LEVEL_WARNING:
case MONGOC_LOG_LEVEL_MESSAGE:
case MONGOC_LOG_LEVEL_INFO:
case MONGOC_LOG_LEVEL_DEBUG:
case MONGOC_LOG_LEVEL_TRACE:
{
time_t t;
phongo_char *dt;
time(&t);
dt = php_format_date((char *)"Y-m-d\\TH:i:sP", strlen("Y-m-d\\TH:i:sP"), t, 0 TSRMLS_CC);
fprintf(MONGODB_G(debug_fd), "[%s] %10s: %-8s> %s\n", phongo_str(dt), log_domain, mongoc_log_level_str(log_level), message);
fflush(MONGODB_G(debug_fd));
efree(dt);
} break;
}
}
/* }}} */
/* {{{ Init objects */
static void phongo_cursor_init(zval *return_value, mongoc_cursor_t *cursor, mongoc_client_t *client TSRMLS_DC) /* {{{ */
{
php_phongo_cursor_t *intern;
object_init_ex(return_value, php_phongo_cursor_ce);
intern = Z_CURSOR_OBJ_P(return_value);
intern->cursor = cursor;
intern->server_id = mongoc_cursor_get_hint(cursor);
intern->client = client;
} /* }}} */
void phongo_server_init(zval *return_value, mongoc_client_t *client, int server_id TSRMLS_DC) /* {{{ */
{
php_phongo_server_t *server;
object_init_ex(return_value, php_phongo_server_ce);
server = Z_SERVER_OBJ_P(return_value);
server->client = client;
server->server_id = server_id;
}
/* }}} */
void phongo_readconcern_init(zval *return_value, const mongoc_read_concern_t *read_concern TSRMLS_DC) /* {{{ */
{
php_phongo_readconcern_t *intern;
object_init_ex(return_value, php_phongo_readconcern_ce);
intern = Z_READCONCERN_OBJ_P(return_value);
intern->read_concern = mongoc_read_concern_copy(read_concern);
}
/* }}} */
void phongo_readpreference_init(zval *return_value, const mongoc_read_prefs_t *read_prefs TSRMLS_DC) /* {{{ */
{
php_phongo_readpreference_t *intern;
object_init_ex(return_value, php_phongo_readpreference_ce);
intern = Z_READPREFERENCE_OBJ_P(return_value);
intern->read_preference = mongoc_read_prefs_copy(read_prefs);
}
/* }}} */
void phongo_writeconcern_init(zval *return_value, const mongoc_write_concern_t *write_concern TSRMLS_DC) /* {{{ */
{
php_phongo_writeconcern_t *intern;
object_init_ex(return_value, php_phongo_writeconcern_ce);
intern = Z_WRITECONCERN_OBJ_P(return_value);
intern->write_concern = mongoc_write_concern_copy(write_concern);
}
/* }}} */
int32_t phongo_bson_find_as_int32(bson_t *bson, const char *key, int32_t fallback)
{
bson_iter_t iter;
if (bson_iter_init_find(&iter, bson, key) && BSON_ITER_HOLDS_INT32(&iter)) {
return bson_iter_int32(&iter);
}
return fallback;
}
bool phongo_bson_find_as_bool(bson_t *bson, const char *key, bool fallback)
{
bson_iter_t iter;
if (bson_iter_init_find(&iter, bson, key) && BSON_ITER_HOLDS_BOOL(&iter)) {
return bson_iter_bool(&iter);
}
return fallback;
}
void phongo_bson_iter_as_document(const bson_iter_t *iter, uint32_t *document_len, const uint8_t **document)
{
*document = NULL;
*document_len = 0;
if (BSON_ITER_HOLDS_DOCUMENT(iter) || BSON_ITER_HOLDS_ARRAY(iter)) {
memcpy (document_len, (iter->raw + iter->d1), sizeof (*document_len));
*document_len = BSON_UINT32_FROM_LE (*document_len);
*document = (iter->raw + iter->d1);
}
}
bool phongo_query_init(php_phongo_query_t *query, bson_t *filter, bson_t *options TSRMLS_DC) /* {{{ */
{
bson_iter_t iter;
if (options) {
query->batch_size = phongo_bson_find_as_int32(options, "batchSize", 0);
query->limit = phongo_bson_find_as_int32(options, "limit", 0);
query->skip = phongo_bson_find_as_int32(options, "skip", 0);
query->flags = 0;
query->flags |= phongo_bson_find_as_bool(options, "tailable", false) ? MONGOC_QUERY_TAILABLE_CURSOR : 0;
query->flags |= phongo_bson_find_as_bool(options, "slaveOk", false) ? MONGOC_QUERY_SLAVE_OK : 0;
query->flags |= phongo_bson_find_as_bool(options, "oplogReplay", false) ? MONGOC_QUERY_OPLOG_REPLAY : 0;
query->flags |= phongo_bson_find_as_bool(options, "noCursorTimeout", false) ? MONGOC_QUERY_NO_CURSOR_TIMEOUT : 0;
query->flags |= phongo_bson_find_as_bool(options, "awaitData", false) ? MONGOC_QUERY_AWAIT_DATA : 0;
query->flags |= phongo_bson_find_as_bool(options, "exhaust", false) ? MONGOC_QUERY_EXHAUST : 0;
query->flags |= phongo_bson_find_as_bool(options, "partial", false) ? MONGOC_QUERY_PARTIAL : 0;
if (bson_iter_init_find(&iter, options, "modifiers")) {
uint32_t len = 0;
const uint8_t *data = NULL;
if (! (BSON_ITER_HOLDS_DOCUMENT (&iter) || BSON_ITER_HOLDS_ARRAY (&iter))) {
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected modifiers to be array or object, %d given", bson_iter_type(&iter));
return false;
}
bson_iter_document(&iter, &len, &data);
if (len) {
bson_t tmp;
bson_init_static(&tmp, data, len);
bson_copy_to_excluding_noinit(&tmp, query->query, "not-used-value", NULL);
bson_destroy (&tmp);
}
}
if (bson_iter_init_find(&iter, options, "projection")) {
uint32_t len = 0;
const uint8_t *data = NULL;
if (! (BSON_ITER_HOLDS_DOCUMENT (&iter) || BSON_ITER_HOLDS_ARRAY (&iter))) {
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected projection to be array or object, %d given", bson_iter_type(&iter));
return false;
}
bson_iter_document(&iter, &len, &data);
if (len) {
query->selector = bson_new_from_data(data, len);
}
}
if (bson_iter_init_find(&iter, options, "sort")) {
uint32_t len = 0;
const uint8_t *data = NULL;
if (! (BSON_ITER_HOLDS_DOCUMENT (&iter) || BSON_ITER_HOLDS_ARRAY (&iter))) {
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected sort to be array or object, %d given", bson_iter_type(&iter));
return false;
}
phongo_bson_iter_as_document(&iter, &len, &data);
if (len) {
bson_t tmp;
bson_init_static(&tmp, data, len);
bson_append_document(query->query, "$orderby", -1, &tmp);
bson_destroy(&tmp);
}
}
}
BSON_APPEND_DOCUMENT(query->query, "$query", filter);
return true;
} /* }}} */
zend_bool phongo_writeconcernerror_init(zval *return_value, bson_t *bson TSRMLS_DC) /* {{{ */
{
bson_iter_t iter;
php_phongo_writeconcernerror_t *writeconcernerror;
writeconcernerror = Z_WRITECONCERNERROR_OBJ_P(return_value);
if (bson_iter_init_find(&iter, bson, "code") && BSON_ITER_HOLDS_INT32(&iter)) {
writeconcernerror->code = bson_iter_int32(&iter);
}
if (bson_iter_init_find(&iter, bson, "errmsg") && BSON_ITER_HOLDS_UTF8(&iter)) {
writeconcernerror->message = bson_iter_dup_utf8(&iter, NULL);
}
if (bson_iter_init_find(&iter, bson, "errInfo") && BSON_ITER_HOLDS_DOCUMENT(&iter)) {
uint32_t len;
const uint8_t *data;
bson_iter_document(&iter, &len, &data);
if (!data) {
return false;
}
- if (!bson_to_zval(data, len, &writeconcernerror->info)) {
+ if (!phongo_bson_to_zval(data, len, &writeconcernerror->info)) {
zval_ptr_dtor(&writeconcernerror->info);
#if PHP_VERSION_ID >= 70000
ZVAL_UNDEF(&writeconcernerror->info);
#else
writeconcernerror->info = NULL;
#endif
return false;
}
}
return true;
} /* }}} */
zend_bool phongo_writeerror_init(zval *return_value, bson_t *bson TSRMLS_DC) /* {{{ */
{
bson_iter_t iter;
php_phongo_writeerror_t *writeerror;
writeerror = Z_WRITEERROR_OBJ_P(return_value);
if (bson_iter_init_find(&iter, bson, "code") && BSON_ITER_HOLDS_INT32(&iter)) {
writeerror->code = bson_iter_int32(&iter);
}
if (bson_iter_init_find(&iter, bson, "errmsg") && BSON_ITER_HOLDS_UTF8(&iter)) {
writeerror->message = bson_iter_dup_utf8(&iter, NULL);
}
if (bson_iter_init_find(&iter, bson, "errInfo")) {
bson_t info;
bson_init(&info);
bson_append_iter(&info, NULL, 0, &iter);
- if (!bson_to_zval(bson_get_data(&info), info.len, &writeerror->info)) {
+ if (!phongo_bson_to_zval(bson_get_data(&info), info.len, &writeerror->info)) {
zval_ptr_dtor(&writeerror->info);
#if PHP_VERSION_ID >= 70000
ZVAL_UNDEF(&writeerror->info);
#else
writeerror->info = NULL;
#endif
return false;
}
}
if (bson_iter_init_find(&iter, bson, "index") && BSON_ITER_HOLDS_INT32(&iter)) {
writeerror->index = bson_iter_int32(&iter);
}
return true;
} /* }}} */
php_phongo_writeresult_t *phongo_writeresult_init(zval *return_value, mongoc_write_result_t *write_result, mongoc_client_t *client, int server_id TSRMLS_DC) /* {{{ */
{
php_phongo_writeresult_t *writeresult;
object_init_ex(return_value, php_phongo_writeresult_ce);
writeresult = Z_WRITERESULT_OBJ_P(return_value);
writeresult->client = client;
writeresult->server_id = server_id;
/* Copy write_results or else it'll get destroyed with the bulk destruction */
#define SCP(field) writeresult->write_result.field = write_result->field
SCP(omit_nModified);
SCP(nInserted);
SCP(nMatched);
SCP(nModified);
SCP(nRemoved);
SCP(nUpserted);
bson_copy_to(&write_result->upserted, &writeresult->write_result.upserted);
SCP(n_writeConcernErrors);
bson_copy_to(&write_result->writeConcernErrors, &writeresult->write_result.writeConcernErrors);
bson_copy_to(&write_result->writeErrors, &writeresult->write_result.writeErrors);
SCP(upsert_append_count);
#undef SCP
return writeresult;
} /* }}} */
/* }}} */
/* {{{ CRUD */
/* Splits a namespace name into the database and collection names, allocated with estrdup. */
bool phongo_split_namespace(const char *namespace, char **dbname, char **cname) /* {{{ */
{
char *dot = strchr(namespace, '.');
if (!dot) {
return false;
}
if (cname) {
*cname = estrdup(namespace + (dot - namespace) + 1);
}
if (dbname) {
*dbname = estrndup(namespace, dot - namespace);
}
return true;
} /* }}} */
mongoc_bulk_operation_t *phongo_bulkwrite_init(zend_bool ordered) { /* {{{ */
return mongoc_bulk_operation_new(ordered);
} /* }}} */
bool phongo_execute_write(mongoc_client_t *client, const char *namespace, mongoc_bulk_operation_t *bulk, const mongoc_write_concern_t *write_concern, int server_id, zval *return_value, int return_value_used TSRMLS_DC) /* {{{ */
{
bson_error_t error;
char *dbname;
char *collname;
int success;
php_phongo_writeresult_t *writeresult;
if (!phongo_split_namespace(namespace, &dbname, &collname)) {
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "%s: %s", "Invalid namespace provided", namespace);
return false;
}
mongoc_bulk_operation_set_database(bulk, dbname);
mongoc_bulk_operation_set_collection(bulk, collname);
mongoc_bulk_operation_set_client(bulk, client);
/* If a write concern was not specified, libmongoc will use the client's
* write concern; however, we should still fetch it for the write result. */
if (write_concern) {
mongoc_bulk_operation_set_write_concern(bulk, write_concern);
} else {
write_concern = mongoc_client_get_write_concern(client);
}
efree(dbname);
efree(collname);
if (server_id > 0) {
mongoc_bulk_operation_set_hint(bulk, server_id);
}
success = mongoc_bulk_operation_execute(bulk, NULL, &error);
/* Write succeeded and the user doesn't care for the results */
if (success && !return_value_used) {
return true;
}
/* Check for connection related exceptions */
if (EG(exception)) {
return false;
}
writeresult = phongo_writeresult_init(return_value, &bulk->result, client, bulk->hint TSRMLS_CC);
writeresult->write_concern = mongoc_write_concern_copy(write_concern);
/* The Write failed */
if (!success) {
/* The Command itself failed */
if (bson_empty0(&writeresult->write_result.writeErrors) && bson_empty0(&writeresult->write_result.writeConcernErrors)) {
/* FIXME: Maybe we can look at write_result.error and not pass error at all? */
phongo_throw_exception_from_bson_error_t(&error TSRMLS_CC);
} else {
phongo_throw_exception(PHONGO_ERROR_WRITE_FAILED TSRMLS_CC, "BulkWrite error");
phongo_add_exception_prop(ZEND_STRL("writeResult"), return_value TSRMLS_CC);
}
return false;
}
return true;
} /* }}} */
int phongo_execute_query(mongoc_client_t *client, const char *namespace, const php_phongo_query_t *query, const mongoc_read_prefs_t *read_preference, int server_id, zval *return_value, int return_value_used TSRMLS_DC) /* {{{ */
{
const bson_t *doc = NULL;
mongoc_cursor_t *cursor;
char *dbname;
char *collname;
mongoc_collection_t *collection;
if (!phongo_split_namespace(namespace, &dbname, &collname)) {
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "%s: %s", "Invalid namespace provided", namespace);
return false;
}
collection = mongoc_client_get_collection(client, dbname, collname);
efree(dbname);
efree(collname);
if (query->read_concern) {
mongoc_collection_set_read_concern(collection, query->read_concern);
}
cursor = mongoc_collection_find(collection, query->flags, query->skip, query->limit, query->batch_size, query->query, query->selector, read_preference);
mongoc_collection_destroy(collection);
/* mongoc issues a warning we need to catch somehow */
if (!cursor) {
phongo_throw_exception(PHONGO_ERROR_MONGOC_FAILED TSRMLS_CC, "%s", "FIXME: Couldn't create cursor...");
return false;
}
if (server_id > 0) {
cursor->hint = server_id;
}
if (!mongoc_cursor_next(cursor, &doc)) {
bson_error_t error;
/* Could simply be no docs, which is not an error */
if (mongoc_cursor_error(cursor, &error)) {
phongo_throw_exception_from_bson_error_t(&error TSRMLS_CC);
mongoc_cursor_destroy(cursor);
return false;
}
}
if (!return_value_used) {
mongoc_cursor_destroy(cursor);
return true;
}
phongo_cursor_init(return_value, cursor, client TSRMLS_CC);
return true;
} /* }}} */
int phongo_execute_command(mongoc_client_t *client, const char *db, const bson_t *command, const mongoc_read_prefs_t *read_preference, int server_id, zval *return_value, int return_value_used TSRMLS_DC) /* {{{ */
{
mongoc_cursor_t *cursor;
const bson_t *doc;
bson_iter_t iter;
bson_iter_t child;
cursor = mongoc_client_command(client, db, MONGOC_QUERY_NONE, 0, 1, 0, command, NULL, read_preference);
if (server_id > 0) {
cursor->hint = server_id;
}
if (!mongoc_cursor_next(cursor, &doc)) {
bson_error_t error;
if (mongoc_cursor_error(cursor, &error)) {
mongoc_cursor_destroy(cursor);
phongo_throw_exception_from_bson_error_t(&error TSRMLS_CC);
return false;
}
}
if (!return_value_used) {
mongoc_cursor_destroy(cursor);
return true;
}
/* This code is adapated from _mongoc_cursor_cursorid_prime(), but we avoid
* advancing the cursor, since we are already positioned at the first result
* after the error checking above. */
if (bson_iter_init_find(&iter, doc, "cursor") && BSON_ITER_HOLDS_DOCUMENT(&iter) && bson_iter_recurse(&iter, &child)) {
mongoc_cursor_cursorid_t *cid;
bson_t empty = BSON_INITIALIZER;
_mongoc_cursor_cursorid_init(cursor, &empty);
cursor->limit = 0;
cid = cursor->iface_data;
cid->in_batch = true;
bson_destroy (&empty);
while (bson_iter_next(&child)) {
if (BSON_ITER_IS_KEY(&child, "id")) {
cursor->rpc.reply.cursor_id = bson_iter_as_int64(&child);
} else if (BSON_ITER_IS_KEY(&child, "ns")) {
const char *ns;
ns = bson_iter_utf8(&child, &cursor->nslen);
bson_strncpy(cursor->ns, ns, sizeof cursor->ns);
} else if (BSON_ITER_IS_KEY(&child, "firstBatch")) {
if (BSON_ITER_HOLDS_ARRAY(&child) && bson_iter_recurse(&child, &cid->batch_iter)) {
cid->in_batch = true;
}
}
}
cursor->is_command = false;
/* The cursor's current element is the command's response document.
* Advance once so that the cursor is positioned at the first document
* within the command cursor's result set.
*/
mongoc_cursor_next(cursor, &doc);
}
phongo_cursor_init(return_value, cursor, client TSRMLS_CC);
return true;
} /* }}} */
/* }}} */
/* {{{ Stream vtable */
void phongo_stream_destroy(mongoc_stream_t *stream_wrap) /* {{{ */
{
php_phongo_stream_socket *base_stream = (php_phongo_stream_socket *)stream_wrap;
if (base_stream->stream) {
MONGOC_DEBUG("Not destroying RSRC#%d", PHONGO_STREAM_ID(base_stream->stream));
} else {
MONGOC_DEBUG("Wrapped stream already destroyed");
}
/*
* DON'T DO ANYTHING TO THE INTERNAL base_stream->stream
* The stream should not be closed during normal dtor -- as we want it to
* survive until next request.
* We only clean it up on failure and (implicitly) MSHUTDOWN
*/
efree(base_stream);
} /* }}} */
void phongo_stream_failed(mongoc_stream_t *stream_wrap) /* {{{ */
{
php_phongo_stream_socket *base_stream = (php_phongo_stream_socket *)stream_wrap;
if (base_stream->stream) {
#if PHP_VERSION_ID < 70000
PHONGO_TSRMLS_FETCH_FROM_CTX(base_stream->tsrm_ls);
#endif
MONGOC_DEBUG("Destroying RSRC#%d", PHONGO_STREAM_ID(base_stream->stream));
php_stream_free(base_stream->stream, PHP_STREAM_FREE_CLOSE_PERSISTENT | PHP_STREAM_FREE_RSRC_DTOR);
base_stream->stream = NULL;
}
efree(base_stream);
} /* }}} */
int phongo_stream_close(mongoc_stream_t *stream_wrap) /* {{{ */
{
php_phongo_stream_socket *base_stream = (php_phongo_stream_socket *)stream_wrap;
MONGOC_DEBUG("Closing RSRC#%d", PHONGO_STREAM_ID(base_stream->stream));
if (base_stream->stream) {
#if PHP_VERSION_ID < 70000
TSRMLS_FETCH_FROM_CTX(base_stream->tsrm_ls);
#endif
MONGOC_DEBUG("Destroying RSRC#%d", PHONGO_STREAM_ID(base_stream->stream));
php_stream_free(base_stream->stream, PHP_STREAM_FREE_CLOSE_PERSISTENT | PHP_STREAM_FREE_RSRC_DTOR);
base_stream->stream = NULL;
}
return 0;
} /* }}} */
void php_phongo_set_timeout(php_phongo_stream_socket *base_stream, int32_t timeout_msec) /* {{{ */
{
struct timeval rtimeout = {0, 0};
PHONGO_TSRMLS_FETCH_FROM_CTX(base_stream->tsrm_ls);
if (timeout_msec > 0) {
rtimeout.tv_sec = timeout_msec / 1000;
rtimeout.tv_usec = (timeout_msec % 1000) * 1000;
}
php_stream_set_option(base_stream->stream, PHP_STREAM_OPTION_READ_TIMEOUT, 0, &rtimeout);
MONGOC_DEBUG("Setting timeout to: %d", timeout_msec);
} /* }}} */
/* This is blatantr copy of _mongoc_stream_tls_writev
* https://github.com/mongodb/mongo-c-driver/blob/4ebba3d84286df3867bad89358eb6ae956e62a59/src/mongoc/mongoc-stream-tls.c#L500
*/
ssize_t phongo_stream_writev(mongoc_stream_t *stream, mongoc_iovec_t *iov, size_t iovcnt, int32_t timeout_msec) /* {{{ */
{
char buf[PHONGO_STREAM_BUFFER_SIZE];
ssize_t ret = 0;
ssize_t child_ret;
size_t i;
size_t iov_pos = 0;
/* There's a bit of a dance to coalesce vectorized writes into
* PHONGO_STREAM_BUFFER_SIZE'd writes to avoid lots of small tls
* packets.
*
* The basic idea is that we want to combine writes in the buffer if they're
* smaller than the buffer, flushing as it gets full. For larger writes, or
* the last write in the iovec array, we want to ignore the buffer and just
* write immediately. We take care of doing buffer writes by re-invoking
* ourself with a single iovec_t, pointing at our stack buffer.
*/
char *buf_head = buf;
char *buf_tail = buf;
char *buf_end = buf + PHONGO_STREAM_BUFFER_SIZE;
size_t bytes;
char *to_write = NULL;
size_t to_write_len;
php_phongo_stream_socket *base_stream = (php_phongo_stream_socket *)stream;
PHONGO_TSRMLS_FETCH_FROM_CTX(base_stream->tsrm_ls);
php_phongo_set_timeout(base_stream, timeout_msec);
BSON_ASSERT (iov);
BSON_ASSERT (iovcnt);
for (i = 0; i < iovcnt; i++) {
iov_pos = 0;
while (iov_pos < iov[i].iov_len) {
if (buf_head != buf_tail ||
((i + 1 < iovcnt) &&
((buf_end - buf_tail) > (iov[i].iov_len - iov_pos)))) {
/* If we have either of:
* - buffered bytes already
* - another iovec to send after this one and we don't have more
* bytes to send than the size of the buffer.
*
* copy into the buffer */
bytes = BSON_MIN (iov[i].iov_len - iov_pos, buf_end - buf_tail);
memcpy (buf_tail, iov[i].iov_base + iov_pos, bytes);
buf_tail += bytes;
iov_pos += bytes;
if (buf_tail == buf_end) {
/* If we're full, request send */
to_write = buf_head;
to_write_len = buf_tail - buf_head;
buf_tail = buf_head = buf;
}
} else {
/* Didn't buffer, so just write it through */
to_write = (char *)iov[i].iov_base + iov_pos;
to_write_len = iov[i].iov_len - iov_pos;
iov_pos += to_write_len;
}
if (to_write) {
/* We get here if we buffered some bytes and filled the buffer, or
* if we didn't buffer and have to send out of the iovec */
child_ret = php_stream_write(base_stream->stream, to_write, to_write_len);
if (child_ret < 0) {
/* Buffer write failed, just return the error */
return child_ret;
}
ret += child_ret;
if (child_ret < to_write_len) {
/* we timed out, so send back what we could send */
return ret;
}
to_write = NULL;
}
}
}
if (buf_head != buf_tail) {
/* If we have any bytes buffered, send */
child_ret = php_stream_write(base_stream->stream, buf_head, buf_tail - buf_head);
if (child_ret < 0) {
return child_ret;
}
ret += child_ret;
}
return ret;
} /* }}} */
ssize_t phongo_stream_readv(mongoc_stream_t *stream, mongoc_iovec_t *iov, size_t iovcnt, size_t min_bytes, int32_t timeout_msec) /* {{{ */
{
php_phongo_stream_socket *base_stream = (php_phongo_stream_socket *)stream;
ssize_t ret = 0;
ssize_t read;
size_t cur = 0;
PHONGO_TSRMLS_FETCH_FROM_CTX(base_stream->tsrm_ls);
php_phongo_set_timeout(base_stream, timeout_msec);
do {
read = php_stream_read(base_stream->stream, iov[cur].iov_base, iov[cur].iov_len);
MONGOC_DEBUG("Reading got: %zd wanted: %zd", read, min_bytes);
if (read <= 0) {
if (ret >= (ssize_t)min_bytes) {
break;
}
return -1;
}
ret += read;
while ((cur < iovcnt) && (read >= (ssize_t)iov[cur].iov_len)) {
read -= iov[cur++].iov_len;
}
if (cur == iovcnt) {
break;
}
if (ret >= (ssize_t)min_bytes) {
break;
}
iov[cur].iov_base = ((char *)iov[cur].iov_base) + read;
iov[cur].iov_len -= read;
} while(1);
return ret;
} /* }}} */
int phongo_stream_setsockopt(mongoc_stream_t *stream, int level, int optname, void *optval, socklen_t optlen) /* {{{ */
{
php_phongo_stream_socket *base_stream = (php_phongo_stream_socket *)stream;
int socket = ((php_netstream_data_t *)base_stream->stream->abstract)->socket;
return setsockopt (socket, level, optname, optval, optlen);
} /* }}} */
bool phongo_stream_socket_check_closed(mongoc_stream_t *stream) /* {{{ */
{
php_phongo_stream_socket *base_stream = (php_phongo_stream_socket *)stream;
PHONGO_TSRMLS_FETCH_FROM_CTX(base_stream->tsrm_ls);
return PHP_STREAM_OPTION_RETURN_OK != php_stream_set_option(base_stream->stream, PHP_STREAM_OPTION_CHECK_LIVENESS, 0, NULL);
} /* }}} */
ssize_t phongo_stream_poll (mongoc_stream_poll_t *streams, size_t nstreams, int32_t timeout) /* {{{ */
{
php_pollfd *fds = NULL;
size_t i;
ssize_t rval = -1;
TSRMLS_FETCH();
fds = emalloc(sizeof(*fds) * nstreams);
for (i = 0; i < nstreams; i++) {
php_socket_t this_fd;
if (php_stream_cast(((php_phongo_stream_socket *)streams[i].stream)->stream, PHP_STREAM_AS_FD_FOR_SELECT | PHP_STREAM_CAST_INTERNAL, (void*)&this_fd, 0) == SUCCESS && this_fd >= 0) {
fds[i].fd = this_fd;
fds[i].events = streams[i].events;
fds[i].revents = 0;
}
}
rval = php_poll2(fds, nstreams, timeout);
if (rval > 0) {
for (i = 0; i < nstreams; i++) {
streams[i].revents = fds[i].revents;
}
}
efree(fds);
return rval;
} /* }}} */
#if PHP_VERSION_ID < 50600
int php_mongo_verify_hostname(const char *hostname, X509 *cert TSRMLS_DC)
{
if (php_mongo_matches_san_list(cert, hostname) == SUCCESS) {
return SUCCESS;
}
if (php_mongo_matches_common_name(cert, hostname TSRMLS_CC) == SUCCESS) {
return SUCCESS;
}
return FAILURE;
}
int php_phongo_peer_verify(php_stream *stream, X509 *cert, const char *hostname, bson_error_t *error TSRMLS_DC)
{
zval **verify_peer_name;
/* This option is available since PHP 5.6.0 */
if (php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "ssl", "verify_peer_name", &verify_peer_name) == SUCCESS && zend_is_true(*verify_peer_name)) {
zval **zhost = NULL;
const char *peer;
if (php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "ssl", "peer_name", &zhost) == SUCCESS) {
convert_to_string_ex(zhost);
peer = Z_STRVAL_PP(zhost);
} else {
peer = hostname;
}
if (php_mongo_verify_hostname(peer, cert TSRMLS_CC) == FAILURE) {
bson_set_error(error, MONGOC_ERROR_STREAM, MONGOC_ERROR_STREAM_CONNECT, "Remote certificate SubjectAltName or CN does not match '%s'", hostname);
return false;
}
}
return true;
}
#endif
bool php_phongo_ssl_verify(php_stream *stream, const char *hostname, bson_error_t *error TSRMLS_DC)
{
#if PHP_VERSION_ID >= 70000
zval *zcert;
zval *verify_expiry;
#else
zval **zcert;
zval **verify_expiry;
#endif
X509 *cert;
if (!PHP_STREAM_CONTEXT(stream)) {
return true;
}
#if PHP_VERSION_ID >= 70000
if (!((zcert = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "ssl", "peer_certificate")) != NULL && Z_TYPE_P(zcert) == IS_RESOURCE)) {
#else
if (!(php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "ssl", "peer_certificate", &zcert) == SUCCESS && Z_TYPE_PP(zcert) == IS_RESOURCE)) {
#endif
bson_set_error(error, MONGOC_ERROR_STREAM, MONGOC_ERROR_STREAM_CONNECT, "Could not capture certificate of %s", hostname);
return false;
}
#if PHP_VERSION_ID >= 70000
cert = (X509 *)x509_from_zval(zcert TSRMLS_CC);
#else
cert = (X509 *)x509_from_zval(*zcert TSRMLS_CC);
#endif
if (!cert) {
bson_set_error(error, MONGOC_ERROR_STREAM, MONGOC_ERROR_STREAM_CONNECT, "Could not get certificate of %s", hostname);
return false;
}
#if PHP_VERSION_ID < 50600
if (!php_phongo_peer_verify(stream, cert, hostname, error TSRMLS_CC)) {
return false;
}
#endif
#if PHP_VERSION_ID >= 70000
if ((verify_expiry = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "ssl", "verify_expiry")) != NULL && zend_is_true(verify_expiry)) {
#else
if (php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "ssl", "verify_expiry", &verify_expiry) == SUCCESS && zend_is_true(*verify_expiry)) {
#endif
time_t current = time(NULL);
time_t valid_from = php_mongo_asn1_time_to_time_t(X509_get_notBefore(cert) TSRMLS_CC);
time_t valid_until = php_mongo_asn1_time_to_time_t(X509_get_notAfter(cert) TSRMLS_CC);
if (valid_from > current) {
bson_set_error(error, MONGOC_ERROR_STREAM, MONGOC_ERROR_STREAM_CONNECT, "Certificate is not valid yet on %s", hostname);
return false;
}
if (current > valid_until) {
bson_set_error(error, MONGOC_ERROR_STREAM, MONGOC_ERROR_STREAM_CONNECT, "Certificate has expired on %s", hostname);
return false;
}
}
return true;
}
mongoc_stream_t* phongo_stream_initiator(const mongoc_uri_t *uri, const mongoc_host_list_t *host, void *user_data, bson_error_t *error) /* {{{ */
{
php_phongo_stream_socket *base_stream = NULL;
php_stream *stream = NULL;
const bson_t *options;
bson_iter_t iter;
struct timeval timeout = {0, 0};
struct timeval *timeoutp = NULL;
char *uniqid;
phongo_char *errmsg = NULL;
int errcode;
char *dsn;
int dsn_len;
TSRMLS_FETCH();
ENTRY;
switch (host->family) {
#if defined(AF_INET6)
case AF_INET6:
dsn_len = spprintf(&dsn, 0, "tcp://[%s]:%d", host->host, host->port);
break;
#endif
case AF_INET:
dsn_len = spprintf(&dsn, 0, "tcp://%s:%d", host->host, host->port);
break;
case AF_UNIX:
dsn_len = spprintf(&dsn, 0, "unix://%s", host->host);
break;
default:
bson_set_error (error, MONGOC_ERROR_STREAM, MONGOC_ERROR_STREAM_INVALID_TYPE, "Invalid address family: 0x%02x", host->family);
RETURN(NULL);
}
options = mongoc_uri_get_options(uri);
if (bson_iter_init_find (&iter, options, "connecttimeoutms") && BSON_ITER_HOLDS_INT32 (&iter)) {
int32_t connecttimeoutms = MONGOC_DEFAULT_CONNECTTIMEOUTMS;
if (!(connecttimeoutms = bson_iter_int32(&iter))) {
connecttimeoutms = MONGOC_DEFAULT_CONNECTTIMEOUTMS;
}
timeout.tv_sec = connecttimeoutms / 1000;
timeout.tv_usec = (connecttimeoutms % 1000) * 1000;
timeoutp = &timeout;
}
spprintf(&uniqid, 0, "%s:%d[%s]", host->host, host->port, mongoc_uri_get_string(uri));
MONGOC_DEBUG("Connecting to '%s'", uniqid);
stream = php_stream_xport_create(dsn, dsn_len, 0, STREAM_XPORT_CLIENT | STREAM_XPORT_CONNECT, uniqid, timeoutp, (php_stream_context *)user_data, &errmsg, &errcode);
if (!stream) {
bson_set_error (error, MONGOC_ERROR_STREAM, MONGOC_ERROR_STREAM_CONNECT, "Failed connecting to '%s:%d': %s", host->host, host->port, phongo_str(errmsg));
efree(dsn);
efree(uniqid);
if (errmsg) {
phongo_char_free(errmsg);
}
RETURN(NULL);
}
php_stream_auto_cleanup(stream);
MONGOC_DEBUG("Created: RSRC#%d as '%s'", PHONGO_STREAM_ID(stream), uniqid);
efree(uniqid);
if (mongoc_uri_get_ssl(uri)) {
zend_error_handling error_handling;
zend_replace_error_handling(EH_THROW, php_phongo_sslconnectionexception_ce, &error_handling TSRMLS_CC);
MONGOC_DEBUG("Enabling SSL");
/* Capture the server certificate so we can do further verification */
if (PHP_STREAM_CONTEXT(stream)) {
zval capture;
ZVAL_BOOL(&capture, 1);
php_stream_context_set_option(PHP_STREAM_CONTEXT(stream), "ssl", "capture_peer_cert", &capture);
}
if (php_stream_xport_crypto_setup(stream, PHONGO_CRYPTO_METHOD, NULL TSRMLS_CC) < 0) {
zend_restore_error_handling(&error_handling TSRMLS_CC);
php_stream_free(stream, PHP_STREAM_FREE_CLOSE_PERSISTENT | PHP_STREAM_FREE_RSRC_DTOR);
bson_set_error (error, MONGOC_ERROR_STREAM, MONGOC_ERROR_STREAM_INVALID_TYPE, "Failed to setup crypto, is the OpenSSL extension loaded?");
efree(dsn);
return NULL;
}
if (php_stream_xport_crypto_enable(stream, 1 TSRMLS_CC) < 0) {
zend_restore_error_handling(&error_handling TSRMLS_CC);
php_stream_free(stream, PHP_STREAM_FREE_CLOSE_PERSISTENT | PHP_STREAM_FREE_RSRC_DTOR);
bson_set_error (error, MONGOC_ERROR_STREAM, MONGOC_ERROR_STREAM_INVALID_TYPE, "Failed to setup crypto, is the server running with SSL?");
efree(dsn);
return NULL;
}
if (!php_phongo_ssl_verify(stream, host->host, error TSRMLS_CC)) {
zend_restore_error_handling(&error_handling TSRMLS_CC);
php_stream_pclose(stream);
efree(dsn);
return NULL;
}
zend_restore_error_handling(&error_handling TSRMLS_CC);
}
efree(dsn);
/* We only need the context really for SSL initialization, safe to remove now */
php_stream_context_set(stream, NULL);
base_stream = ecalloc(1, sizeof(php_phongo_stream_socket));
base_stream->stream = stream;
base_stream->uri = uri;
base_stream->host = host;
TSRMLS_SET_CTX(base_stream->tsrm_ls);
/* flush missing, doesn't seem to be used */
base_stream->vtable.type = 100;
base_stream->vtable.destroy = phongo_stream_destroy;
base_stream->vtable.failed = phongo_stream_failed;
base_stream->vtable.close = phongo_stream_close;
base_stream->vtable.writev = phongo_stream_writev;
base_stream->vtable.readv = phongo_stream_readv;
base_stream->vtable.setsockopt = phongo_stream_setsockopt;
base_stream->vtable.check_closed = phongo_stream_socket_check_closed;
base_stream->vtable.poll = phongo_stream_poll;
if (host->family != AF_UNIX) {
int flag = 1;
if (phongo_stream_setsockopt((mongoc_stream_t *)base_stream, IPPROTO_TCP, TCP_NODELAY, (char *)&flag, sizeof(int))) {
MONGOC_WARNING("setsockopt TCP_NODELAY failed");
}
}
RETURN((mongoc_stream_t *)base_stream);
} /* }}} */
/* }}} */
/* {{{ mongoc types from from_zval */
const mongoc_write_concern_t* phongo_write_concern_from_zval(zval *zwrite_concern TSRMLS_DC) /* {{{ */
{
if (zwrite_concern) {
php_phongo_writeconcern_t *intern = Z_WRITECONCERN_OBJ_P(zwrite_concern);
if (intern) {
return intern->write_concern;
}
}
return NULL;
} /* }}} */
const mongoc_read_concern_t* phongo_read_concern_from_zval(zval *zread_concern TSRMLS_DC) /* {{{ */
{
if (zread_concern) {
php_phongo_readconcern_t *intern = Z_READCONCERN_OBJ_P(zread_concern);
if (intern) {
return intern->read_concern;
}
}
return NULL;
} /* }}} */
const mongoc_read_prefs_t* phongo_read_preference_from_zval(zval *zread_preference TSRMLS_DC) /* {{{ */
{
if (zread_preference) {
php_phongo_readpreference_t *intern = Z_READPREFERENCE_OBJ_P(zread_preference);
if (intern) {
return intern->read_preference;
}
}
return NULL;
} /* }}} */
const php_phongo_query_t* phongo_query_from_zval(zval *zquery TSRMLS_DC) /* {{{ */
{
php_phongo_query_t *intern = Z_QUERY_OBJ_P(zquery);
return intern;
} /* }}} */
/* }}} */
/* {{{ phongo zval from mongoc types */
void php_phongo_cursor_id_new_from_id(zval *object, int64_t cursorid TSRMLS_DC) /* {{{ */
{
php_phongo_cursorid_t *intern;
object_init_ex(object, php_phongo_cursorid_ce);
intern = Z_CURSORID_OBJ_P(object);
intern->id = cursorid;
} /* }}} */
void php_phongo_objectid_new_from_oid(zval *object, const bson_oid_t *oid TSRMLS_DC) /* {{{ */
{
php_phongo_objectid_t *intern;
object_init_ex(object, php_phongo_objectid_ce);
intern = Z_OBJECTID_OBJ_P(object);
bson_oid_to_string(oid, intern->oid);
} /* }}} */
void php_phongo_server_to_zval(zval *retval, const mongoc_server_description_t *sd) /* {{{ */
{
array_init(retval);
ADD_ASSOC_STRING(retval, "host", (char *)sd->host.host);
ADD_ASSOC_LONG_EX(retval, "port", sd->host.port);
ADD_ASSOC_LONG_EX(retval, "type", sd->type);
ADD_ASSOC_BOOL_EX(retval, "is_primary", sd->type == MONGOC_SERVER_RS_PRIMARY);
ADD_ASSOC_BOOL_EX(retval, "is_secondary", sd->type == MONGOC_SERVER_RS_SECONDARY);
ADD_ASSOC_BOOL_EX(retval, "is_arbiter", sd->type == MONGOC_SERVER_RS_ARBITER);
{
bson_iter_t iter;
zend_bool b = bson_iter_init_find_case(&iter, &sd->last_is_master, "hidden") && bson_iter_as_bool(&iter);
ADD_ASSOC_BOOL_EX(retval, "is_hidden", b);
}
{
bson_iter_t iter;
zend_bool b = bson_iter_init_find_case(&iter, &sd->last_is_master, "passive") && bson_iter_as_bool(&iter);
ADD_ASSOC_BOOL_EX(retval, "is_passive", b);
}
if (sd->tags.len) {
php_phongo_bson_state state = PHONGO_BSON_STATE_INITIALIZER;
/* Use native arrays for debugging output */
state.map.root_type = PHONGO_TYPEMAP_NATIVE_ARRAY;
state.map.document_type = PHONGO_TYPEMAP_NATIVE_ARRAY;
- bson_to_zval_ex(bson_get_data(&sd->tags), sd->tags.len, &state);
+ phongo_bson_to_zval_ex(bson_get_data(&sd->tags), sd->tags.len, &state);
#if PHP_VERSION_ID >= 70000
ADD_ASSOC_ZVAL_EX(retval, "tags", &state.zchild);
#else
ADD_ASSOC_ZVAL_EX(retval, "tags", state.zchild);
#endif
}
{
php_phongo_bson_state state = PHONGO_BSON_STATE_INITIALIZER;
/* Use native arrays for debugging output */
state.map.root_type = PHONGO_TYPEMAP_NATIVE_ARRAY;
state.map.document_type = PHONGO_TYPEMAP_NATIVE_ARRAY;
- bson_to_zval_ex(bson_get_data(&sd->last_is_master), sd->last_is_master.len, &state);
+ phongo_bson_to_zval_ex(bson_get_data(&sd->last_is_master), sd->last_is_master.len, &state);
#if PHP_VERSION_ID >= 70000
ADD_ASSOC_ZVAL_EX(retval, "last_is_master", &state.zchild);
#else
ADD_ASSOC_ZVAL_EX(retval, "last_is_master", state.zchild);
#endif
}
ADD_ASSOC_LONG_EX(retval, "round_trip_time", sd->round_trip_time);
} /* }}} */
void php_phongo_read_concern_to_zval(zval *retval, const mongoc_read_concern_t *read_concern) /* {{{ */
{
const char *level = mongoc_read_concern_get_level(read_concern);
array_init_size(retval, 1);
if (level) {
ADD_ASSOC_STRING(retval, "level", (char *)level);
} else {
ADD_ASSOC_NULL_EX(retval, "level");
}
} /* }}} */
void php_phongo_read_preference_to_zval(zval *retval, const mongoc_read_prefs_t *read_prefs) /* {{{ */
{
array_init_size(retval, 2);
ADD_ASSOC_LONG_EX(retval, "mode", read_prefs->mode);
if (read_prefs->tags.len) {
php_phongo_bson_state state = PHONGO_BSON_STATE_INITIALIZER;
/* Use native arrays for debugging output */
state.map.root_type = PHONGO_TYPEMAP_NATIVE_ARRAY;
state.map.document_type = PHONGO_TYPEMAP_NATIVE_ARRAY;
- bson_to_zval_ex(bson_get_data(&read_prefs->tags), read_prefs->tags.len, &state);
+ phongo_bson_to_zval_ex(bson_get_data(&read_prefs->tags), read_prefs->tags.len, &state);
#if PHP_VERSION_ID >= 70000
ADD_ASSOC_ZVAL_EX(retval, "tags", &state.zchild);
#else
ADD_ASSOC_ZVAL_EX(retval, "tags", state.zchild);
#endif
} else {
ADD_ASSOC_NULL_EX(retval, "tags");
}
} /* }}} */
void php_phongo_write_concern_to_zval(zval *retval, const mongoc_write_concern_t *write_concern) /* {{{ */
{
const char *wtag = mongoc_write_concern_get_wtag(write_concern);
const int32_t w = mongoc_write_concern_get_w(write_concern);
array_init_size(retval, 4);
if (wtag) {
ADD_ASSOC_STRING(retval, "w", (char *)wtag);
} else if (mongoc_write_concern_get_wmajority(write_concern)) {
ADD_ASSOC_STRING(retval, "w", (char *)PHONGO_WRITE_CONCERN_W_MAJORITY);
} else if (w != MONGOC_WRITE_CONCERN_W_DEFAULT) {
ADD_ASSOC_LONG_EX(retval, "w", w);
} else {
ADD_ASSOC_NULL_EX(retval, "w");
}
ADD_ASSOC_BOOL_EX(retval, "wmajority", mongoc_write_concern_get_wmajority(write_concern));
ADD_ASSOC_LONG_EX(retval, "wtimeout", mongoc_write_concern_get_wtimeout(write_concern));
if (write_concern->journal != MONGOC_WRITE_CONCERN_JOURNAL_DEFAULT) {
ADD_ASSOC_BOOL_EX(retval, "journal", mongoc_write_concern_get_journal(write_concern));
} else {
ADD_ASSOC_NULL_EX(retval, "journal");
}
} /* }}} */
void php_phongo_cursor_to_zval(zval *retval, const mongoc_cursor_t *cursor) /* {{{ */
{
array_init_size(retval, 19);
ADD_ASSOC_LONG_EX(retval, "stamp", cursor->stamp);
#define _ADD_BOOL(z, field) ADD_ASSOC_BOOL_EX(z, #field, cursor->field)
_ADD_BOOL(retval, is_command);
_ADD_BOOL(retval, sent);
_ADD_BOOL(retval, done);
_ADD_BOOL(retval, end_of_event);
_ADD_BOOL(retval, in_exhaust);
_ADD_BOOL(retval, has_fields);
#undef _ADD_BOOL
/* Avoid using PHONGO_TYPEMAP_NATIVE_ARRAY for decoding query, selector,
* and current documents so that users can differentiate BSON arrays
* and documents. */
{
#if PHP_VERSION_ID >= 70000
zval zv;
#else
zval *zv;
#endif
- bson_to_zval(bson_get_data(&cursor->query), cursor->query.len, &zv);
+ phongo_bson_to_zval(bson_get_data(&cursor->query), cursor->query.len, &zv);
#if PHP_VERSION_ID >= 70000
ADD_ASSOC_ZVAL_EX(retval, "query", &zv);
#else
ADD_ASSOC_ZVAL_EX(retval, "query", zv);
#endif
}
{
#if PHP_VERSION_ID >= 70000
zval zv;
#else
zval *zv;
#endif
- bson_to_zval(bson_get_data(&cursor->fields), cursor->fields.len, &zv);
+ phongo_bson_to_zval(bson_get_data(&cursor->fields), cursor->fields.len, &zv);
#if PHP_VERSION_ID >= 70000
ADD_ASSOC_ZVAL_EX(retval, "fields", &zv);
#else
ADD_ASSOC_ZVAL_EX(retval, "fields", zv);
#endif
}
{
#if PHP_VERSION_ID >= 70000
zval read_preference;
php_phongo_read_preference_to_zval(&read_preference, cursor->read_prefs);
ADD_ASSOC_ZVAL_EX(retval, "read_preference", &read_preference);
#else
zval *read_preference = NULL;
MAKE_STD_ZVAL(read_preference);
php_phongo_read_preference_to_zval(read_preference, cursor->read_prefs);
ADD_ASSOC_ZVAL_EX(retval, "read_preference", read_preference);
#endif
}
#define _ADD_INT(z, field) ADD_ASSOC_LONG_EX(z, #field, cursor->field)
_ADD_INT(retval, flags);
_ADD_INT(retval, skip);
_ADD_INT(retval, limit);
_ADD_INT(retval, count);
_ADD_INT(retval, batch_size);
#undef _ADD_INT
ADD_ASSOC_STRING(retval, "ns", (char *)cursor->ns);
if (cursor->current) {
#if PHP_VERSION_ID >= 70000
zval zv;
#else
zval *zv;
#endif
- bson_to_zval(bson_get_data(cursor->current), cursor->current->len, &zv);
+ phongo_bson_to_zval(bson_get_data(cursor->current), cursor->current->len, &zv);
#if PHP_VERSION_ID >= 70000
ADD_ASSOC_ZVAL_EX(retval, "current_doc", &zv);
#else
ADD_ASSOC_ZVAL_EX(retval, "current_doc", zv);
#endif
}
} /* }}} */
/* }}} */
static mongoc_uri_t *php_phongo_make_uri(const char *uri_string, bson_t *options) /* {{{ */
{
bson_iter_t iter;
mongoc_uri_t *uri;
uri = mongoc_uri_new(uri_string);
MONGOC_DEBUG("Connection string: '%s'", uri_string);
if (!uri) {
return NULL;
}
if (options && bson_iter_init(&iter, options)) {
while (bson_iter_next (&iter)) {
const char *key = bson_iter_key(&iter);
/* Skip read preference and write concern options, as those must be
* processed after the mongoc_client_t is constructed. */
if (!strcasecmp(key, "journal") ||
!strcasecmp(key, "readpreference") ||
!strcasecmp(key, "readpreferencetags") ||
!strcasecmp(key, "safe") ||
!strcasecmp(key, "slaveok") ||
!strcasecmp(key, "w") ||
!strcasecmp(key, "wtimeoutms")) {
continue;
}
if (mongoc_uri_option_is_bool(key)) {
mongoc_uri_set_option_as_bool (uri, key, bson_iter_as_bool(&iter));
}
else if (mongoc_uri_option_is_int32(key) && BSON_ITER_HOLDS_INT32(&iter)) {
mongoc_uri_set_option_as_int32 (uri, key, bson_iter_int32 (&iter));
}
else if (mongoc_uri_option_is_utf8(key) && BSON_ITER_HOLDS_UTF8(&iter)) {
mongoc_uri_set_option_as_utf8(uri, key, bson_iter_utf8 (&iter, NULL));
}
else if (BSON_ITER_HOLDS_ARRAY(&iter) && !strcasecmp(key, "hosts")) {
bson_iter_t sub;
bson_iter_recurse(&iter, &sub);
while (bson_iter_next (&sub)) {
if (BSON_ITER_HOLDS_UTF8(&sub)) {
mongoc_uri_parse_host(uri, bson_iter_utf8(&sub, NULL));
}
}
}
else if (BSON_ITER_HOLDS_UTF8(&iter)) {
const char *value = bson_iter_utf8 (&iter, NULL);
if (!strcasecmp(key, "username")) {
mongoc_uri_set_username(uri, value);
} else if (!strcasecmp(key, "password")) {
mongoc_uri_set_password(uri, value);
} else if (!strcasecmp(key, "database")) {
mongoc_uri_set_database(uri, value);
} else if (!strcasecmp(key, "authsource")) {
mongoc_uri_set_auth_source(uri, value);
}
}
}
}
return uri;
} /* }}} */
void php_phongo_populate_default_ssl_ctx(php_stream_context *ctx, zval *driverOptions) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *tmp;
#define SET_STRING_CTX(name) \
if (driverOptions && php_array_exists(driverOptions, name)) { \
zval ztmp; \
zend_bool ctmp_free; \
int ctmp_len; \
char *ctmp; \
ctmp = php_array_fetchl_string(driverOptions, name, sizeof(name)-1, &ctmp_len, &ctmp_free); \
ZVAL_STRING(&ztmp, ctmp); \
if (ctmp_free) { \
str_efree(ctmp); \
} \
php_stream_context_set_option(ctx, "ssl", name, &ztmp); \
zval_ptr_dtor(&ztmp); \
}
#define SET_BOOL_CTX(name, defaultvalue) \
{ \
zval ztmp; \
if (driverOptions && php_array_exists(driverOptions, name)) { \
ZVAL_BOOL(&ztmp, php_array_fetchl_bool(driverOptions, ZEND_STRL(name))); \
php_stream_context_set_option(ctx, "ssl", name, &ztmp); \
} \
else if ((tmp = php_stream_context_get_option(ctx, "ssl", name)) == NULL) { \
ZVAL_BOOL(&ztmp, defaultvalue); \
php_stream_context_set_option(ctx, "ssl", name, &ztmp); \
} \
}
#else
zval **tmp;
#define SET_STRING_CTX(name) \
if (driverOptions && php_array_exists(driverOptions, name)) { \
zval ztmp; \
zend_bool ctmp_free; \
int ctmp_len; \
char *ctmp; \
ctmp = php_array_fetchl_string(driverOptions, name, sizeof(name)-1, &ctmp_len, &ctmp_free); \
ZVAL_STRING(&ztmp, ctmp, ctmp_free); \
php_stream_context_set_option(ctx, "ssl", name, &ztmp); \
}
#define SET_BOOL_CTX(name, defaultvalue) \
{ \
zval ztmp; \
if (driverOptions && php_array_exists(driverOptions, name)) { \
ZVAL_BOOL(&ztmp, php_array_fetchl_bool(driverOptions, ZEND_STRL(name))); \
php_stream_context_set_option(ctx, "ssl", name, &ztmp); \
} \
else if (php_stream_context_get_option(ctx, "ssl", name, &tmp) == FAILURE) { \
ZVAL_BOOL(&ztmp, defaultvalue); \
php_stream_context_set_option(ctx, "ssl", name, &ztmp); \
} \
}
#endif
SET_BOOL_CTX("verify_peer", 1);
SET_BOOL_CTX("verify_peer_name", 1);
SET_BOOL_CTX("verify_hostname", 1);
SET_BOOL_CTX("verify_expiry", 1);
SET_BOOL_CTX("allow_self_signed", 0);
SET_STRING_CTX("peer_name");
SET_STRING_CTX("local_pk");
SET_STRING_CTX("local_cert");
SET_STRING_CTX("cafile");
SET_STRING_CTX("capath");
SET_STRING_CTX("passphrase");
SET_STRING_CTX("ciphers");
#undef SET_BOOL_CTX
#undef SET_STRING_CTX
} /* }}} */
static bool php_phongo_apply_rp_options_to_client(mongoc_client_t *client, bson_t *options TSRMLS_DC) /* {{{ */
{
bson_iter_t iter;
mongoc_read_prefs_t *new_rp;
const mongoc_read_prefs_t *old_rp;
if (!(old_rp = mongoc_client_get_read_prefs(client))) {
phongo_throw_exception(PHONGO_ERROR_MONGOC_FAILED TSRMLS_CC, "Client does not have a read preference");
return false;
}
/* Return early if there are no options to apply */
if (bson_empty0(options)) {
return true;
}
if (!bson_iter_init_find_case(&iter, options, "slaveok") &&
!bson_iter_init_find_case(&iter, options, "readpreference") &&
!bson_iter_init_find_case(&iter, options, "readpreferencetags")) {
return true;
}
new_rp = mongoc_read_prefs_copy(old_rp);
if (bson_iter_init_find_case(&iter, options, "slaveok") && BSON_ITER_HOLDS_BOOL(&iter)) {
mongoc_read_prefs_set_mode(new_rp, MONGOC_READ_SECONDARY_PREFERRED);
}
if (bson_iter_init_find_case(&iter, options, "readpreference") && BSON_ITER_HOLDS_UTF8(&iter)) {
const char *str = bson_iter_utf8(&iter, NULL);
if (0 == strcasecmp("primary", str)) {
mongoc_read_prefs_set_mode(new_rp, MONGOC_READ_PRIMARY);
} else if (0 == strcasecmp("primarypreferred", str)) {
mongoc_read_prefs_set_mode(new_rp, MONGOC_READ_PRIMARY_PREFERRED);
} else if (0 == strcasecmp("secondary", str)) {
mongoc_read_prefs_set_mode(new_rp, MONGOC_READ_SECONDARY);
} else if (0 == strcasecmp("secondarypreferred", str)) {
mongoc_read_prefs_set_mode(new_rp, MONGOC_READ_SECONDARY_PREFERRED);
} else if (0 == strcasecmp("nearest", str)) {
mongoc_read_prefs_set_mode(new_rp, MONGOC_READ_NEAREST);
} else {
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Unsupported readPreference value: '%s'", str);
mongoc_read_prefs_destroy(new_rp);
return false;
}
}
if (bson_iter_init_find_case(&iter, options, "readpreferencetags") && BSON_ITER_HOLDS_ARRAY(&iter)) {
bson_t tags;
uint32_t len;
const uint8_t *data;
bson_iter_array(&iter, &len, &data);
if (bson_init_static(&tags, data, len)) {
mongoc_read_prefs_set_tags(new_rp, &tags);
}
}
if (mongoc_read_prefs_get_mode(new_rp) == MONGOC_READ_PRIMARY &&
!bson_empty(mongoc_read_prefs_get_tags(new_rp))) {
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Primary read preference mode conflicts with tags");
mongoc_read_prefs_destroy(new_rp);
return false;
}
/* This may be redundant in light of the last check (primary with tags), but
* we'll check anyway in case additional validation is implemented. */
if (!mongoc_read_prefs_is_valid(new_rp)) {
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Read preference is not valid");
mongoc_read_prefs_destroy(new_rp);
return false;
}
mongoc_client_set_read_prefs(client, new_rp);
mongoc_read_prefs_destroy(new_rp);
return true;
} /* }}} */
static bool php_phongo_apply_wc_options_to_client(mongoc_client_t *client, bson_t *options TSRMLS_DC) /* {{{ */
{
bson_iter_t iter;
int32_t wtimeoutms;
mongoc_write_concern_t *new_wc;
const mongoc_write_concern_t *old_wc;
if (!(old_wc = mongoc_client_get_write_concern(client))) {
phongo_throw_exception(PHONGO_ERROR_MONGOC_FAILED TSRMLS_CC, "Client does not have a write concern");
return false;
}
/* Return early if there are no options to apply */
if (bson_empty0(options)) {
return true;
}
if (!bson_iter_init_find_case(&iter, options, "journal") &&
!bson_iter_init_find_case(&iter, options, "safe") &&
!bson_iter_init_find_case(&iter, options, "w") &&
!bson_iter_init_find_case(&iter, options, "wtimeoutms")) {
return true;
}
wtimeoutms = mongoc_write_concern_get_wtimeout(old_wc);
new_wc = mongoc_write_concern_copy(old_wc);
if (bson_iter_init_find_case(&iter, options, "safe") && BSON_ITER_HOLDS_BOOL(&iter)) {
mongoc_write_concern_set_w(new_wc, bson_iter_bool(&iter) ? 1 : MONGOC_WRITE_CONCERN_W_UNACKNOWLEDGED);
}
if (bson_iter_init_find_case(&iter, options, "wtimeoutms") && BSON_ITER_HOLDS_INT32(&iter)) {
wtimeoutms = bson_iter_int32(&iter);
}
if (bson_iter_init_find_case(&iter, options, "journal") && BSON_ITER_HOLDS_BOOL(&iter)) {
mongoc_write_concern_set_journal(new_wc, bson_iter_bool(&iter));
}
if (bson_iter_init_find_case(&iter, options, "w")) {
if (BSON_ITER_HOLDS_INT32(&iter)) {
int32_t value = bson_iter_int32(&iter);
switch (value) {
case MONGOC_WRITE_CONCERN_W_ERRORS_IGNORED:
case MONGOC_WRITE_CONCERN_W_UNACKNOWLEDGED:
mongoc_write_concern_set_w(new_wc, value);
break;
default:
if (value > 0) {
mongoc_write_concern_set_w(new_wc, value);
break;
}
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Unsupported w value: %d", value);
mongoc_write_concern_destroy(new_wc);
return false;
}
} else if (BSON_ITER_HOLDS_UTF8(&iter)) {
const char *str = bson_iter_utf8(&iter, NULL);
if (0 == strcasecmp(PHONGO_WRITE_CONCERN_W_MAJORITY, str)) {
mongoc_write_concern_set_wmajority(new_wc, wtimeoutms);
} else {
mongoc_write_concern_set_wtag(new_wc, str);
}
}
}
/* Only set wtimeout if it's still applicable; otherwise, clear it. */
if (mongoc_write_concern_get_w(new_wc) > 1 ||
mongoc_write_concern_get_wmajority(new_wc) ||
mongoc_write_concern_get_wtag(new_wc)) {
mongoc_write_concern_set_wtimeout(new_wc, wtimeoutms);
} else {
mongoc_write_concern_set_wtimeout(new_wc, 0);
}
if (mongoc_write_concern_get_journal(new_wc)) {
int32_t w = mongoc_write_concern_get_w(new_wc);
if (w == MONGOC_WRITE_CONCERN_W_UNACKNOWLEDGED || w == MONGOC_WRITE_CONCERN_W_ERRORS_IGNORED) {
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Journal conflicts with w value: %d", w);
mongoc_write_concern_destroy(new_wc);
return false;
}
}
/* This may be redundant in light of the last check (unacknowledged w with
journal), but we'll check anyway in case additional validation is
implemented. */
if (!_mongoc_write_concern_is_valid(new_wc)) {
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Write concern is not valid");
mongoc_write_concern_destroy(new_wc);
return false;
}
mongoc_client_set_write_concern(client, new_wc);
mongoc_write_concern_destroy(new_wc);
return true;
} /* }}} */
static mongoc_client_t *php_phongo_make_mongo_client(const mongoc_uri_t *uri, zval *driverOptions TSRMLS_DC) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *tmp;
#else
zval **tmp;
#endif
php_stream_context *ctx = NULL;
const char *mech, *mongoc_version, *bson_version;
mongoc_client_t *client;
ENTRY;
#if PHP_VERSION_ID >= 70000
if (driverOptions && (tmp = zend_hash_str_find(Z_ARRVAL_P(driverOptions), "debug", sizeof("debug")-1)) != NULL) {
zend_string *key = zend_string_init(PHONGO_DEBUG_INI, sizeof(PHONGO_DEBUG_INI)-1, 0);
zend_string *value_str = zval_get_string(tmp);
zend_alter_ini_entry_ex(key, value_str, PHP_INI_USER, PHP_INI_STAGE_RUNTIME, 0);
zend_string_release(key);
zend_string_release(value_str);
}
#else
if (driverOptions && zend_hash_find(Z_ARRVAL_P(driverOptions), "debug", strlen("debug") + 1, (void**)&tmp) == SUCCESS) {
convert_to_string(*tmp);
zend_alter_ini_entry_ex((char *)PHONGO_DEBUG_INI, sizeof(PHONGO_DEBUG_INI), Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp), PHP_INI_USER, PHP_INI_STAGE_RUNTIME, 0 TSRMLS_CC);
}
#endif
#if PHP_VERSION_ID >= 70000
if (driverOptions && (tmp = zend_hash_str_find(Z_ARRVAL_P(driverOptions), "context", sizeof("context")-1)) != NULL) {
ctx = php_stream_context_from_zval(tmp, 0);
#else
if (driverOptions && zend_hash_find(Z_ARRVAL_P(driverOptions), "context", strlen("context") + 1, (void**)&tmp) == SUCCESS) {
ctx = php_stream_context_from_zval(*tmp, 0);
#endif
} else {
GET_DEFAULT_CONTEXT();
}
if (mongoc_uri_get_ssl(uri)) {
php_phongo_populate_default_ssl_ctx(ctx, driverOptions);
}
#ifdef HAVE_SYSTEM_LIBMONGOC
mongoc_version = mongoc_get_version();
#else
mongoc_version = "bundled";
#endif
#ifdef HAVE_SYSTEM_LIBBSON
bson_version = bson_get_version();
#else
bson_version = "bundled";
#endif
MONGOC_DEBUG("Creating Manager, phongo-%s[%s] - mongoc-%s(%s), libbson-%s(%s), php-%s",
MONGODB_VERSION_S,
MONGODB_STABILITY_S,
MONGOC_VERSION_S,
mongoc_version,
BSON_VERSION_S,
bson_version,
PHP_VERSION
);
client = mongoc_client_new_from_uri(uri);
if (!client) {
RETURN(NULL);
}
mech = mongoc_uri_get_auth_mechanism(uri);
/* Check if we are doing X509 auth, in which case extract the username (subject) from the cert if no username is provided */
if (mech && !strcasecmp(mech, "MONGODB-X509") && !mongoc_uri_get_username(uri)) {
#if PHP_VERSION_ID >= 70000
zval *pem;
#else
zval **pem;
#endif
#if PHP_VERSION_ID >= 70000
if ((pem = php_stream_context_get_option(ctx, "ssl", "local_cert")) != NULL) {
#else
if (SUCCESS == php_stream_context_get_option(ctx, "ssl", "local_cert", &pem)) {
#endif
char filename[MAXPATHLEN];
#if PHP_VERSION_ID >= 70000
zend_string *s = zval_get_string(pem);
if (VCWD_REALPATH(ZSTR_VAL(s), filename)) {
#else
convert_to_string_ex(pem);
if (VCWD_REALPATH(Z_STRVAL_PP(pem), filename)) {
#endif
mongoc_ssl_opt_t ssl_options;
ssl_options.pem_file = filename;
mongoc_client_set_ssl_opts(client, &ssl_options);
}
#if PHP_VERSION_ID >= 70000
zend_string_release(s);
#endif
}
}
mongoc_client_set_stream_initiator(client, phongo_stream_initiator, ctx);
RETURN(client);
} /* }}} */
bool phongo_manager_init(php_phongo_manager_t *manager, const char *uri_string, bson_t *bson_options, zval *driverOptions TSRMLS_DC) /* {{{ */
{
mongoc_uri_t *uri;
if (!(uri = php_phongo_make_uri(uri_string, bson_options))) {
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Failed to parse MongoDB URI: '%s'", uri_string);
return false;
}
manager->client = php_phongo_make_mongo_client(uri, driverOptions TSRMLS_CC);
mongoc_uri_destroy(uri);
if (!manager->client) {
phongo_throw_exception(PHONGO_ERROR_RUNTIME TSRMLS_CC, "Failed to create Manager from URI: '%s'", uri_string);
return false;
}
if (!php_phongo_apply_rp_options_to_client(manager->client, bson_options TSRMLS_CC) ||
!php_phongo_apply_wc_options_to_client(manager->client, bson_options TSRMLS_CC)) {
/* Exception should already have been thrown */
return false;
}
return true;
} /* }}} */
void php_phongo_new_utcdatetime_from_epoch(zval *object, int64_t msec_since_epoch TSRMLS_DC) /* {{{ */
{
php_phongo_utcdatetime_t *intern;
object_init_ex(object, php_phongo_utcdatetime_ce);
intern = Z_UTCDATETIME_OBJ_P(object);
intern->milliseconds = msec_since_epoch;
} /* }}} */
void php_phongo_new_datetime_from_utcdatetime(zval *object, int64_t milliseconds TSRMLS_DC) /* {{{ */
{
php_date_obj *datetime_obj;
char *sec;
int sec_len;
object_init_ex(object, php_date_get_date_ce());
#ifdef WIN32
sec_len = spprintf(&sec, 0, "@%I64d", (int64_t) milliseconds / 1000);
#else
sec_len = spprintf(&sec, 0, "@%lld", (long long int) milliseconds / 1000);
#endif
datetime_obj = Z_PHPDATE_P(object);
php_date_initialize(datetime_obj, sec, sec_len, NULL, NULL, 0 TSRMLS_CC);
efree(sec);
datetime_obj->time->f = milliseconds % 1000;
} /* }}} */
void php_phongo_new_timestamp_from_increment_and_timestamp(zval *object, int32_t increment, int32_t timestamp TSRMLS_DC) /* {{{ */
{
php_phongo_timestamp_t *intern;
object_init_ex(object, php_phongo_timestamp_ce);
intern = Z_TIMESTAMP_OBJ_P(object);
intern->increment = increment;
intern->timestamp = timestamp;
} /* }}} */
void php_phongo_new_javascript_from_javascript(int init, zval *object, const char *code, size_t code_len TSRMLS_DC) /* {{{ */
{
php_phongo_new_javascript_from_javascript_and_scope(init, object, code, code_len, NULL TSRMLS_CC);
} /* }}} */
void php_phongo_new_javascript_from_javascript_and_scope(int init, zval *object, const char *code, size_t code_len, const bson_t *scope TSRMLS_DC) /* {{{ */
{
php_phongo_javascript_t *intern;
if (init) {
object_init_ex(object, php_phongo_javascript_ce);
}
intern = Z_JAVASCRIPT_OBJ_P(object);
intern->javascript = estrndup(code, code_len);
intern->javascript_len = code_len;
intern->document = scope ? bson_copy(scope) : NULL;
} /* }}} */
void php_phongo_new_binary_from_binary_and_type(zval *object, const char *data, size_t data_len, bson_subtype_t type TSRMLS_DC) /* {{{ */
{
php_phongo_binary_t *intern;
object_init_ex(object, php_phongo_binary_ce);
intern = Z_BINARY_OBJ_P(object);
intern->data = estrndup(data, data_len);
intern->data_len = data_len;
intern->type = type;
} /* }}} */
void php_phongo_new_regex_from_regex_and_options(zval *object, const char *pattern, const char *flags TSRMLS_DC) /* {{{ */
{
php_phongo_regex_t *intern;
object_init_ex(object, php_phongo_regex_ce);
intern = Z_REGEX_OBJ_P(object);
intern->pattern_len = strlen(pattern);
intern->pattern = estrndup(pattern, intern->pattern_len);
intern->flags_len = strlen(flags);
intern->flags = estrndup(flags, intern->flags_len);
} /* }}} */
static void php_phongo_cursor_free_current(php_phongo_cursor_t *cursor) /* {{{ */
{
if (!Z_ISUNDEF(cursor->visitor_data.zchild)) {
zval_ptr_dtor(&cursor->visitor_data.zchild);
#if PHP_VERSION_ID >= 70000
ZVAL_UNDEF(&cursor->visitor_data.zchild);
#else
cursor->visitor_data.zchild = NULL;
#endif
}
} /* }}} */
void php_phongo_cursor_free(php_phongo_cursor_t *cursor) /* {{{ */
{
if (cursor->cursor) {
mongoc_cursor_destroy(cursor->cursor);
cursor->cursor = NULL;
}
php_phongo_cursor_free_current(cursor);
} /* }}} */
/* {{{ Iterator */
static void php_phongo_cursor_iterator_dtor(zend_object_iterator *iter TSRMLS_DC) /* {{{ */
{
php_phongo_cursor_iterator *cursor_it = (php_phongo_cursor_iterator *)iter;
if (!Z_ISUNDEF(cursor_it->intern.data)) {
#if PHP_VERSION_ID >= 70000
zval_ptr_dtor(&cursor_it->intern.data);
#else
zval_ptr_dtor((zval**)&cursor_it->intern.data);
cursor_it->intern.data = NULL;
#endif
}
#if PHP_VERSION_ID < 70000
efree(cursor_it);
#endif
} /* }}} */
static int php_phongo_cursor_iterator_valid(zend_object_iterator *iter TSRMLS_DC) /* {{{ */
{
php_phongo_cursor_t *cursor = ((php_phongo_cursor_iterator *)iter)->cursor;
if (!Z_ISUNDEF(cursor->visitor_data.zchild)) {
return SUCCESS;
}
return FAILURE;
} /* }}} */
#if PHP_VERSION_ID < 50500
static int php_phongo_cursor_iterator_get_current_key(zend_object_iterator *iter, char **str_key, uint *str_key_len, ulong *int_key TSRMLS_DC) /* {{{ */
{
*int_key = (ulong) ((php_phongo_cursor_iterator *)iter)->current;
return HASH_KEY_IS_LONG;
} /* }}} */
#else
static void php_phongo_cursor_iterator_get_current_key(zend_object_iterator *iter, zval *key TSRMLS_DC) /* {{{ */
{
ZVAL_LONG(key, ((php_phongo_cursor_iterator *)iter)->current);
} /* }}} */
#endif
#if PHP_VERSION_ID < 70000
static void php_phongo_cursor_iterator_get_current_data(zend_object_iterator *iter, zval ***data TSRMLS_DC) /* {{{ */
{
php_phongo_cursor_t *cursor = ((php_phongo_cursor_iterator *)iter)->cursor;
*data = &cursor->visitor_data.zchild;
} /* }}} */
#else
static zval* php_phongo_cursor_iterator_get_current_data(zend_object_iterator *iter) /* {{{ */
{
php_phongo_cursor_t *cursor = ((php_phongo_cursor_iterator *)iter)->cursor;
return &cursor->visitor_data.zchild;
} /* }}} */
#endif
static void php_phongo_cursor_iterator_move_forward(zend_object_iterator *iter TSRMLS_DC) /* {{{ */
{
php_phongo_cursor_iterator *cursor_it = (php_phongo_cursor_iterator *)iter;
php_phongo_cursor_t *cursor = cursor_it->cursor;
const bson_t *doc;
php_phongo_cursor_free_current(cursor);
cursor_it->current++;
if (mongoc_cursor_next(cursor->cursor, &doc)) {
- bson_to_zval_ex(bson_get_data(doc), doc->len, &cursor->visitor_data);
+ phongo_bson_to_zval_ex(bson_get_data(doc), doc->len, &cursor->visitor_data);
} else {
bson_error_t error;
if (mongoc_cursor_error(cursor->cursor, &error)) {
/* Intentionally not destroying the cursor as it will happen
* naturally now that there are no more results */
phongo_throw_exception_from_bson_error_t(&error TSRMLS_CC);
}
}
} /* }}} */
static void php_phongo_cursor_iterator_rewind(zend_object_iterator *iter TSRMLS_DC) /* {{{ */
{
php_phongo_cursor_iterator *cursor_it = (php_phongo_cursor_iterator *)iter;
php_phongo_cursor_t *cursor = cursor_it->cursor;
const bson_t *doc;
if (cursor_it->current > 0) {
phongo_throw_exception(PHONGO_ERROR_LOGIC TSRMLS_CC, "Cursors cannot rewind after starting iteration");
return;
}
php_phongo_cursor_free_current(cursor);
doc = mongoc_cursor_current(cursor->cursor);
if (doc) {
- bson_to_zval_ex(bson_get_data(doc), doc->len, &cursor->visitor_data);
+ phongo_bson_to_zval_ex(bson_get_data(doc), doc->len, &cursor->visitor_data);
}
} /* }}} */
/* iterator handler table */
zend_object_iterator_funcs php_phongo_cursor_iterator_funcs = {
php_phongo_cursor_iterator_dtor,
php_phongo_cursor_iterator_valid,
php_phongo_cursor_iterator_get_current_data,
php_phongo_cursor_iterator_get_current_key,
php_phongo_cursor_iterator_move_forward,
php_phongo_cursor_iterator_rewind,
NULL /* invalidate_current is not used */
};
zend_object_iterator *php_phongo_cursor_get_iterator(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC) /* {{{ */
{
php_phongo_cursor_iterator *cursor_it = NULL;
php_phongo_cursor_t *cursor = Z_CURSOR_OBJ_P(object);
if (by_ref) {
zend_error(E_ERROR, "An iterator cannot be used with foreach by reference");
}
if (cursor->got_iterator) {
phongo_throw_exception(PHONGO_ERROR_LOGIC TSRMLS_CC, "Cursors cannot yield multiple iterators");
return NULL;
}
cursor->got_iterator = 1;
cursor_it = ecalloc(1, sizeof(php_phongo_cursor_iterator));
#if PHP_VERSION_ID >= 70000
zend_iterator_init(&cursor_it->intern);
#endif
#if PHP_VERSION_ID >= 70000
ZVAL_COPY(&cursor_it->intern.data, object);
#else
Z_ADDREF_P(object);
cursor_it->intern.data = (void*)object;
#endif
cursor_it->intern.funcs = &php_phongo_cursor_iterator_funcs;
cursor_it->cursor = cursor;
/* cursor_it->current should already be allocated to zero */
php_phongo_cursor_free_current(cursor_it->cursor);
return &cursor_it->intern;
} /* }}} */
/* }}} */
/* {{{ Memory allocation wrappers */
static void* php_phongo_malloc(size_t num_bytes) /* {{{ */
{
return emalloc(num_bytes);
} /* }}} */
static void* php_phongo_calloc(size_t num_members, size_t num_bytes) /* {{{ */
{
return ecalloc(num_members, num_bytes);
} /* }}} */
static void* php_phongo_realloc(void *mem, size_t num_bytes) { /* {{{ */
return erealloc(mem, num_bytes);
} /* }}} */
static void php_phongo_free(void *mem) /* {{{ */
{
if (mem) {
efree(mem);
}
} /* }}} */
/* }}} */
#ifdef PHP_DEBUG
/* LCOV_EXCL_START */
void _phongo_debug_bson(bson_t *bson)
{
char *str;
size_t str_len;
str = bson_as_json(bson, &str_len);
php_printf("JSON: %s\n", str);
bson_free(str);
}
/* LCOV_EXCL_STOP */
#endif
/* {{{ M[INIT|SHUTDOWN] R[INIT|SHUTDOWN] G[INIT|SHUTDOWN] MINFO INI */
ZEND_INI_MH(OnUpdateDebug)
{
void ***ctx = NULL;
char *tmp_dir = NULL;
TSRMLS_SET_CTX(ctx);
/* Close any previously open log files */
if (MONGODB_G(debug_fd)) {
if (MONGODB_G(debug_fd) != stderr && MONGODB_G(debug_fd) != stdout) {
fclose(MONGODB_G(debug_fd));
}
MONGODB_G(debug_fd) = NULL;
}
if (!new_value || (new_value && !phongo_str(new_value)[0])
|| strcasecmp("0", phongo_str(new_value)) == 0
|| strcasecmp("off", phongo_str(new_value)) == 0
|| strcasecmp("no", phongo_str(new_value)) == 0
|| strcasecmp("false", phongo_str(new_value)) == 0
) {
mongoc_log_trace_disable();
mongoc_log_set_handler(NULL, NULL);
#if PHP_VERSION_ID >= 70000
return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
#else
return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
#endif
}
if (strcasecmp(phongo_str(new_value), "stderr") == 0) {
MONGODB_G(debug_fd) = stderr;
} else if (strcasecmp(phongo_str(new_value), "stdout") == 0) {
MONGODB_G(debug_fd) = stdout;
} else if (
strcasecmp("1", phongo_str(new_value)) == 0
|| strcasecmp("on", phongo_str(new_value)) == 0
|| strcasecmp("yes", phongo_str(new_value)) == 0
|| strcasecmp("true", phongo_str(new_value)) == 0
) {
tmp_dir = NULL;
} else {
tmp_dir = phongo_str(new_value);
}
if (!MONGODB_G(debug_fd)) {
time_t t;
int fd = -1;
char *prefix;
int len;
phongo_char *filename;
time(&t);
len = spprintf(&prefix, 0, "PHONGO-%ld", t);
fd = php_open_temporary_fd(tmp_dir, prefix, &filename TSRMLS_CC);
if (fd != -1) {
const char *path = phongo_str(filename);
MONGODB_G(debug_fd) = VCWD_FOPEN(path, "a");
}
efree(filename);
efree(prefix);
close(fd);
}
mongoc_log_trace_enable();
mongoc_log_set_handler(php_phongo_log, ctx);
#if PHP_VERSION_ID >= 70000
return OnUpdateString(entry, new_value, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
#else
return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
#endif
}
/* {{{ INI entries */
PHP_INI_BEGIN()
#if PHP_VERSION_ID >= 70000
STD_PHP_INI_ENTRY(PHONGO_DEBUG_INI, PHONGO_DEBUG_INI_DEFAULT, PHP_INI_ALL, OnUpdateDebug, debug, zend_mongodb_globals, mongodb_globals)
#else
{ 0, PHP_INI_ALL, (char *)PHONGO_DEBUG_INI, sizeof(PHONGO_DEBUG_INI), OnUpdateDebug, (void *) XtOffsetOf(zend_mongodb_globals, debug), (void *) &mglo, NULL, (char *)PHONGO_DEBUG_INI_DEFAULT, sizeof(PHONGO_DEBUG_INI_DEFAULT)-1, NULL, 0, 0, 0, NULL },
#endif
PHP_INI_END()
/* }}} */
/* {{{ PHP_GINIT_FUNCTION */
PHP_GINIT_FUNCTION(mongodb)
{
bson_mem_vtable_t bsonMemVTable = {
php_phongo_malloc,
php_phongo_calloc,
php_phongo_realloc,
php_phongo_free,
};
#if PHP_VERSION_ID >= 70000
#if defined(COMPILE_DL_MONGODB) && defined(ZTS)
ZEND_TSRMLS_CACHE_UPDATE();
#endif
#endif
mongodb_globals->debug_fd = NULL;
mongodb_globals->bsonMemVTable = bsonMemVTable;
}
/* }}} */
/* {{{ PHP_MINIT_FUNCTION */
PHP_MINIT_FUNCTION(mongodb)
{
(void)type; /* We don't care if we are loaded via dl() or extension= */
REGISTER_INI_ENTRIES();
/* Initialize libmongoc */
mongoc_init();
/* Initialize libbson */
bson_mem_set_vtable(&MONGODB_G(bsonMemVTable));
/* Prep default object handlers to be used when we register the classes */
memcpy(&phongo_std_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
phongo_std_object_handlers.clone_obj = NULL;
/*
phongo_std_object_handlers.get_debug_info = NULL;
phongo_std_object_handlers.compare_objects = NULL;
phongo_std_object_handlers.cast_object = NULL;
phongo_std_object_handlers.count_elements = NULL;
phongo_std_object_handlers.get_closure = NULL;
*/
PHP_MINIT(bson)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(Command)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(Cursor)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(CursorId)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(Manager)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(Query)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(ReadConcern)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(ReadPreference)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(Server)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(BulkWrite)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(WriteConcern)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(WriteConcernError)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(WriteError)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(WriteResult)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(Exception)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(LogicException)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(RuntimeException)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(UnexpectedValueException)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(InvalidArgumentException)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(ConnectionException)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(AuthenticationException)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(SSLConnectionException)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(WriteException)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(BulkWriteException)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(ExecutionTimeoutException)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(ConnectionTimeoutException)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(Type)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(Serializable)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(Unserializable)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(Persistable)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(Binary)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(Javascript)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(MaxKey)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(MinKey)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(ObjectID)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(Regex)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(Timestamp)(INIT_FUNC_ARGS_PASSTHRU);
PHP_MINIT(UTCDateTime)(INIT_FUNC_ARGS_PASSTHRU);
REGISTER_STRING_CONSTANT("MONGODB_VERSION", (char *)MONGODB_VERSION_S, CONST_CS | CONST_PERSISTENT);
REGISTER_STRING_CONSTANT("MONGODB_STABILITY", (char *)MONGODB_STABILITY_S, CONST_CS | CONST_PERSISTENT);
REGISTER_STRING_CONSTANT("BSON_NAMESPACE", (char *)BSON_NAMESPACE, CONST_CS | CONST_PERSISTENT);
return SUCCESS;
}
/* }}} */
/* {{{ PHP_MSHUTDOWN_FUNCTION */
PHP_MSHUTDOWN_FUNCTION(mongodb)
{
(void)type; /* We don't care if we are loaded via dl() or extension= */
bson_mem_restore_vtable();
/* Cleanup after libmongoc */
mongoc_cleanup();
UNREGISTER_INI_ENTRIES();
return SUCCESS;
}
/* }}} */
/* {{{ PHP_GSHUTDOWN_FUNCTION */
PHP_GSHUTDOWN_FUNCTION(mongodb)
{
mongodb_globals->debug = NULL;
if (mongodb_globals->debug_fd) {
fclose(mongodb_globals->debug_fd);
mongodb_globals->debug_fd = NULL;
}
}
/* }}} */
/* {{{ PHP_MINFO_FUNCTION */
PHP_MINFO_FUNCTION(mongodb)
{
php_info_print_table_start();
php_info_print_table_header(2, "mongodb support", "enabled");
php_info_print_table_row(2, "mongodb version", MONGODB_VERSION_S);
php_info_print_table_row(2, "mongodb stability", MONGODB_STABILITY_S);
#ifdef HAVE_SYSTEM_LIBMONGOC
php_info_print_table_row(2, "libmongoc headers version", MONGOC_VERSION_S);
php_info_print_table_row(2, "libmongoc library version", mongoc_get_version());
#else
/* Bundled libraries, buildtime = runtime */
php_info_print_table_row(2, "libmongoc version", MONGOC_VERSION_S);
#endif
#ifdef HAVE_SYSTEM_LIBBSON
php_info_print_table_row(2, "libbson headers version", BSON_VERSION_S);
php_info_print_table_row(2, "libbson library version", bson_get_version());
#else
php_info_print_table_row(2, "libbson version", BSON_VERSION_S);
#endif
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
}
/* }}} */
/* }}} */
/* {{{ mongodb_functions[]
*/
ZEND_BEGIN_ARG_INFO_EX(ai_bson_fromPHP, 0, 0, 1)
ZEND_ARG_INFO(0, value)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_bson_toPHP, 0, 0, 1)
ZEND_ARG_INFO(0, bson)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_bson_toJSON, 0, 0, 1)
ZEND_ARG_INFO(0, bson)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_bson_fromJSON, 0, 0, 1)
ZEND_ARG_INFO(0, json)
ZEND_END_ARG_INFO();
const zend_function_entry mongodb_functions[] = {
ZEND_NS_FE(BSON_NAMESPACE, fromPHP, ai_bson_fromPHP)
ZEND_NS_FE(BSON_NAMESPACE, toPHP, ai_bson_toPHP)
ZEND_NS_FE(BSON_NAMESPACE, toJSON, ai_bson_toJSON)
ZEND_NS_FE(BSON_NAMESPACE, fromJSON, ai_bson_fromJSON)
PHP_FE_END
};
/* }}} */
/* {{{ mongodb_module_entry
*/
zend_module_entry mongodb_module_entry = {
STANDARD_MODULE_HEADER,
"mongodb",
mongodb_functions,
PHP_MINIT(mongodb),
PHP_MSHUTDOWN(mongodb),
NULL /* PHP_RINIT(mongodb)*/,
NULL /* PHP_RSHUTDOWN(mongodb)*/,
PHP_MINFO(mongodb),
MONGODB_VERSION,
PHP_MODULE_GLOBALS(mongodb),
PHP_GINIT(mongodb),
PHP_GSHUTDOWN(mongodb),
NULL,
STANDARD_MODULE_PROPERTIES_EX
};
/* }}} */
#ifdef COMPILE_DL_MONGODB
ZEND_GET_MODULE(mongodb)
#endif
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/
diff --git a/mongodb-1.1.1/php_phongo.h b/mongodb-1.1.2/php_phongo.h
similarity index 99%
rename from mongodb-1.1.1/php_phongo.h
rename to mongodb-1.1.2/php_phongo.h
index 009411e7..651847b5 100644
--- a/mongodb-1.1.1/php_phongo.h
+++ b/mongodb-1.1.2/php_phongo.h
@@ -1,188 +1,188 @@
/*
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
| Copyright (c) 2014-2015 Hannes Magnusson |
+----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
| http://www.php.net/license/3_01.txt |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| license@php.net so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Author: Hannes Magnusson <bjori@php.net> |
+----------------------------------------------------------------------+
*/
#ifndef PHONGO_H
#define PHONGO_H
/* External libs */
#include "bson.h"
#include "mongoc.h"
#include "mongoc-topology-description-private.h"
#define phpext_mongodb_ptr &mongodb_module_entry
extern zend_module_entry mongodb_module_entry;
/* FIXME: Its annoying to bump version. Move into phongo_version.h.in */
-#define MONGODB_VERSION_S "1.1.1"
+#define MONGODB_VERSION_S "1.1.2"
#define MONGODB_STABILITY_S "stable"
#define MONGODB_VERSION MONGODB_VERSION_S
#ifdef PHP_WIN32
# define PHONGO_API __declspec(dllexport)
# include "ext/standard/flock_compat.h"
#elif defined(__GNUC__) && __GNUC__ >= 4
# define PHONGO_API __attribute__ ((visibility("default")))
#else
# define PHONGO_API
#endif
#ifdef ZTS
# include "TSRM.h"
# define PHONGO_STREAM_CTX(x) x
#else
# define PHONGO_STREAM_CTX(x) NULL
#endif
ZEND_BEGIN_MODULE_GLOBALS(mongodb)
char *debug;
FILE *debug_fd;
bson_mem_vtable_t bsonMemVTable;
ZEND_END_MODULE_GLOBALS(mongodb)
#if PHP_VERSION_ID >= 70000
# define MONGODB_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(mongodb, v)
#else
# ifdef ZTS
# define MONGODB_G(v) TSRMG(mongodb_globals_id, zend_mongodb_globals *, v)
# define mglo mongodb_globals_id
# else
# define MONGODB_G(v) (mongodb_globals.v)
# define mglo mongodb_globals
# endif
#endif
#define PHONGO_WRITE_CONCERN_W_MAJORITY "majority"
#include "php_phongo_classes.h"
typedef enum {
PHONGO_ERROR_INVALID_ARGUMENT = 1,
PHONGO_ERROR_RUNTIME = 2,
PHONGO_ERROR_UNEXPECTED_VALUE = 8,
PHONGO_ERROR_MONGOC_FAILED = 3,
PHONGO_ERROR_WRITE_FAILED = 5,
PHONGO_ERROR_CONNECTION_FAILED = 7,
PHONGO_ERROR_LOGIC = 9
} php_phongo_error_domain_t;
typedef struct
{
void (*writer)(mongoc_stream_t *stream, int32_t timeout_msec, ssize_t sent, size_t iovcnt);
} php_phongo_stream_logger;
typedef struct
{
mongoc_stream_t vtable;
php_stream *stream;
const mongoc_uri_t *uri;
const mongoc_host_list_t *host;
#if ZTS
void ***tsrm_ls;
#endif
} php_phongo_stream_socket;
PHONGO_API zend_class_entry* phongo_exception_from_mongoc_domain(uint32_t /* mongoc_error_domain_t */ domain, uint32_t /* mongoc_error_code_t */ code);
PHONGO_API zend_class_entry* phongo_exception_from_phongo_domain(php_phongo_error_domain_t domain);
void phongo_throw_exception(php_phongo_error_domain_t domain TSRMLS_DC, const char *format, ...)
#if PHP_VERSION_ID < 70000
# ifndef PHP_WIN32
# ifdef ZTS
__attribute__ ((format(printf, 3, 4)))
# else
__attribute__ ((format(printf, 2, 3)))
# endif
# endif
#endif
;
PHONGO_API zend_object_handlers *phongo_get_std_object_handlers(void);
void phongo_server_init (zval *return_value, mongoc_client_t *client, int server_id TSRMLS_DC);
void phongo_readconcern_init (zval *return_value, const mongoc_read_concern_t *read_concern TSRMLS_DC);
void phongo_readpreference_init (zval *return_value, const mongoc_read_prefs_t *read_prefs TSRMLS_DC);
void phongo_writeconcern_init (zval *return_value, const mongoc_write_concern_t *write_concern TSRMLS_DC);
bool phongo_query_init (php_phongo_query_t *query, bson_t *filter, bson_t *options TSRMLS_DC);
mongoc_bulk_operation_t* phongo_bulkwrite_init (zend_bool ordered);
bool phongo_execute_write (mongoc_client_t *client, const char *namespace, mongoc_bulk_operation_t *bulk, const mongoc_write_concern_t *write_concern, int server_id, zval *return_value, int return_value_used TSRMLS_DC);
int phongo_execute_command (mongoc_client_t *client, const char *db, const bson_t *command, const mongoc_read_prefs_t *read_preference, int server_id, zval *return_value, int return_value_used TSRMLS_DC);
int phongo_execute_query (mongoc_client_t *client, const char *namespace, const php_phongo_query_t *query, const mongoc_read_prefs_t *read_preference, int server_id, zval *return_value, int return_value_used TSRMLS_DC);
mongoc_stream_t* phongo_stream_initiator (const mongoc_uri_t *uri, const mongoc_host_list_t *host, void *user_data, bson_error_t *error);
const mongoc_read_concern_t* phongo_read_concern_from_zval (zval *zread_concern TSRMLS_DC);
const mongoc_read_prefs_t* phongo_read_preference_from_zval(zval *zread_preference TSRMLS_DC);
const mongoc_write_concern_t* phongo_write_concern_from_zval (zval *zwrite_concern TSRMLS_DC);
const php_phongo_query_t* phongo_query_from_zval (zval *zquery TSRMLS_DC);
void php_phongo_server_to_zval(zval *retval, const mongoc_server_description_t *sd);
void php_phongo_read_concern_to_zval(zval *retval, const mongoc_read_concern_t *read_concern);
void php_phongo_read_preference_to_zval(zval *retval, const mongoc_read_prefs_t *read_prefs);
void php_phongo_write_concern_to_zval(zval *retval, const mongoc_write_concern_t *write_concern);
void php_phongo_cursor_to_zval(zval *retval, const mongoc_cursor_t *cursor);
bool phongo_manager_init(php_phongo_manager_t *manager, const char *uri_string, bson_t *bson_options, zval *driverOptions TSRMLS_DC);
void php_phongo_objectid_new_from_oid(zval *object, const bson_oid_t *oid TSRMLS_DC);
void php_phongo_cursor_id_new_from_id(zval *object, int64_t cursorid TSRMLS_DC);
void php_phongo_new_utcdatetime_from_epoch(zval *object, int64_t msec_since_epoch TSRMLS_DC);
void php_phongo_new_datetime_from_utcdatetime(zval *object, int64_t milliseconds TSRMLS_DC);
void php_phongo_new_timestamp_from_increment_and_timestamp(zval *object, int32_t increment, int32_t timestamp TSRMLS_DC);
void php_phongo_new_javascript_from_javascript(int init, zval *object, const char *code, size_t code_len TSRMLS_DC);
void php_phongo_new_javascript_from_javascript_and_scope(int init, zval *object, const char *code, size_t code_len, const bson_t *scope TSRMLS_DC);
void php_phongo_new_binary_from_binary_and_type(zval *object, const char *data, size_t data_len, bson_subtype_t type TSRMLS_DC);
void php_phongo_new_regex_from_regex_and_options(zval *object, const char *pattern, const char *flags TSRMLS_DC);
zend_bool phongo_writeerror_init(zval *return_value, bson_t *bson TSRMLS_DC);
zend_bool phongo_writeconcernerror_init(zval *return_value, bson_t *bson TSRMLS_DC);
void php_phongo_cursor_free(php_phongo_cursor_t *cursor);
zend_object_iterator* php_phongo_cursor_get_iterator(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC);
#if PHP_VERSION_ID >= 70000
#define PHONGO_CE_INIT(ce) do { \
ce->ce_flags |= ZEND_ACC_FINAL; \
ce->serialize = zend_class_serialize_deny; \
ce->unserialize = zend_class_unserialize_deny; \
} while(0);
#else
#define PHONGO_CE_INIT(ce) do { \
ce->ce_flags |= ZEND_ACC_FINAL_CLASS; \
ce->serialize = zend_class_serialize_deny; \
ce->unserialize = zend_class_unserialize_deny; \
} while(0);
#endif
#ifdef PHP_DEBUG
void _phongo_debug_bson(bson_t *bson);
#else
#define _phongo_debug_bson(bson)
#endif
PHP_MINIT_FUNCTION(bson);
#endif /* PHONGO_H */
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/
diff --git a/mongodb-1.1.1/php_phongo_classes.h b/mongodb-1.1.2/php_phongo_classes.h
similarity index 100%
rename from mongodb-1.1.1/php_phongo_classes.h
rename to mongodb-1.1.2/php_phongo_classes.h
diff --git a/mongodb-1.1.1/php_phongo_structs-5.h b/mongodb-1.1.2/php_phongo_structs-5.h
similarity index 100%
rename from mongodb-1.1.1/php_phongo_structs-5.h
rename to mongodb-1.1.2/php_phongo_structs-5.h
diff --git a/mongodb-1.1.1/php_phongo_structs-7.h b/mongodb-1.1.2/php_phongo_structs-7.h
similarity index 100%
rename from mongodb-1.1.1/php_phongo_structs-7.h
rename to mongodb-1.1.2/php_phongo_structs-7.h
diff --git a/mongodb-1.1.1/scripts/centos/essentials.sh b/mongodb-1.1.2/scripts/centos/essentials.sh
similarity index 100%
rename from mongodb-1.1.1/scripts/centos/essentials.sh
rename to mongodb-1.1.2/scripts/centos/essentials.sh
diff --git a/mongodb-1.1.1/scripts/centos/ldap/Domain.ldif b/mongodb-1.1.2/scripts/centos/ldap/Domain.ldif
similarity index 100%
rename from mongodb-1.1.1/scripts/centos/ldap/Domain.ldif
rename to mongodb-1.1.2/scripts/centos/ldap/Domain.ldif
diff --git a/mongodb-1.1.1/scripts/centos/ldap/Users.ldif b/mongodb-1.1.2/scripts/centos/ldap/Users.ldif
similarity index 100%
rename from mongodb-1.1.1/scripts/centos/ldap/Users.ldif
rename to mongodb-1.1.2/scripts/centos/ldap/Users.ldif
diff --git a/mongodb-1.1.1/scripts/centos/ldap/basics.ldif b/mongodb-1.1.2/scripts/centos/ldap/basics.ldif
similarity index 100%
rename from mongodb-1.1.1/scripts/centos/ldap/basics.ldif
rename to mongodb-1.1.2/scripts/centos/ldap/basics.ldif
diff --git a/mongodb-1.1.1/scripts/centos/ldap/install.sh b/mongodb-1.1.2/scripts/centos/ldap/install.sh
similarity index 100%
rename from mongodb-1.1.1/scripts/centos/ldap/install.sh
rename to mongodb-1.1.2/scripts/centos/ldap/install.sh
diff --git a/mongodb-1.1.1/scripts/centos/ldap/mongod.ldif b/mongodb-1.1.2/scripts/centos/ldap/mongod.ldif
similarity index 100%
rename from mongodb-1.1.1/scripts/centos/ldap/mongod.ldif
rename to mongodb-1.1.2/scripts/centos/ldap/mongod.ldif
diff --git a/mongodb-1.1.1/scripts/centos/ldap/pw.ldif b/mongodb-1.1.2/scripts/centos/ldap/pw.ldif
similarity index 100%
rename from mongodb-1.1.1/scripts/centos/ldap/pw.ldif
rename to mongodb-1.1.2/scripts/centos/ldap/pw.ldif
diff --git a/mongodb-1.1.1/scripts/centos/ldap/saslauthd.conf b/mongodb-1.1.2/scripts/centos/ldap/saslauthd.conf
similarity index 100%
rename from mongodb-1.1.1/scripts/centos/ldap/saslauthd.conf
rename to mongodb-1.1.2/scripts/centos/ldap/saslauthd.conf
diff --git a/mongodb-1.1.1/scripts/centos/ldap/users b/mongodb-1.1.2/scripts/centos/ldap/users
similarity index 100%
rename from mongodb-1.1.1/scripts/centos/ldap/users
rename to mongodb-1.1.2/scripts/centos/ldap/users
diff --git a/mongodb-1.1.1/scripts/convert-mo-tests.php b/mongodb-1.1.2/scripts/convert-mo-tests.php
similarity index 100%
rename from mongodb-1.1.1/scripts/convert-mo-tests.php
rename to mongodb-1.1.2/scripts/convert-mo-tests.php
diff --git a/mongodb-1.1.1/scripts/freebsd/essentials.sh b/mongodb-1.1.2/scripts/freebsd/essentials.sh
similarity index 100%
rename from mongodb-1.1.1/scripts/freebsd/essentials.sh
rename to mongodb-1.1.2/scripts/freebsd/essentials.sh
diff --git a/mongodb-1.1.1/scripts/freebsd/phongo.sh b/mongodb-1.1.2/scripts/freebsd/phongo.sh
similarity index 100%
rename from mongodb-1.1.1/scripts/freebsd/phongo.sh
rename to mongodb-1.1.2/scripts/freebsd/phongo.sh
diff --git a/mongodb-1.1.1/scripts/list-servers.php b/mongodb-1.1.2/scripts/list-servers.php
similarity index 100%
rename from mongodb-1.1.1/scripts/list-servers.php
rename to mongodb-1.1.2/scripts/list-servers.php
diff --git a/mongodb-1.1.1/scripts/presets/replicaset-30.json b/mongodb-1.1.2/scripts/presets/replicaset-30.json
similarity index 100%
rename from mongodb-1.1.1/scripts/presets/replicaset-30.json
rename to mongodb-1.1.2/scripts/presets/replicaset-30.json
diff --git a/mongodb-1.1.1/scripts/presets/replicaset.json b/mongodb-1.1.2/scripts/presets/replicaset.json
similarity index 100%
rename from mongodb-1.1.1/scripts/presets/replicaset.json
rename to mongodb-1.1.2/scripts/presets/replicaset.json
diff --git a/mongodb-1.1.1/scripts/presets/standalone-24.json b/mongodb-1.1.2/scripts/presets/standalone-24.json
similarity index 100%
rename from mongodb-1.1.1/scripts/presets/standalone-24.json
rename to mongodb-1.1.2/scripts/presets/standalone-24.json
diff --git a/mongodb-1.1.1/scripts/presets/standalone-26.json b/mongodb-1.1.2/scripts/presets/standalone-26.json
similarity index 100%
rename from mongodb-1.1.1/scripts/presets/standalone-26.json
rename to mongodb-1.1.2/scripts/presets/standalone-26.json
diff --git a/mongodb-1.1.1/scripts/presets/standalone-30.json b/mongodb-1.1.2/scripts/presets/standalone-30.json
similarity index 100%
rename from mongodb-1.1.1/scripts/presets/standalone-30.json
rename to mongodb-1.1.2/scripts/presets/standalone-30.json
diff --git a/mongodb-1.1.1/scripts/presets/standalone-auth.json b/mongodb-1.1.2/scripts/presets/standalone-auth.json
similarity index 100%
rename from mongodb-1.1.1/scripts/presets/standalone-auth.json
rename to mongodb-1.1.2/scripts/presets/standalone-auth.json
diff --git a/mongodb-1.1.1/scripts/presets/standalone-plain.json b/mongodb-1.1.2/scripts/presets/standalone-plain.json
similarity index 100%
rename from mongodb-1.1.1/scripts/presets/standalone-plain.json
rename to mongodb-1.1.2/scripts/presets/standalone-plain.json
diff --git a/mongodb-1.1.1/scripts/presets/standalone-ssl.json b/mongodb-1.1.2/scripts/presets/standalone-ssl.json
similarity index 100%
rename from mongodb-1.1.1/scripts/presets/standalone-ssl.json
rename to mongodb-1.1.2/scripts/presets/standalone-ssl.json
diff --git a/mongodb-1.1.1/scripts/presets/standalone-x509.json b/mongodb-1.1.2/scripts/presets/standalone-x509.json
similarity index 100%
rename from mongodb-1.1.1/scripts/presets/standalone-x509.json
rename to mongodb-1.1.2/scripts/presets/standalone-x509.json
diff --git a/mongodb-1.1.1/scripts/presets/standalone.json b/mongodb-1.1.2/scripts/presets/standalone.json
similarity index 100%
rename from mongodb-1.1.1/scripts/presets/standalone.json
rename to mongodb-1.1.2/scripts/presets/standalone.json
diff --git a/mongodb-1.1.1/scripts/ssl/ca.pem b/mongodb-1.1.2/scripts/ssl/ca.pem
similarity index 100%
rename from mongodb-1.1.1/scripts/ssl/ca.pem
rename to mongodb-1.1.2/scripts/ssl/ca.pem
diff --git a/mongodb-1.1.1/scripts/ssl/client.pem b/mongodb-1.1.2/scripts/ssl/client.pem
similarity index 100%
rename from mongodb-1.1.1/scripts/ssl/client.pem
rename to mongodb-1.1.2/scripts/ssl/client.pem
diff --git a/mongodb-1.1.1/scripts/ssl/crl.pem b/mongodb-1.1.2/scripts/ssl/crl.pem
similarity index 100%
rename from mongodb-1.1.1/scripts/ssl/crl.pem
rename to mongodb-1.1.2/scripts/ssl/crl.pem
diff --git a/mongodb-1.1.1/scripts/ssl/server.pem b/mongodb-1.1.2/scripts/ssl/server.pem
similarity index 100%
rename from mongodb-1.1.1/scripts/ssl/server.pem
rename to mongodb-1.1.2/scripts/ssl/server.pem
diff --git a/mongodb-1.1.1/scripts/start-servers.php b/mongodb-1.1.2/scripts/start-servers.php
similarity index 100%
rename from mongodb-1.1.1/scripts/start-servers.php
rename to mongodb-1.1.2/scripts/start-servers.php
diff --git a/mongodb-1.1.1/scripts/ubuntu/essentials.sh b/mongodb-1.1.2/scripts/ubuntu/essentials.sh
similarity index 100%
rename from mongodb-1.1.1/scripts/ubuntu/essentials.sh
rename to mongodb-1.1.2/scripts/ubuntu/essentials.sh
diff --git a/mongodb-1.1.1/scripts/ubuntu/ldap/install.sh b/mongodb-1.1.2/scripts/ubuntu/ldap/install.sh
similarity index 100%
rename from mongodb-1.1.1/scripts/ubuntu/ldap/install.sh
rename to mongodb-1.1.2/scripts/ubuntu/ldap/install.sh
diff --git a/mongodb-1.1.1/scripts/ubuntu/ldap/saslauthd.conf b/mongodb-1.1.2/scripts/ubuntu/ldap/saslauthd.conf
similarity index 100%
rename from mongodb-1.1.1/scripts/ubuntu/ldap/saslauthd.conf
rename to mongodb-1.1.2/scripts/ubuntu/ldap/saslauthd.conf
diff --git a/mongodb-1.1.1/scripts/ubuntu/mongo-orchestration.sh b/mongodb-1.1.2/scripts/ubuntu/mongo-orchestration.sh
similarity index 100%
rename from mongodb-1.1.1/scripts/ubuntu/mongo-orchestration.sh
rename to mongodb-1.1.2/scripts/ubuntu/mongo-orchestration.sh
diff --git a/mongodb-1.1.1/scripts/ubuntu/phongo.sh b/mongodb-1.1.2/scripts/ubuntu/phongo.sh
similarity index 100%
rename from mongodb-1.1.1/scripts/ubuntu/phongo.sh
rename to mongodb-1.1.2/scripts/ubuntu/phongo.sh
diff --git a/mongodb-1.1.1/scripts/vmware/kernel.sh b/mongodb-1.1.2/scripts/vmware/kernel.sh
similarity index 100%
rename from mongodb-1.1.1/scripts/vmware/kernel.sh
rename to mongodb-1.1.2/scripts/vmware/kernel.sh
diff --git a/mongodb-1.1.1/src/BSON/Binary.c b/mongodb-1.1.2/src/BSON/Binary.c
similarity index 100%
rename from mongodb-1.1.1/src/BSON/Binary.c
rename to mongodb-1.1.2/src/BSON/Binary.c
diff --git a/mongodb-1.1.1/src/BSON/Javascript.c b/mongodb-1.1.2/src/BSON/Javascript.c
similarity index 97%
rename from mongodb-1.1.1/src/BSON/Javascript.c
rename to mongodb-1.1.2/src/BSON/Javascript.c
index 8942ee55..2e96dca8 100644
--- a/mongodb-1.1.1/src/BSON/Javascript.c
+++ b/mongodb-1.1.2/src/BSON/Javascript.c
@@ -1,214 +1,214 @@
/*
+---------------------------------------------------------------------------+
| PHP Driver for MongoDB |
+---------------------------------------------------------------------------+
| Copyright 2013-2015 MongoDB, Inc. |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); |
| you may not use this file except in compliance with the License. |
| You may obtain a copy of the License at |
| |
| http://www.apache.org/licenses/LICENSE-2.0 |
| |
| Unless required by applicable law or agreed to in writing, software |
| distributed under the License is distributed on an "AS IS" BASIS, |
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| See the License for the specific language governing permissions and |
| limitations under the License. |
+---------------------------------------------------------------------------+
| Copyright (c) 2014-2015 MongoDB, Inc. |
+---------------------------------------------------------------------------+
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
/* External libs */
#include <bson.h>
#include <mongoc.h>
/* PHP Core stuff */
#include <php.h>
#include <php_ini.h>
#include <ext/standard/info.h>
#include <Zend/zend_interfaces.h>
#include <ext/spl/spl_iterators.h>
/* Our Compatability header */
#include "phongo_compat.h"
/* Our stuffz */
#include "php_phongo.h"
#include "php_bson.h"
PHONGO_API zend_class_entry *php_phongo_javascript_ce;
zend_object_handlers php_phongo_handler_javascript;
/* {{{ proto BSON\Javascript Javascript::__construct(string $javascript[, array|object $document])
* The string is JavaScript code. The document is a mapping from identifiers to values, representing the scope in which the string should be evaluated
* NOTE: eJSON does not support this type :( */
PHP_METHOD(Javascript, __construct)
{
php_phongo_javascript_t *intern;
zend_error_handling error_handling;
char *javascript;
phongo_zpp_char_len javascript_len;
zval *document = NULL;
bson_t scope = BSON_INITIALIZER;
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling TSRMLS_CC);
intern = Z_JAVASCRIPT_OBJ_P(getThis());
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|A!", &javascript, &javascript_len, &document) == FAILURE) {
zend_restore_error_handling(&error_handling TSRMLS_CC);
return;
}
zend_restore_error_handling(&error_handling TSRMLS_CC);
if (document) {
- zval_to_bson(document, PHONGO_BSON_NONE, &scope, NULL TSRMLS_CC);
+ phongo_zval_to_bson(document, PHONGO_BSON_NONE, &scope, NULL TSRMLS_CC);
}
php_phongo_new_javascript_from_javascript_and_scope(0, getThis(), javascript, javascript_len, &scope TSRMLS_CC);
bson_destroy(&scope);
}
/* }}} */
/* {{{ BSON\Javascript */
ZEND_BEGIN_ARG_INFO_EX(ai_Javascript___construct, 0, 0, 1)
ZEND_ARG_INFO(0, javascript)
ZEND_ARG_INFO(0, scope)
ZEND_END_ARG_INFO();
static zend_function_entry php_phongo_javascript_me[] = {
PHP_ME(Javascript, __construct, ai_Javascript___construct, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(Manager, __wakeUp, NULL, ZEND_ACC_PUBLIC)
PHP_FE_END
};
/* }}} */
/* {{{ php_phongo_javascript_t object handlers */
static void php_phongo_javascript_free_object(phongo_free_object_arg *object TSRMLS_DC) /* {{{ */
{
php_phongo_javascript_t *intern = Z_OBJ_JAVASCRIPT(object);
zend_object_std_dtor(&intern->std TSRMLS_CC);
if (intern->javascript) {
efree(intern->javascript);
}
if (intern->document) {
bson_destroy(intern->document);
intern->document = NULL;
}
#if PHP_VERSION_ID < 70000
efree(intern);
#endif
} /* }}} */
phongo_create_object_retval php_phongo_javascript_create_object(zend_class_entry *class_type TSRMLS_DC) /* {{{ */
{
php_phongo_javascript_t *intern = NULL;
intern = PHONGO_ALLOC_OBJECT_T(php_phongo_javascript_t, class_type);
zend_object_std_init(&intern->std, class_type TSRMLS_CC);
object_properties_init(&intern->std, class_type);
intern->document = NULL;
#if PHP_VERSION_ID >= 70000
intern->std.handlers = &php_phongo_handler_javascript;
return &intern->std;
#else
{
zend_object_value retval;
retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t) zend_objects_destroy_object, php_phongo_javascript_free_object, NULL TSRMLS_CC);
retval.handlers = &php_phongo_handler_javascript;
return retval;
}
#endif
} /* }}} */
HashTable *php_phongo_javascript_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */
{
php_phongo_javascript_t *intern;
#if PHP_VERSION_ID >= 70000
zval retval;
#else
zval retval = zval_used_for_init;
#endif
*is_temp = 1;
intern = Z_JAVASCRIPT_OBJ_P(object);
array_init(&retval);
ADD_ASSOC_STRINGL(&retval, "javascript", intern->javascript, intern->javascript_len);
if (intern->document) {
php_phongo_bson_state state = PHONGO_BSON_STATE_INITIALIZER;
- if (bson_to_zval_ex(bson_get_data(intern->document), intern->document->len, &state)) {
+ if (phongo_bson_to_zval_ex(bson_get_data(intern->document), intern->document->len, &state)) {
#if PHP_VERSION_ID >= 70000
Z_ADDREF(state.zchild);
ADD_ASSOC_ZVAL_EX(&retval, "scope", &state.zchild);
#else
Z_ADDREF_P(state.zchild);
ADD_ASSOC_ZVAL_EX(&retval, "scope", state.zchild);
#endif
} else {
ADD_ASSOC_NULL_EX(&retval, "scope");
}
zval_ptr_dtor(&state.zchild);
}
return Z_ARRVAL(retval);
} /* }}} */
/* }}} */
/* {{{ PHP_MINIT_FUNCTION */
PHP_MINIT_FUNCTION(Javascript)
{
zend_class_entry ce;
(void)type;(void)module_number;
INIT_NS_CLASS_ENTRY(ce, BSON_NAMESPACE, "Javascript", php_phongo_javascript_me);
php_phongo_javascript_ce = zend_register_internal_class(&ce TSRMLS_CC);
php_phongo_javascript_ce->create_object = php_phongo_javascript_create_object;
PHONGO_CE_INIT(php_phongo_javascript_ce);
zend_class_implements(php_phongo_javascript_ce TSRMLS_CC, 1, php_phongo_type_ce);
memcpy(&php_phongo_handler_javascript, phongo_get_std_object_handlers(), sizeof(zend_object_handlers));
php_phongo_handler_javascript.get_debug_info = php_phongo_javascript_get_debug_info;
#if PHP_VERSION_ID >= 70000
php_phongo_handler_javascript.free_obj = php_phongo_javascript_free_object;
php_phongo_handler_javascript.offset = XtOffsetOf(php_phongo_javascript_t, std);
#endif
return SUCCESS;
}
/* }}} */
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/
diff --git a/mongodb-1.1.1/src/BSON/MaxKey.c b/mongodb-1.1.2/src/BSON/MaxKey.c
similarity index 100%
rename from mongodb-1.1.1/src/BSON/MaxKey.c
rename to mongodb-1.1.2/src/BSON/MaxKey.c
diff --git a/mongodb-1.1.1/src/BSON/MinKey.c b/mongodb-1.1.2/src/BSON/MinKey.c
similarity index 100%
rename from mongodb-1.1.1/src/BSON/MinKey.c
rename to mongodb-1.1.2/src/BSON/MinKey.c
diff --git a/mongodb-1.1.1/src/BSON/ObjectID.c b/mongodb-1.1.2/src/BSON/ObjectID.c
similarity index 100%
rename from mongodb-1.1.1/src/BSON/ObjectID.c
rename to mongodb-1.1.2/src/BSON/ObjectID.c
diff --git a/mongodb-1.1.1/src/BSON/Persistable.c b/mongodb-1.1.2/src/BSON/Persistable.c
similarity index 100%
rename from mongodb-1.1.1/src/BSON/Persistable.c
rename to mongodb-1.1.2/src/BSON/Persistable.c
diff --git a/mongodb-1.1.1/src/BSON/Regex.c b/mongodb-1.1.2/src/BSON/Regex.c
similarity index 100%
rename from mongodb-1.1.1/src/BSON/Regex.c
rename to mongodb-1.1.2/src/BSON/Regex.c
diff --git a/mongodb-1.1.1/src/BSON/Serializable.c b/mongodb-1.1.2/src/BSON/Serializable.c
similarity index 100%
rename from mongodb-1.1.1/src/BSON/Serializable.c
rename to mongodb-1.1.2/src/BSON/Serializable.c
diff --git a/mongodb-1.1.1/src/BSON/Timestamp.c b/mongodb-1.1.2/src/BSON/Timestamp.c
similarity index 100%
rename from mongodb-1.1.1/src/BSON/Timestamp.c
rename to mongodb-1.1.2/src/BSON/Timestamp.c
diff --git a/mongodb-1.1.1/src/BSON/Type.c b/mongodb-1.1.2/src/BSON/Type.c
similarity index 100%
rename from mongodb-1.1.1/src/BSON/Type.c
rename to mongodb-1.1.2/src/BSON/Type.c
diff --git a/mongodb-1.1.1/src/BSON/UTCDateTime.c b/mongodb-1.1.2/src/BSON/UTCDateTime.c
similarity index 100%
rename from mongodb-1.1.1/src/BSON/UTCDateTime.c
rename to mongodb-1.1.2/src/BSON/UTCDateTime.c
diff --git a/mongodb-1.1.1/src/BSON/Unserializable.c b/mongodb-1.1.2/src/BSON/Unserializable.c
similarity index 100%
rename from mongodb-1.1.1/src/BSON/Unserializable.c
rename to mongodb-1.1.2/src/BSON/Unserializable.c
diff --git a/mongodb-1.1.1/src/MongoDB/BulkWrite.c b/mongodb-1.1.2/src/MongoDB/BulkWrite.c
similarity index 97%
rename from mongodb-1.1.1/src/MongoDB/BulkWrite.c
rename to mongodb-1.1.2/src/MongoDB/BulkWrite.c
index b9b93cb5..268af5ec 100644
--- a/mongodb-1.1.1/src/MongoDB/BulkWrite.c
+++ b/mongodb-1.1.2/src/MongoDB/BulkWrite.c
@@ -1,399 +1,399 @@
/*
+---------------------------------------------------------------------------+
| PHP Driver for MongoDB |
+---------------------------------------------------------------------------+
| Copyright 2013-2015 MongoDB, Inc. |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); |
| you may not use this file except in compliance with the License. |
| You may obtain a copy of the License at |
| |
| http://www.apache.org/licenses/LICENSE-2.0 |
| |
| Unless required by applicable law or agreed to in writing, software |
| distributed under the License is distributed on an "AS IS" BASIS, |
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| See the License for the specific language governing permissions and |
| limitations under the License. |
+---------------------------------------------------------------------------+
| Copyright (c) 2014-2015 MongoDB, Inc. |
+---------------------------------------------------------------------------+
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
/* External libs */
#include <bson.h>
#include <mongoc.h>
/* We need to access the internal bulk structure to access the bulk op count */
#include <mongoc-bulk-operation-private.h>
/* PHP Core stuff */
#include <php.h>
#include <php_ini.h>
#include <ext/standard/info.h>
#include <Zend/zend_interfaces.h>
#include <ext/spl/spl_iterators.h>
/* PHP array helpers */
#include "php_array_api.h"
/* Our Compatability header */
#include "phongo_compat.h"
/* Our stuffz */
#include "php_phongo.h"
#include "php_bson.h"
PHONGO_API zend_class_entry *php_phongo_bulkwrite_ce;
zend_object_handlers php_phongo_handler_bulkwrite;
/* {{{ proto MongoDB\Driver\BulkWrite BulkWrite::__construct([array $options = array()])
Constructs a new BulkWrite */
PHP_METHOD(BulkWrite, __construct)
{
php_phongo_bulkwrite_t *intern;
zend_error_handling error_handling;
zval *options = NULL;
zend_bool ordered = 1;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value) SUPPRESS_UNUSED_WARNING(return_value_used)
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling TSRMLS_CC);
intern = Z_BULKWRITE_OBJ_P(getThis());
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!", &options) == FAILURE) {
zend_restore_error_handling(&error_handling TSRMLS_CC);
return;
}
zend_restore_error_handling(&error_handling TSRMLS_CC);
if (options && php_array_exists(options, "ordered")) {
ordered = php_array_fetch_bool(options, "ordered");
}
intern->bulk = phongo_bulkwrite_init(ordered);
if (options && php_array_exists(options, "bypassDocumentValidation")) {
mongoc_bulk_operation_set_bypass_document_validation(intern->bulk, php_array_fetch_bool(options, "bypassDocumentValidation"));
}
}
/* }}} */
/* {{{ proto mixed BulkWrite::insert(array|object $document)
Adds an insert operation to the bulk */
PHP_METHOD(BulkWrite, insert)
{
php_phongo_bulkwrite_t *intern;
zval *document;
bson_t *bson;
bson_t *bson_out = NULL;
int bson_flags = PHONGO_BSON_ADD_ID;
DECLARE_RETURN_VALUE_USED
SUPPRESS_UNUSED_WARNING(return_value_ptr)
intern = Z_BULKWRITE_OBJ_P(getThis());
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "A", &document) == FAILURE) {
return;
}
if (return_value_used) {
bson_flags |= PHONGO_BSON_RETURN_ID;
}
bson_flags |= PHONGO_BSON_ADD_ODS|PHONGO_BSON_ADD_CHILD_ODS;
bson = bson_new();
- zval_to_bson(document, bson_flags, bson, &bson_out TSRMLS_CC);
+ phongo_zval_to_bson(document, bson_flags, bson, &bson_out TSRMLS_CC);
mongoc_bulk_operation_insert(intern->bulk, bson);
bson_clear(&bson);
if (bson_out && return_value_used) {
bson_iter_t iter;
if (bson_iter_init_find(&iter, bson_out, "_id")) {
php_phongo_objectid_new_from_oid(return_value, bson_iter_oid(&iter) TSRMLS_CC);
bson_clear(&bson_out);
return;
}
bson_clear(&bson_out);
}
}
/* }}} */
/* {{{ proto void BulkWrite::update(array|object $query, array|object $newObj[, array $updateOptions = array()])
Adds an update operation to bulk */
PHP_METHOD(BulkWrite, update)
{
php_phongo_bulkwrite_t *intern;
zval *query;
zval *newObj;
zval *updateOptions = NULL;
mongoc_update_flags_t flags = MONGOC_UPDATE_NONE;
bson_t *bquery;
bson_t *bupdate;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_BULKWRITE_OBJ_P(getThis());
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "AA|a!", &query, &newObj, &updateOptions) == FAILURE) {
return;
}
bquery = bson_new();
bupdate = bson_new();
- zval_to_bson(query, PHONGO_BSON_NONE, bquery, NULL TSRMLS_CC);
- zval_to_bson(newObj, PHONGO_BSON_NONE, bupdate, NULL TSRMLS_CC);
+ phongo_zval_to_bson(query, PHONGO_BSON_NONE, bquery, NULL TSRMLS_CC);
+ phongo_zval_to_bson(newObj, PHONGO_BSON_NONE, bupdate, NULL TSRMLS_CC);
if (updateOptions) {
flags |= php_array_fetch_bool(updateOptions, "multi") ? MONGOC_UPDATE_MULTI_UPDATE : 0;
flags |= php_array_fetch_bool(updateOptions, "upsert") ? MONGOC_UPDATE_UPSERT : 0;
}
if (flags & MONGOC_UPDATE_MULTI_UPDATE) {
mongoc_bulk_operation_update(intern->bulk, bquery, bupdate, !!(flags & MONGOC_UPDATE_UPSERT));
} else {
bson_iter_t iter;
zend_bool replaced = 0;
if (bson_iter_init(&iter, bupdate)) {
while (bson_iter_next (&iter)) {
if (!strchr (bson_iter_key (&iter), '$')) {
mongoc_bulk_operation_replace_one(intern->bulk, bquery, bupdate, !!(flags & MONGOC_UPDATE_UPSERT));
replaced = 1;
break;
}
}
}
if (!replaced) {
mongoc_bulk_operation_update_one(intern->bulk, bquery, bupdate, !!(flags & MONGOC_UPDATE_UPSERT));
}
}
bson_clear(&bquery);
bson_clear(&bupdate);
}
/* }}} */
/* {{{ proto void BulkWrite::delete(array|object $query[, array $deleteOptions = array()])
Adds a delete operation to the bulk */
PHP_METHOD(BulkWrite, delete)
{
php_phongo_bulkwrite_t *intern;
zval *query;
zval *deleteOptions = NULL;
bson_t *bson;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_BULKWRITE_OBJ_P(getThis());
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "A|a!", &query, &deleteOptions) == FAILURE) {
return;
}
bson = bson_new();
- zval_to_bson(query, PHONGO_BSON_NONE, bson, NULL TSRMLS_CC);
+ phongo_zval_to_bson(query, PHONGO_BSON_NONE, bson, NULL TSRMLS_CC);
if (deleteOptions && php_array_fetch_bool(deleteOptions, "limit")) {
mongoc_bulk_operation_remove_one(intern->bulk, bson);
} else {
mongoc_bulk_operation_remove(intern->bulk, bson);
}
bson_clear(&bson);
}
/* }}} */
/* {{{ proto integer BulkWrite::count()
Returns the number of operations that have been added to the bulk */
PHP_METHOD(BulkWrite, count)
{
php_phongo_bulkwrite_t *intern;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_BULKWRITE_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
RETURN_LONG(intern->bulk->commands.len);
}
/* }}} */
/* {{{ MongoDB\Driver\BulkWrite */
ZEND_BEGIN_ARG_INFO_EX(ai_BulkWrite___construct, 0, 0, 0)
ZEND_ARG_ARRAY_INFO(0, options, 1)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_BulkWrite_insert, 0, 0, 1)
ZEND_ARG_INFO(0, document)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_BulkWrite_update, 0, 0, 2)
ZEND_ARG_INFO(0, query)
ZEND_ARG_INFO(0, newObj)
ZEND_ARG_ARRAY_INFO(0, updateOptions, 1)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_BulkWrite_delete, 0, 0, 1)
ZEND_ARG_INFO(0, query)
ZEND_ARG_ARRAY_INFO(0, deleteOptions, 1)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_BulkWrite_count, 0, 0, 0)
ZEND_END_ARG_INFO();
static zend_function_entry php_phongo_bulkwrite_me[] = {
PHP_ME(BulkWrite, __construct, ai_BulkWrite___construct, ZEND_ACC_PUBLIC)
PHP_ME(BulkWrite, insert, ai_BulkWrite_insert, ZEND_ACC_PUBLIC)
PHP_ME(BulkWrite, update, ai_BulkWrite_update, ZEND_ACC_PUBLIC)
PHP_ME(BulkWrite, delete, ai_BulkWrite_delete, ZEND_ACC_PUBLIC)
PHP_ME(BulkWrite, count, ai_BulkWrite_count, ZEND_ACC_PUBLIC)
PHP_ME(Manager, __wakeUp, NULL, ZEND_ACC_PUBLIC)
PHP_FE_END
};
/* }}} */
/* {{{ php_phongo_bulkwrite_t object handlers */
static void php_phongo_bulkwrite_free_object(phongo_free_object_arg *object TSRMLS_DC) /* {{{ */
{
php_phongo_bulkwrite_t *intern = Z_OBJ_BULKWRITE(object);
zend_object_std_dtor(&intern->std TSRMLS_CC);
if (intern->bulk) {
mongoc_bulk_operation_destroy(intern->bulk);
}
#if PHP_VERSION_ID < 70000
efree(intern);
#endif
} /* }}} */
phongo_create_object_retval php_phongo_bulkwrite_create_object(zend_class_entry *class_type TSRMLS_DC) /* {{{ */
{
php_phongo_bulkwrite_t *intern = NULL;
intern = PHONGO_ALLOC_OBJECT_T(php_phongo_bulkwrite_t, class_type);
zend_object_std_init(&intern->std, class_type TSRMLS_CC);
object_properties_init(&intern->std, class_type);
#if PHP_VERSION_ID >= 70000
intern->std.handlers = &php_phongo_handler_bulkwrite;
return &intern->std;
#else
{
zend_object_value retval;
retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t) zend_objects_destroy_object, php_phongo_bulkwrite_free_object, NULL TSRMLS_CC);
retval.handlers = &php_phongo_handler_bulkwrite;
return retval;
}
#endif
} /* }}} */
HashTable *php_phongo_bulkwrite_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval retval;
#else
zval retval = zval_used_for_init;
#endif
php_phongo_bulkwrite_t *intern = NULL;
*is_temp = 1;
intern = Z_BULKWRITE_OBJ_P(object);
array_init(&retval);
if (intern->bulk->database) {
ADD_ASSOC_STRING(&retval, "database", intern->bulk->database);
} else {
ADD_ASSOC_NULL_EX(&retval, "database");
}
if (intern->bulk->collection) {
ADD_ASSOC_STRING(&retval, "collection", intern->bulk->collection);
} else {
ADD_ASSOC_NULL_EX(&retval, "collection");
}
ADD_ASSOC_BOOL_EX(&retval, "ordered", intern->bulk->flags.ordered);
ADD_ASSOC_BOOL_EX(&retval, "executed", intern->bulk->executed);
ADD_ASSOC_LONG_EX(&retval, "server_id", intern->bulk->hint);
if (intern->bulk->write_concern) {
#if PHP_VERSION_ID >= 70000
zval write_concern;
php_phongo_write_concern_to_zval(&write_concern, intern->bulk->write_concern);
ADD_ASSOC_ZVAL_EX(&retval, "write_concern", &write_concern);
#else
zval *write_concern = NULL;
MAKE_STD_ZVAL(write_concern);
php_phongo_write_concern_to_zval(write_concern, intern->bulk->write_concern);
ADD_ASSOC_ZVAL_EX(&retval, "write_concern", write_concern);
#endif
} else {
ADD_ASSOC_NULL_EX(&retval, "write_concern");
}
return Z_ARRVAL(retval);
} /* }}} */
/* }}} */
/* {{{ PHP_MINIT_FUNCTION */
PHP_MINIT_FUNCTION(BulkWrite)
{
zend_class_entry ce;
(void)type;(void)module_number;
INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "BulkWrite", php_phongo_bulkwrite_me);
php_phongo_bulkwrite_ce = zend_register_internal_class(&ce TSRMLS_CC);
php_phongo_bulkwrite_ce->create_object = php_phongo_bulkwrite_create_object;
PHONGO_CE_INIT(php_phongo_bulkwrite_ce);
memcpy(&php_phongo_handler_bulkwrite, phongo_get_std_object_handlers(), sizeof(zend_object_handlers));
php_phongo_handler_bulkwrite.get_debug_info = php_phongo_bulkwrite_get_debug_info;
#if PHP_VERSION_ID >= 70000
php_phongo_handler_bulkwrite.free_obj = php_phongo_bulkwrite_free_object;
php_phongo_handler_bulkwrite.offset = XtOffsetOf(php_phongo_bulkwrite_t, std);
#endif
zend_class_implements(php_phongo_bulkwrite_ce TSRMLS_CC, 1, spl_ce_Countable);
return SUCCESS;
}
/* }}} */
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/
diff --git a/mongodb-1.1.1/src/MongoDB/Command.c b/mongodb-1.1.2/src/MongoDB/Command.c
similarity index 97%
rename from mongodb-1.1.1/src/MongoDB/Command.c
rename to mongodb-1.1.2/src/MongoDB/Command.c
index 3ad356a2..56f11dcd 100644
--- a/mongodb-1.1.1/src/MongoDB/Command.c
+++ b/mongodb-1.1.2/src/MongoDB/Command.c
@@ -1,203 +1,203 @@
/*
+---------------------------------------------------------------------------+
| PHP Driver for MongoDB |
+---------------------------------------------------------------------------+
| Copyright 2013-2015 MongoDB, Inc. |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); |
| you may not use this file except in compliance with the License. |
| You may obtain a copy of the License at |
| |
| http://www.apache.org/licenses/LICENSE-2.0 |
| |
| Unless required by applicable law or agreed to in writing, software |
| distributed under the License is distributed on an "AS IS" BASIS, |
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| See the License for the specific language governing permissions and |
| limitations under the License. |
+---------------------------------------------------------------------------+
| Copyright (c) 2014-2015 MongoDB, Inc. |
+---------------------------------------------------------------------------+
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
/* External libs */
#include <bson.h>
#include <mongoc.h>
/* PHP Core stuff */
#include <php.h>
#include <php_ini.h>
#include <ext/standard/info.h>
#include <Zend/zend_interfaces.h>
#include <ext/spl/spl_iterators.h>
/* Our Compatability header */
#include "phongo_compat.h"
/* Our stuffz */
#include "php_phongo.h"
#include "php_bson.h"
PHONGO_API zend_class_entry *php_phongo_command_ce;
zend_object_handlers php_phongo_handler_command;
/* {{{ proto MongoDB\Driver\Command Command::__construct(array|object $document)
Constructs a new Command */
PHP_METHOD(Command, __construct)
{
php_phongo_command_t *intern;
zend_error_handling error_handling;
zval *document;
bson_t *bson = bson_new();
SUPPRESS_UNUSED_WARNING(return_value) SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling TSRMLS_CC);
intern = Z_COMMAND_OBJ_P(getThis());
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "A", &document) == FAILURE) {
zend_restore_error_handling(&error_handling TSRMLS_CC);
return;
}
zend_restore_error_handling(&error_handling TSRMLS_CC);
- zval_to_bson(document, PHONGO_BSON_NONE, bson, NULL TSRMLS_CC);
+ phongo_zval_to_bson(document, PHONGO_BSON_NONE, bson, NULL TSRMLS_CC);
intern->bson = bson;
}
/* }}} */
/**
* Value object for a database command document.
*/
/* {{{ MongoDB\Driver\Command */
ZEND_BEGIN_ARG_INFO_EX(ai_Command___construct, 0, 0, 1)
ZEND_ARG_INFO(0, document)
ZEND_END_ARG_INFO();
static zend_function_entry php_phongo_command_me[] = {
PHP_ME(Command, __construct, ai_Command___construct, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(Manager, __wakeUp, NULL, ZEND_ACC_PUBLIC)
PHP_FE_END
};
/* }}} */
/* {{{ php_phongo_command_t object handlers */
static void php_phongo_command_free_object(phongo_free_object_arg *object TSRMLS_DC) /* {{{ */
{
php_phongo_command_t *intern = Z_OBJ_COMMAND(object);
zend_object_std_dtor(&intern->std TSRMLS_CC);
if (intern->bson) {
bson_clear(&intern->bson);
}
#if PHP_VERSION_ID < 70000
efree(intern);
#endif
} /* }}} */
phongo_create_object_retval php_phongo_command_create_object(zend_class_entry *class_type TSRMLS_DC) /* {{{ */
{
php_phongo_command_t *intern = NULL;
intern = PHONGO_ALLOC_OBJECT_T(php_phongo_command_t, class_type);
zend_object_std_init(&intern->std, class_type TSRMLS_CC);
object_properties_init(&intern->std, class_type);
#if PHP_VERSION_ID >= 70000
intern->std.handlers = &php_phongo_handler_command;
return &intern->std;
#else
{
zend_object_value retval;
retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t) zend_objects_destroy_object, php_phongo_command_free_object, NULL TSRMLS_CC);
retval.handlers = &php_phongo_handler_command;
return retval;
}
#endif
} /* }}} */
HashTable *php_phongo_command_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */
{
php_phongo_command_t *intern;
#if PHP_VERSION_ID >= 70000
zval retval;
#else
zval retval = zval_used_for_init;
#endif
*is_temp = 1;
intern = Z_COMMAND_OBJ_P(object);
array_init_size(&retval, 1);
if (intern->bson) {
#if PHP_VERSION_ID >= 70000
zval zv;
#else
zval *zv;
#endif
- bson_to_zval(bson_get_data(intern->bson), intern->bson->len, &zv);
+ phongo_bson_to_zval(bson_get_data(intern->bson), intern->bson->len, &zv);
#if PHP_VERSION_ID >= 70000
ADD_ASSOC_ZVAL_EX(&retval, "command", &zv);
#else
ADD_ASSOC_ZVAL_EX(&retval, "command", zv);
#endif
} else {
ADD_ASSOC_NULL_EX(&retval, "command");
}
return Z_ARRVAL(retval);
} /* }}} */
/* }}} */
/* {{{ PHP_MINIT_FUNCTION */
PHP_MINIT_FUNCTION(Command)
{
zend_class_entry ce;
(void)type;(void)module_number;
INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "Command", php_phongo_command_me);
php_phongo_command_ce = zend_register_internal_class(&ce TSRMLS_CC);
php_phongo_command_ce->create_object = php_phongo_command_create_object;
PHONGO_CE_INIT(php_phongo_command_ce);
memcpy(&php_phongo_handler_command, phongo_get_std_object_handlers(), sizeof(zend_object_handlers));
php_phongo_handler_command.get_debug_info = php_phongo_command_get_debug_info;
#if PHP_VERSION_ID >= 70000
php_phongo_handler_command.free_obj = php_phongo_command_free_object;
php_phongo_handler_command.offset = XtOffsetOf(php_phongo_command_t, std);
#endif
return SUCCESS;
}
/* }}} */
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/
diff --git a/mongodb-1.1.1/src/MongoDB/Cursor.c b/mongodb-1.1.2/src/MongoDB/Cursor.c
similarity index 99%
rename from mongodb-1.1.1/src/MongoDB/Cursor.c
rename to mongodb-1.1.2/src/MongoDB/Cursor.c
index 1d540944..a6448a34 100644
--- a/mongodb-1.1.1/src/MongoDB/Cursor.c
+++ b/mongodb-1.1.2/src/MongoDB/Cursor.c
@@ -1,328 +1,328 @@
/*
+---------------------------------------------------------------------------+
| PHP Driver for MongoDB |
+---------------------------------------------------------------------------+
| Copyright 2013-2015 MongoDB, Inc. |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); |
| you may not use this file except in compliance with the License. |
| You may obtain a copy of the License at |
| |
| http://www.apache.org/licenses/LICENSE-2.0 |
| |
| Unless required by applicable law or agreed to in writing, software |
| distributed under the License is distributed on an "AS IS" BASIS, |
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| See the License for the specific language governing permissions and |
| limitations under the License. |
+---------------------------------------------------------------------------+
| Copyright (c) 2014-2015 MongoDB, Inc. |
+---------------------------------------------------------------------------+
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
/* External libs */
#include <bson.h>
#include <mongoc.h>
#include <mongoc-cursor-private.h>
#include <mongoc-bulk-operation-private.h>
/* PHP Core stuff */
#include <php.h>
#include <php_ini.h>
#include <ext/standard/info.h>
#include <Zend/zend_interfaces.h>
#include <ext/spl/spl_iterators.h>
/* Our Compatability header */
#include "phongo_compat.h"
/* Our stuffz */
#include "php_phongo.h"
#include "php_bson.h"
PHONGO_API zend_class_entry *php_phongo_cursor_ce;
zend_object_handlers php_phongo_handler_cursor;
/* {{{ proto void Cursor::setTypeMap(array $typemap)
Sets a type map to use for BSON unserialization */
PHP_METHOD(Cursor, setTypeMap)
{
php_phongo_cursor_t *intern;
php_phongo_bson_state state = PHONGO_BSON_STATE_INITIALIZER;
zval *typemap = NULL;
SUPPRESS_UNUSED_WARNING(return_value) SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_CURSOR_OBJ_P(getThis());
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a!", &typemap) == FAILURE) {
return;
}
- php_phongo_bson_typemap_to_state(typemap, &state.map TSRMLS_CC);
+ phongo_bson_typemap_to_state(typemap, &state.map TSRMLS_CC);
intern->visitor_data = state;
}
/* }}} */
static int php_phongo_cursor_to_array_apply(zend_object_iterator *iter, void *puser TSRMLS_DC) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *data;
zval *return_value = (zval*)puser;
data = iter->funcs->get_current_data(iter TSRMLS_CC);
if (EG(exception)) {
return ZEND_HASH_APPLY_STOP;
}
if (Z_ISUNDEF_P(data)) {
return ZEND_HASH_APPLY_STOP;
}
Z_TRY_ADDREF_P(data);
add_next_index_zval(return_value, data);
#else
zval **data;
zval *return_value = (zval*)puser;
iter->funcs->get_current_data(iter, &data TSRMLS_CC);
if (EG(exception)) {
return ZEND_HASH_APPLY_STOP;
}
if (data == NULL || *data == NULL) {
return ZEND_HASH_APPLY_STOP;
}
Z_ADDREF_PP(data);
add_next_index_zval(return_value, *data);
#endif
return ZEND_HASH_APPLY_KEEP;
}
/* }}} */
/* {{{ proto array Cursor::toArray()
Returns an array of all result documents for this cursor */
PHP_METHOD(Cursor, toArray)
{
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
if (zend_parse_parameters_none() == FAILURE) {
return;
}
array_init(return_value);
if (spl_iterator_apply(getThis(), php_phongo_cursor_to_array_apply, (void*)return_value TSRMLS_CC) != SUCCESS) {
zval_dtor(return_value);
RETURN_NULL();
}
}
/* }}} */
/* {{{ proto MongoDB\Driver\CursorId Cursor::getId()
Returns the CursorId for this cursor */
PHP_METHOD(Cursor, getId)
{
php_phongo_cursor_t *intern;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_CURSOR_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
php_phongo_cursor_id_new_from_id(return_value, mongoc_cursor_get_id(intern->cursor) TSRMLS_CC);
}
/* }}} */
/* {{{ proto MongoDB\Driver\Server Cursor::getServer()
Returns the Server object to which this cursor is attached */
PHP_METHOD(Cursor, getServer)
{
php_phongo_cursor_t *intern;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_CURSOR_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
phongo_server_init(return_value, intern->cursor->client, intern->server_id TSRMLS_CC);
}
/* }}} */
/* {{{ proto boolean Cursor::isDead()
Checks if a cursor is still alive */
PHP_METHOD(Cursor, isDead)
{
php_phongo_cursor_t *intern;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_CURSOR_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
RETURN_BOOL(!mongoc_cursor_is_alive(intern->cursor));
}
/* }}} */
/* {{{ MongoDB\Driver\Cursor */
ZEND_BEGIN_ARG_INFO_EX(ai_Cursor_setTypeMap, 0, 0, 1)
ZEND_ARG_ARRAY_INFO(0, typemap, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_Cursor_toArray, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_Cursor_getId, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_Cursor_getServer, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_Cursor_isDead, 0, 0, 0)
ZEND_END_ARG_INFO();
static zend_function_entry php_phongo_cursor_me[] = {
PHP_ME(Server, __construct, NULL, ZEND_ACC_FINAL|ZEND_ACC_PRIVATE)
PHP_ME(Cursor, setTypeMap, ai_Cursor_setTypeMap, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(Cursor, toArray, ai_Cursor_toArray, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(Cursor, getId, ai_Cursor_getId, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(Cursor, getServer, ai_Cursor_getServer, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(Cursor, isDead, ai_Cursor_isDead, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(Manager, __wakeUp, NULL, ZEND_ACC_PUBLIC)
PHP_FE_END
};
/* }}} */
/* {{{ php_phongo_cursor_t object handlers */
static void php_phongo_cursor_free_object(phongo_free_object_arg *object TSRMLS_DC) /* {{{ */
{
php_phongo_cursor_t *intern = Z_OBJ_CURSOR(object);
zend_object_std_dtor(&intern->std TSRMLS_CC);
php_phongo_cursor_free(intern);
#if PHP_VERSION_ID < 70000
efree(intern);
#endif
} /* }}} */
phongo_create_object_retval php_phongo_cursor_create_object(zend_class_entry *class_type TSRMLS_DC) /* {{{ */
{
php_phongo_cursor_t *intern = NULL;
intern = PHONGO_ALLOC_OBJECT_T(php_phongo_cursor_t, class_type);
zend_object_std_init(&intern->std, class_type TSRMLS_CC);
object_properties_init(&intern->std, class_type);
#if PHP_VERSION_ID >= 70000
intern->std.handlers = &php_phongo_handler_cursor;
return &intern->std;
#else
{
zend_object_value retval;
retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t) zend_objects_destroy_object, php_phongo_cursor_free_object, NULL TSRMLS_CC);
retval.handlers = &php_phongo_handler_cursor;
return retval;
}
#endif
} /* }}} */
HashTable *php_phongo_cursor_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */
{
php_phongo_cursor_t *intern;
#if PHP_VERSION_ID >= 70000
zval retval;
#else
zval retval = zval_used_for_init;
#endif
*is_temp = 1;
intern = Z_CURSOR_OBJ_P(object);
array_init_size(&retval, 2);
if (intern->cursor) {
#if PHP_VERSION_ID >= 70000
zval zcursor;
php_phongo_cursor_to_zval(&zcursor, intern->cursor);
ADD_ASSOC_ZVAL_EX(&retval, "cursor", &zcursor);
#else
zval *zcursor = NULL;
MAKE_STD_ZVAL(zcursor);
php_phongo_cursor_to_zval(zcursor, intern->cursor);
ADD_ASSOC_ZVAL_EX(&retval, "cursor", zcursor);
#endif
} else {
ADD_ASSOC_NULL_EX(&retval, "cursor");
}
ADD_ASSOC_LONG_EX(&retval, "server_id", intern->server_id);
return Z_ARRVAL(retval);
} /* }}} */
/* }}} */
/* {{{ PHP_MINIT_FUNCTION */
PHP_MINIT_FUNCTION(Cursor)
{
zend_class_entry ce;
(void)type;(void)module_number;
INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "Cursor", php_phongo_cursor_me);
php_phongo_cursor_ce = zend_register_internal_class(&ce TSRMLS_CC);
php_phongo_cursor_ce->create_object = php_phongo_cursor_create_object;
PHONGO_CE_INIT(php_phongo_cursor_ce);
php_phongo_cursor_ce->get_iterator = php_phongo_cursor_get_iterator;
memcpy(&php_phongo_handler_cursor, phongo_get_std_object_handlers(), sizeof(zend_object_handlers));
php_phongo_handler_cursor.get_debug_info = php_phongo_cursor_get_debug_info;
#if PHP_VERSION_ID >= 70000
php_phongo_handler_cursor.free_obj = php_phongo_cursor_free_object;
php_phongo_handler_cursor.offset = XtOffsetOf(php_phongo_cursor_t, std);
#endif
zend_class_implements(php_phongo_cursor_ce TSRMLS_CC, 1, zend_ce_traversable);
return SUCCESS;
}
/* }}} */
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/
diff --git a/mongodb-1.1.1/src/MongoDB/CursorId.c b/mongodb-1.1.2/src/MongoDB/CursorId.c
similarity index 100%
rename from mongodb-1.1.1/src/MongoDB/CursorId.c
rename to mongodb-1.1.2/src/MongoDB/CursorId.c
diff --git a/mongodb-1.1.1/src/MongoDB/Exception/AuthenticationException.c b/mongodb-1.1.2/src/MongoDB/Exception/AuthenticationException.c
similarity index 100%
rename from mongodb-1.1.1/src/MongoDB/Exception/AuthenticationException.c
rename to mongodb-1.1.2/src/MongoDB/Exception/AuthenticationException.c
diff --git a/mongodb-1.1.1/src/MongoDB/Exception/BulkWriteException.c b/mongodb-1.1.2/src/MongoDB/Exception/BulkWriteException.c
similarity index 100%
rename from mongodb-1.1.1/src/MongoDB/Exception/BulkWriteException.c
rename to mongodb-1.1.2/src/MongoDB/Exception/BulkWriteException.c
diff --git a/mongodb-1.1.1/src/MongoDB/Exception/ConnectionException.c b/mongodb-1.1.2/src/MongoDB/Exception/ConnectionException.c
similarity index 100%
rename from mongodb-1.1.1/src/MongoDB/Exception/ConnectionException.c
rename to mongodb-1.1.2/src/MongoDB/Exception/ConnectionException.c
diff --git a/mongodb-1.1.1/src/MongoDB/Exception/ConnectionTimeoutException.c b/mongodb-1.1.2/src/MongoDB/Exception/ConnectionTimeoutException.c
similarity index 100%
rename from mongodb-1.1.1/src/MongoDB/Exception/ConnectionTimeoutException.c
rename to mongodb-1.1.2/src/MongoDB/Exception/ConnectionTimeoutException.c
diff --git a/mongodb-1.1.1/src/MongoDB/Exception/Exception.c b/mongodb-1.1.2/src/MongoDB/Exception/Exception.c
similarity index 100%
rename from mongodb-1.1.1/src/MongoDB/Exception/Exception.c
rename to mongodb-1.1.2/src/MongoDB/Exception/Exception.c
diff --git a/mongodb-1.1.1/src/MongoDB/Exception/ExecutionTimeoutException.c b/mongodb-1.1.2/src/MongoDB/Exception/ExecutionTimeoutException.c
similarity index 100%
rename from mongodb-1.1.1/src/MongoDB/Exception/ExecutionTimeoutException.c
rename to mongodb-1.1.2/src/MongoDB/Exception/ExecutionTimeoutException.c
diff --git a/mongodb-1.1.1/src/MongoDB/Exception/InvalidArgumentException.c b/mongodb-1.1.2/src/MongoDB/Exception/InvalidArgumentException.c
similarity index 100%
rename from mongodb-1.1.1/src/MongoDB/Exception/InvalidArgumentException.c
rename to mongodb-1.1.2/src/MongoDB/Exception/InvalidArgumentException.c
diff --git a/mongodb-1.1.1/src/MongoDB/Exception/LogicException.c b/mongodb-1.1.2/src/MongoDB/Exception/LogicException.c
similarity index 100%
rename from mongodb-1.1.1/src/MongoDB/Exception/LogicException.c
rename to mongodb-1.1.2/src/MongoDB/Exception/LogicException.c
diff --git a/mongodb-1.1.1/src/MongoDB/Exception/RuntimeException.c b/mongodb-1.1.2/src/MongoDB/Exception/RuntimeException.c
similarity index 100%
rename from mongodb-1.1.1/src/MongoDB/Exception/RuntimeException.c
rename to mongodb-1.1.2/src/MongoDB/Exception/RuntimeException.c
diff --git a/mongodb-1.1.1/src/MongoDB/Exception/SSLConnectionException.c b/mongodb-1.1.2/src/MongoDB/Exception/SSLConnectionException.c
similarity index 100%
rename from mongodb-1.1.1/src/MongoDB/Exception/SSLConnectionException.c
rename to mongodb-1.1.2/src/MongoDB/Exception/SSLConnectionException.c
diff --git a/mongodb-1.1.1/src/MongoDB/Exception/UnexpectedValueException.c b/mongodb-1.1.2/src/MongoDB/Exception/UnexpectedValueException.c
similarity index 100%
rename from mongodb-1.1.1/src/MongoDB/Exception/UnexpectedValueException.c
rename to mongodb-1.1.2/src/MongoDB/Exception/UnexpectedValueException.c
diff --git a/mongodb-1.1.1/src/MongoDB/Exception/WriteException.c b/mongodb-1.1.2/src/MongoDB/Exception/WriteException.c
similarity index 100%
rename from mongodb-1.1.1/src/MongoDB/Exception/WriteException.c
rename to mongodb-1.1.2/src/MongoDB/Exception/WriteException.c
diff --git a/mongodb-1.1.1/src/MongoDB/Manager.c b/mongodb-1.1.2/src/MongoDB/Manager.c
similarity index 99%
rename from mongodb-1.1.1/src/MongoDB/Manager.c
rename to mongodb-1.1.2/src/MongoDB/Manager.c
index c2763746..c2a1367f 100644
--- a/mongodb-1.1.1/src/MongoDB/Manager.c
+++ b/mongodb-1.1.2/src/MongoDB/Manager.c
@@ -1,508 +1,508 @@
/*
+---------------------------------------------------------------------------+
| PHP Driver for MongoDB |
+---------------------------------------------------------------------------+
| Copyright 2013-2015 MongoDB, Inc. |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); |
| you may not use this file except in compliance with the License. |
| You may obtain a copy of the License at |
| |
| http://www.apache.org/licenses/LICENSE-2.0 |
| |
| Unless required by applicable law or agreed to in writing, software |
| distributed under the License is distributed on an "AS IS" BASIS, |
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| See the License for the specific language governing permissions and |
| limitations under the License. |
+---------------------------------------------------------------------------+
| Copyright (c) 2014-2015 MongoDB, Inc. |
+---------------------------------------------------------------------------+
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
/* External libs */
#include <bson.h>
#include <mongoc.h>
#include <mongoc-client-private.h>
#include <mongoc-host-list-private.h>
#include <mongoc-server-description-private.h>
/* PHP Core stuff */
#include <php.h>
#include <php_ini.h>
#include <ext/standard/info.h>
#include <ext/standard/file.h>
#include <Zend/zend_interfaces.h>
#include <Zend/zend_hash.h>
#include <ext/spl/spl_iterators.h>
/* PHP array helpers */
#include "php_array_api.h"
/* Our Compatability header */
#include "phongo_compat.h"
/* Our stuffz */
#include "php_phongo.h"
#include "php_bson.h"
#define PHONGO_MANAGER_URI_DEFAULT "mongodb://localhost:27017/"
PHONGO_API zend_class_entry *php_phongo_manager_ce;
zend_object_handlers php_phongo_handler_manager;
/* {{{ proto MongoDB\Driver\Manager Manager::__construct([string $uri = "mongodb://localhost:27017/"[, array $options = array()[, array $driverOptions = array()]]])
Constructs a new Manager */
PHP_METHOD(Manager, __construct)
{
php_phongo_manager_t *intern;
zend_error_handling error_handling;
char *uri_string = NULL;
phongo_zpp_char_len uri_string_len = 0;
zval *options = NULL;
bson_t bson_options = BSON_INITIALIZER;
zval *driverOptions = NULL;
SUPPRESS_UNUSED_WARNING(return_value) SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling TSRMLS_CC);
intern = Z_MANAGER_OBJ_P(getThis());
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s!a!a!", &uri_string, &uri_string_len, &options, &driverOptions) == FAILURE) {
zend_restore_error_handling(&error_handling TSRMLS_CC);
return;
}
zend_restore_error_handling(&error_handling TSRMLS_CC);
if (options) {
- zval_to_bson(options, PHONGO_BSON_NONE, &bson_options, NULL TSRMLS_CC);
+ phongo_zval_to_bson(options, PHONGO_BSON_NONE, &bson_options, NULL TSRMLS_CC);
}
phongo_manager_init(intern, uri_string, &bson_options, driverOptions TSRMLS_CC);
bson_destroy(&bson_options);
}
/* }}} */
/* {{{ proto MongoDB\Driver\Cursor Manager::executeCommand(string $db, MongoDB\Driver\Command $command[, MongoDB\Driver\ReadPreference $readPreference = null])
Execute a command */
PHP_METHOD(Manager, executeCommand)
{
php_phongo_manager_t *intern;
char *db;
phongo_zpp_char_len db_len;
zval *command;
zval *readPreference = NULL;
php_phongo_command_t *cmd;
DECLARE_RETURN_VALUE_USED
SUPPRESS_UNUSED_WARNING(return_value_ptr)
intern = Z_MANAGER_OBJ_P(getThis());
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sO|O!", &db, &db_len, &command, php_phongo_command_ce, &readPreference, php_phongo_readpreference_ce) == FAILURE) {
return;
}
cmd = Z_COMMAND_OBJ_P(command);
phongo_execute_command(intern->client, db, cmd->bson, phongo_read_preference_from_zval(readPreference TSRMLS_CC), -1, return_value, return_value_used TSRMLS_CC);
}
/* }}} */
/* {{{ proto MongoDB\Driver\Cursor Manager::executeQuery(string $namespace, MongoDB\Driver\Query $zquery[, MongoDB\Driver\ReadPreference $readPreference = null])
Execute a Query */
PHP_METHOD(Manager, executeQuery)
{
php_phongo_manager_t *intern;
char *namespace;
phongo_zpp_char_len namespace_len;
zval *zquery;
zval *readPreference = NULL;
DECLARE_RETURN_VALUE_USED
SUPPRESS_UNUSED_WARNING(return_value_ptr)
intern = Z_MANAGER_OBJ_P(getThis());
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sO|O!", &namespace, &namespace_len, &zquery, php_phongo_query_ce, &readPreference, php_phongo_readpreference_ce) == FAILURE) {
return;
}
phongo_execute_query(intern->client, namespace, phongo_query_from_zval(zquery TSRMLS_CC), phongo_read_preference_from_zval(readPreference TSRMLS_CC), -1, return_value, return_value_used TSRMLS_CC);
}
/* }}} */
/* {{{ proto MongoDB\Driver\WriteResult Manager::executeBulkWrite(string $namespace, MongoDB\Driver\BulkWrite $zbulk[, MongoDB\Driver\WriteConcern $writeConcern = null])
Executes a write operation bulk (e.g. insert, update, delete) */
PHP_METHOD(Manager, executeBulkWrite)
{
php_phongo_manager_t *intern;
char *namespace;
phongo_zpp_char_len namespace_len;
zval *zbulk;
zval *zwrite_concern = NULL;
php_phongo_bulkwrite_t *bulk;
DECLARE_RETURN_VALUE_USED
SUPPRESS_UNUSED_WARNING(return_value_ptr)
intern = Z_MANAGER_OBJ_P(getThis());
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sO|O!", &namespace, &namespace_len, &zbulk, php_phongo_bulkwrite_ce, &zwrite_concern, php_phongo_writeconcern_ce) == FAILURE) {
return;
}
bulk = Z_BULKWRITE_OBJ_P(zbulk);
phongo_execute_write(intern->client, namespace, bulk->bulk, phongo_write_concern_from_zval(zwrite_concern TSRMLS_CC), -1, return_value, return_value_used TSRMLS_CC);
}
/* }}} */
/* {{{ proto MongoDB\Driver\ReadConcern Manager::getReadConcern()
Returns the ReadConcern associated with this Manager */
PHP_METHOD(Manager, getReadConcern)
{
php_phongo_manager_t *intern;
DECLARE_RETURN_VALUE_USED
SUPPRESS_UNUSED_WARNING(return_value_ptr)
intern = Z_MANAGER_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
if (return_value_used) {
phongo_readconcern_init(return_value, mongoc_client_get_read_concern(intern->client) TSRMLS_CC);
}
}
/* }}} */
/* {{{ proto MongoDB\Driver\ReadPreference Manager::getReadPreference()
Returns the ReadPreference associated with this Manager */
PHP_METHOD(Manager, getReadPreference)
{
php_phongo_manager_t *intern;
DECLARE_RETURN_VALUE_USED
SUPPRESS_UNUSED_WARNING(return_value_ptr)
intern = Z_MANAGER_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
if (return_value_used) {
phongo_readpreference_init(return_value, mongoc_client_get_read_prefs(intern->client) TSRMLS_CC);
}
}
/* }}} */
/* {{{ proto MongoDB\Driver\Server[] Manager::getServers()
Returns the Servers associated with this Manager */
PHP_METHOD(Manager, getServers)
{
php_phongo_manager_t *intern;
mongoc_set_t *set;
size_t i;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_MANAGER_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
array_init(return_value);
set = intern->client->topology->description.servers;
for(i=0; i<set->items_len; i++) {
#if PHP_VERSION_ID >= 70000
zval obj;
#else
zval *obj = NULL;
#endif
mongoc_server_description_t *sd = (mongoc_server_description_t *) set->items[i].item;
if (sd->type == MONGOC_SERVER_UNKNOWN) {
continue;
}
#if PHP_VERSION_ID >= 70000
phongo_server_init(&obj, intern->client, ((mongoc_server_description_t *)set->items[i].item)->id TSRMLS_CC);
add_next_index_zval(return_value, &obj);
#else
MAKE_STD_ZVAL(obj);
phongo_server_init(obj, intern->client, sd->id TSRMLS_CC);
add_next_index_zval(return_value, obj);
#endif
}
}
/* }}} */
/* {{{ proto MongoDB\Driver\WriteConcern Manager::getWriteConcern()
Returns the WriteConcern associated with this Manager */
PHP_METHOD(Manager, getWriteConcern)
{
php_phongo_manager_t *intern;
DECLARE_RETURN_VALUE_USED
SUPPRESS_UNUSED_WARNING(return_value_ptr)
intern = Z_MANAGER_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
if (return_value_used) {
phongo_writeconcern_init(return_value, mongoc_client_get_write_concern(intern->client) TSRMLS_CC);
}
}
/* }}} */
/* {{{ proto MongoDB\Driver\Server Manager::selectServers(MongoDB\Driver\ReadPreference $readPreference)
Returns a suitable Server for the given $readPreference */
PHP_METHOD(Manager, selectServer)
{
php_phongo_manager_t *intern;
zval *zreadPreference = NULL;
const mongoc_read_prefs_t *readPreference;
bson_error_t error;
mongoc_server_description_t *selected_server = NULL;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_MANAGER_OBJ_P(getThis());
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &zreadPreference, php_phongo_readpreference_ce) == FAILURE) {
return;
}
readPreference = phongo_read_preference_from_zval(zreadPreference TSRMLS_CC);
selected_server = mongoc_topology_select(intern->client->topology, MONGOC_SS_READ, readPreference, MONGOC_SS_DEFAULT_LOCAL_THRESHOLD_MS, &error);
if (selected_server) {
phongo_server_init(return_value, intern->client, selected_server->id TSRMLS_CC);
mongoc_server_description_destroy(selected_server);
} else {
phongo_throw_exception(PHONGO_ERROR_RUNTIME TSRMLS_CC, "%s", error.message);
}
}
/* }}} */
/* {{{ proto void MongoDB\Driver\Manager::__wakeUp()
* Throws MongoDB\Driver\RuntimeException as it cannot be serialized */
PHP_METHOD(Manager, __wakeUp)
{
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used) SUPPRESS_UNUSED_WARNING(return_value) SUPPRESS_UNUSED_WARNING(this_ptr)
if (zend_parse_parameters_none() == FAILURE) {
return;
}
phongo_throw_exception(PHONGO_ERROR_RUNTIME TSRMLS_CC, "%s", "MongoDB\\Driver objects cannot be serialized");
}
/* }}} */
/**
* Manager abstracts a cluster of Server objects (i.e. socket connections).
*
* Typically, users will connect to a cluster using a URI, and the Manager will
* perform tasks such as replica set discovery and create the necessary Server
* objects. That said, it is also possible to create a Manager with an arbitrary
* collection of Server objects using the static factory method (this can be
* useful for testing or administration).
*
* Operation methods do not take socket-level options (e.g. socketTimeoutMS).
* Those options should be specified during construction.
*/
/* {{{ MongoDB\Driver\Manager */
ZEND_BEGIN_ARG_INFO_EX(ai_Manager___construct, 0, 0, 0)
ZEND_ARG_INFO(0, uri)
ZEND_ARG_ARRAY_INFO(0, options, 0)
ZEND_ARG_ARRAY_INFO(0, driverOptions, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_Manager_executeCommand, 0, 0, 2)
ZEND_ARG_INFO(0, db)
ZEND_ARG_OBJ_INFO(0, command, MongoDB\\Driver\\Command, 0)
ZEND_ARG_OBJ_INFO(0, readPreference, MongoDB\\Driver\\ReadPreference, 1)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_Manager_executeQuery, 0, 0, 2)
ZEND_ARG_INFO(0, namespace)
ZEND_ARG_OBJ_INFO(0, zquery, MongoDB\\Driver\\Query, 0)
ZEND_ARG_OBJ_INFO(0, readPreference, MongoDB\\Driver\\ReadPreference, 1)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_Manager_executeBulkWrite, 0, 0, 2)
ZEND_ARG_INFO(0, namespace)
ZEND_ARG_OBJ_INFO(0, zbulk, MongoDB\\Driver\\BulkWrite, 0)
ZEND_ARG_OBJ_INFO(0, writeConcern, MongoDB\\Driver\\WriteConcern, 1)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_Manager_getReadConcern, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_Manager_getReadPreference, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_Manager_getServers, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_Manager_getWriteConcern, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_Manager_selectServer, 0, 0, 1)
ZEND_ARG_OBJ_INFO(0, readPreference, MongoDB\\Driver\\ReadPreference, 1)
ZEND_END_ARG_INFO();
static zend_function_entry php_phongo_manager_me[] = {
PHP_ME(Manager, __construct, ai_Manager___construct, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(Manager, executeCommand, ai_Manager_executeCommand, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(Manager, executeQuery, ai_Manager_executeQuery, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(Manager, executeBulkWrite, ai_Manager_executeBulkWrite, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(Manager, getReadConcern, ai_Manager_getReadConcern, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(Manager, getReadPreference, ai_Manager_getReadPreference, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(Manager, getServers, ai_Manager_getServers, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(Manager, getWriteConcern, ai_Manager_getWriteConcern, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(Manager, selectServer, ai_Manager_selectServer, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(Manager, __wakeUp, NULL, ZEND_ACC_PUBLIC)
PHP_FE_END
};
/* }}} */
/* {{{ php_phongo_manager_t object handlers */
static void php_phongo_manager_free_object(phongo_free_object_arg *object TSRMLS_DC) /* {{{ */
{
php_phongo_manager_t *intern = Z_OBJ_MANAGER(object);
zend_object_std_dtor(&intern->std TSRMLS_CC);
if (intern->client) {
mongoc_client_destroy(intern->client);
}
#if PHP_VERSION_ID < 70000
efree(intern);
#endif
} /* }}} */
phongo_create_object_retval php_phongo_manager_create_object(zend_class_entry *class_type TSRMLS_DC) /* {{{ */
{
php_phongo_manager_t *intern = NULL;
intern = PHONGO_ALLOC_OBJECT_T(php_phongo_manager_t, class_type);
zend_object_std_init(&intern->std, class_type TSRMLS_CC);
object_properties_init(&intern->std, class_type);
#if PHP_VERSION_ID >= 70000
intern->std.handlers = &php_phongo_handler_manager;
return &intern->std;
#else
{
zend_object_value retval;
retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t) zend_objects_destroy_object, php_phongo_manager_free_object, NULL TSRMLS_CC);
retval.handlers = &php_phongo_handler_manager;
return retval;
}
#endif
} /* }}} */
bool phongo_add_server_debug(void *item, void *ctx) /* {{{ */
{
mongoc_server_description_t *server = item;
zval *retval = ctx;
#if PHP_VERSION_ID >= 70000
zval entry;
php_phongo_server_to_zval(&entry, server);
add_next_index_zval(retval, &entry);
#else
zval *entry = NULL;
MAKE_STD_ZVAL(entry);
php_phongo_server_to_zval(entry, server);
add_next_index_zval(retval, entry);
#endif
return true;
} /* }}} */
HashTable *php_phongo_manager_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */
{
php_phongo_manager_t *intern;
#if PHP_VERSION_ID >= 70000
zval retval;
#else
zval retval = zval_used_for_init;
#endif
*is_temp = 1;
intern = Z_MANAGER_OBJ_P(object);
array_init(&retval);
ADD_ASSOC_LONG_EX(&retval, "request_id", intern->client->request_id);
ADD_ASSOC_STRING(&retval, "uri", (char *)mongoc_uri_get_string(intern->client->uri));
{
#if PHP_VERSION_ID >= 70000
zval cluster;
array_init(&cluster);
mongoc_set_for_each(intern->client->topology->description.servers, phongo_add_server_debug, &cluster);
ADD_ASSOC_ZVAL_EX(&retval, "cluster", &cluster);
#else
zval *cluster = NULL;
MAKE_STD_ZVAL(cluster);
array_init(cluster);
mongoc_set_for_each(intern->client->topology->description.servers, phongo_add_server_debug, cluster);
ADD_ASSOC_ZVAL_EX(&retval, "cluster", cluster);
#endif
}
return Z_ARRVAL(retval);
} /* }}} */
/* }}} */
/* {{{ PHP_MINIT_FUNCTION */
PHP_MINIT_FUNCTION(Manager)
{
zend_class_entry ce;
(void)type;(void)module_number;
INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "Manager", php_phongo_manager_me);
php_phongo_manager_ce = zend_register_internal_class(&ce TSRMLS_CC);
php_phongo_manager_ce->create_object = php_phongo_manager_create_object;
PHONGO_CE_INIT(php_phongo_manager_ce);
memcpy(&php_phongo_handler_manager, phongo_get_std_object_handlers(), sizeof(zend_object_handlers));
php_phongo_handler_manager.get_debug_info = php_phongo_manager_get_debug_info;
#if PHP_VERSION_ID >= 70000
php_phongo_handler_manager.free_obj = php_phongo_manager_free_object;
php_phongo_handler_manager.offset = XtOffsetOf(php_phongo_manager_t, std);
#endif
return SUCCESS;
}
/* }}} */
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/
diff --git a/mongodb-1.1.1/src/MongoDB/Query.c b/mongodb-1.1.2/src/MongoDB/Query.c
similarity index 96%
rename from mongodb-1.1.1/src/MongoDB/Query.c
rename to mongodb-1.1.2/src/MongoDB/Query.c
index 142b4f58..8e55320c 100644
--- a/mongodb-1.1.1/src/MongoDB/Query.c
+++ b/mongodb-1.1.2/src/MongoDB/Query.c
@@ -1,267 +1,267 @@
/*
+---------------------------------------------------------------------------+
| PHP Driver for MongoDB |
+---------------------------------------------------------------------------+
| Copyright 2013-2015 MongoDB, Inc. |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); |
| you may not use this file except in compliance with the License. |
| You may obtain a copy of the License at |
| |
| http://www.apache.org/licenses/LICENSE-2.0 |
| |
| Unless required by applicable law or agreed to in writing, software |
| distributed under the License is distributed on an "AS IS" BASIS, |
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| See the License for the specific language governing permissions and |
| limitations under the License. |
+---------------------------------------------------------------------------+
| Copyright (c) 2014-2015 MongoDB, Inc. |
+---------------------------------------------------------------------------+
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
/* External libs */
#include <bson.h>
#include <mongoc.h>
/* PHP Core stuff */
#include <php.h>
#include <php_ini.h>
#include <ext/standard/info.h>
#include <Zend/zend_interfaces.h>
#include <ext/spl/spl_iterators.h>
/* PHP array helpers */
#include "php_array_api.h"
/* Our Compatability header */
#include "phongo_compat.h"
/* Our stuffz */
#include "php_phongo.h"
#include "php_bson.h"
PHONGO_API zend_class_entry *php_phongo_query_ce;
zend_object_handlers php_phongo_handler_query;
/* {{{ proto MongoDB\Driver\Query Query::__construct(array|object $filter[, array $options = array()])
Constructs a new Query */
PHP_METHOD(Query, __construct)
{
php_phongo_query_t *intern;
zend_error_handling error_handling;
zval *zfilter;
zval *zoptions = NULL;
bson_t bfilter;
bson_t boptions = BSON_INITIALIZER;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value) SUPPRESS_UNUSED_WARNING(return_value_used)
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling TSRMLS_CC);
intern = Z_QUERY_OBJ_P(getThis());
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "A|a!", &zfilter, &zoptions) == FAILURE) {
zend_restore_error_handling(&error_handling TSRMLS_CC);
return;
}
zend_restore_error_handling(&error_handling TSRMLS_CC);
intern->query = bson_new();
bson_init(&bfilter);
- zval_to_bson(zfilter, PHONGO_BSON_NONE, &bfilter, NULL TSRMLS_CC);
+ phongo_zval_to_bson(zfilter, PHONGO_BSON_NONE, &bfilter, NULL TSRMLS_CC);
if (zoptions) {
if (php_array_exists(zoptions, "readConcern")) {
zval *zread_concern = php_array_fetchc(zoptions, "readConcern");
if (Z_TYPE_P(zread_concern) != IS_OBJECT || !instanceof_function(Z_OBJCE_P(zread_concern), php_phongo_readconcern_ce TSRMLS_CC)) {
#if PHP_VERSION_ID >= 70000
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected \"readConcern\" option to be %s, %s given", ZSTR_VAL(php_phongo_readconcern_ce->name), zend_get_type_by_const(Z_TYPE_P(zread_concern)));
#else
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Expected \"readConcern\" option to be %s, %s given", php_phongo_readconcern_ce->name, zend_get_type_by_const(Z_TYPE_P(zread_concern)));
#endif
bson_clear(&intern->query);
return;
}
intern->read_concern = mongoc_read_concern_copy(phongo_read_concern_from_zval(zread_concern TSRMLS_CC));
php_array_unsetc(zoptions, "readConcern");
}
- zval_to_bson(zoptions, PHONGO_BSON_NONE, &boptions, NULL TSRMLS_CC);
+ phongo_zval_to_bson(zoptions, PHONGO_BSON_NONE, &boptions, NULL TSRMLS_CC);
}
if (!phongo_query_init(intern, &bfilter, &boptions TSRMLS_CC)) {
bson_clear(&intern->query);
}
bson_destroy(&bfilter);
bson_destroy(&boptions);
}
/* }}} */
/* {{{ MongoDB\Driver\Query */
ZEND_BEGIN_ARG_INFO_EX(ai_Query___construct, 0, 0, 1)
ZEND_ARG_INFO(0, filter)
ZEND_ARG_ARRAY_INFO(0, options, 0)
ZEND_END_ARG_INFO();
static zend_function_entry php_phongo_query_me[] = {
PHP_ME(Query, __construct, ai_Query___construct, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(Manager, __wakeUp, NULL, ZEND_ACC_PUBLIC)
PHP_FE_END
};
/* }}} */
/* {{{ php_phongo_query_t object handlers */
static void php_phongo_query_free_object(phongo_free_object_arg *object TSRMLS_DC) /* {{{ */
{
php_phongo_query_t *intern = Z_OBJ_QUERY(object);
zend_object_std_dtor(&intern->std TSRMLS_CC);
if (intern->selector) {
bson_clear(&intern->selector);
}
if (intern->query) {
bson_clear(&intern->query);
}
if (intern->read_concern) {
mongoc_read_concern_destroy(intern->read_concern);
}
#if PHP_VERSION_ID < 70000
efree(intern);
#endif
} /* }}} */
phongo_create_object_retval php_phongo_query_create_object(zend_class_entry *class_type TSRMLS_DC) /* {{{ */
{
php_phongo_query_t *intern = NULL;
intern = PHONGO_ALLOC_OBJECT_T(php_phongo_query_t, class_type);
zend_object_std_init(&intern->std, class_type TSRMLS_CC);
object_properties_init(&intern->std, class_type);
#if PHP_VERSION_ID >= 70000
intern->std.handlers = &php_phongo_handler_query;
return &intern->std;
#else
{
zend_object_value retval;
retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t) zend_objects_destroy_object, php_phongo_query_free_object, NULL TSRMLS_CC);
retval.handlers = &php_phongo_handler_query;
return retval;
}
#endif
} /* }}} */
HashTable *php_phongo_query_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */
{
php_phongo_query_t *intern;
#if PHP_VERSION_ID >= 70000
zval retval;
#else
zval retval = zval_used_for_init;
#endif
*is_temp = 1;
intern = Z_QUERY_OBJ_P(object);
array_init_size(&retval, 6);
/* Avoid using PHONGO_TYPEMAP_NATIVE_ARRAY for decoding query and selector
* documents so that users can differentiate BSON arrays and documents. */
if (intern->query) {
#if PHP_VERSION_ID >= 70000
zval zv;
#else
zval *zv;
#endif
- bson_to_zval(bson_get_data(intern->query), intern->query->len, &zv);
+ phongo_bson_to_zval(bson_get_data(intern->query), intern->query->len, &zv);
#if PHP_VERSION_ID >= 70000
ADD_ASSOC_ZVAL_EX(&retval, "query", &zv);
#else
ADD_ASSOC_ZVAL_EX(&retval, "query", zv);
#endif
} else {
ADD_ASSOC_NULL_EX(&retval, "query");
}
if (intern->selector) {
#if PHP_VERSION_ID >= 70000
zval zv;
#else
zval *zv;
#endif
- bson_to_zval(bson_get_data(intern->selector), intern->selector->len, &zv);
+ phongo_bson_to_zval(bson_get_data(intern->selector), intern->selector->len, &zv);
#if PHP_VERSION_ID >= 70000
ADD_ASSOC_ZVAL_EX(&retval, "selector", &zv);
#else
ADD_ASSOC_ZVAL_EX(&retval, "selector", zv);
#endif
} else {
ADD_ASSOC_NULL_EX(&retval, "selector");
}
ADD_ASSOC_LONG_EX(&retval, "flags", intern->flags);
ADD_ASSOC_LONG_EX(&retval, "skip", intern->skip);
ADD_ASSOC_LONG_EX(&retval, "limit", intern->limit);
ADD_ASSOC_LONG_EX(&retval, "batch_size", intern->batch_size);
return Z_ARRVAL(retval);
} /* }}} */
/* }}} */
/* {{{ PHP_MINIT_FUNCTION */
PHP_MINIT_FUNCTION(Query)
{
zend_class_entry ce;
(void)type;(void)module_number;
INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "Query", php_phongo_query_me);
php_phongo_query_ce = zend_register_internal_class(&ce TSRMLS_CC);
php_phongo_query_ce->create_object = php_phongo_query_create_object;
PHONGO_CE_INIT(php_phongo_query_ce);
memcpy(&php_phongo_handler_query, phongo_get_std_object_handlers(), sizeof(zend_object_handlers));
php_phongo_handler_query.get_debug_info = php_phongo_query_get_debug_info;
#if PHP_VERSION_ID >= 70000
php_phongo_handler_query.free_obj = php_phongo_query_free_object;
php_phongo_handler_query.offset = XtOffsetOf(php_phongo_query_t, std);
#endif
return SUCCESS;
}
/* }}} */
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/
diff --git a/mongodb-1.1.1/src/MongoDB/ReadConcern.c b/mongodb-1.1.2/src/MongoDB/ReadConcern.c
similarity index 100%
rename from mongodb-1.1.1/src/MongoDB/ReadConcern.c
rename to mongodb-1.1.2/src/MongoDB/ReadConcern.c
diff --git a/mongodb-1.1.1/src/MongoDB/ReadPreference.c b/mongodb-1.1.2/src/MongoDB/ReadPreference.c
similarity index 97%
rename from mongodb-1.1.1/src/MongoDB/ReadPreference.c
rename to mongodb-1.1.2/src/MongoDB/ReadPreference.c
index ce33b620..40db90b2 100644
--- a/mongodb-1.1.1/src/MongoDB/ReadPreference.c
+++ b/mongodb-1.1.2/src/MongoDB/ReadPreference.c
@@ -1,269 +1,269 @@
/*
+---------------------------------------------------------------------------+
| PHP Driver for MongoDB |
+---------------------------------------------------------------------------+
| Copyright 2013-2015 MongoDB, Inc. |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); |
| you may not use this file except in compliance with the License. |
| You may obtain a copy of the License at |
| |
| http://www.apache.org/licenses/LICENSE-2.0 |
| |
| Unless required by applicable law or agreed to in writing, software |
| distributed under the License is distributed on an "AS IS" BASIS, |
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| See the License for the specific language governing permissions and |
| limitations under the License. |
+---------------------------------------------------------------------------+
| Copyright (c) 2014-2015 MongoDB, Inc. |
+---------------------------------------------------------------------------+
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
/* External libs */
#include <bson.h>
#include <mongoc.h>
#include <mongoc-read-prefs-private.h>
/* PHP Core stuff */
#include <php.h>
#include <php_ini.h>
#include <ext/standard/info.h>
#include <Zend/zend_interfaces.h>
#include <ext/spl/spl_iterators.h>
/* Our Compatability header */
#include "phongo_compat.h"
/* Our stuffz */
#include "php_phongo.h"
#include "php_bson.h"
PHONGO_API zend_class_entry *php_phongo_readpreference_ce;
zend_object_handlers php_phongo_handler_readpreference;
/* {{{ proto MongoDB\Driver\ReadPreference ReadPreference::__construct(integer $mode[, array $tagSets = array()])
Constructs a new ReadPreference */
PHP_METHOD(ReadPreference, __construct)
{
php_phongo_readpreference_t *intern;
zend_error_handling error_handling;
long mode;
zval *tagSets = NULL;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value) SUPPRESS_UNUSED_WARNING(return_value_used)
zend_replace_error_handling(EH_THROW, phongo_exception_from_phongo_domain(PHONGO_ERROR_INVALID_ARGUMENT), &error_handling TSRMLS_CC);
intern = Z_READPREFERENCE_OBJ_P(getThis());
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|a!", &mode, &tagSets) == FAILURE) {
zend_restore_error_handling(&error_handling TSRMLS_CC);
return;
}
zend_restore_error_handling(&error_handling TSRMLS_CC);
switch(mode) {
case MONGOC_READ_PRIMARY:
case MONGOC_READ_SECONDARY:
case MONGOC_READ_PRIMARY_PREFERRED:
case MONGOC_READ_SECONDARY_PREFERRED:
case MONGOC_READ_NEAREST:
intern->read_preference = mongoc_read_prefs_new(mode);
if (tagSets) {
bson_t *tags = bson_new();
- zval_to_bson(tagSets, PHONGO_BSON_NONE, (bson_t *)tags, NULL TSRMLS_CC);
+ phongo_zval_to_bson(tagSets, PHONGO_BSON_NONE, (bson_t *)tags, NULL TSRMLS_CC);
mongoc_read_prefs_set_tags(intern->read_preference, tags);
bson_destroy(tags);
if (!mongoc_read_prefs_is_valid(intern->read_preference)) {
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Invalid tagSets");
return;
}
}
break;
default:
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Invalid mode: %ld", mode);
return;
}
}
/* }}} */
/* {{{ proto integer ReadPreference::getMode()
Returns the ReadPreference mode */
PHP_METHOD(ReadPreference, getMode)
{
php_phongo_readpreference_t *intern;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_READPREFERENCE_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
RETURN_LONG(mongoc_read_prefs_get_mode(intern->read_preference));
}
/* }}} */
/* {{{ proto array ReadPreference::getTagSets()
Returns the ReadPreference tag sets */
PHP_METHOD(ReadPreference, getTagSets)
{
php_phongo_readpreference_t *intern;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_READPREFERENCE_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
if (intern->read_preference->tags.len) {
php_phongo_bson_state state = PHONGO_BSON_STATE_INITIALIZER;
/* Use native arrays for debugging output */
state.map.root_type = PHONGO_TYPEMAP_NATIVE_ARRAY;
state.map.document_type = PHONGO_TYPEMAP_NATIVE_ARRAY;
- bson_to_zval_ex(bson_get_data(&intern->read_preference->tags), intern->read_preference->tags.len, &state);
+ phongo_bson_to_zval_ex(bson_get_data(&intern->read_preference->tags), intern->read_preference->tags.len, &state);
#if PHP_VERSION_ID >= 70000
RETURN_ZVAL(&state.zchild, 0, 1);
#else
RETURN_ZVAL(state.zchild, 0, 1);
#endif
} else {
RETURN_NULL();
}
}
/* }}} */
/**
* Value object for read preferences used in issuing commands and queries.
*/
/* {{{ MongoDB\Driver\ReadPreference */
ZEND_BEGIN_ARG_INFO_EX(ai_ReadPreference___construct, 0, 0, 1)
ZEND_ARG_INFO(0, mode)
ZEND_ARG_ARRAY_INFO(0, tagSets, 1)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_ReadPreference_getMode, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_ReadPreference_getTagSets, 0, 0, 0)
ZEND_END_ARG_INFO();
static zend_function_entry php_phongo_readpreference_me[] = {
PHP_ME(ReadPreference, __construct, ai_ReadPreference___construct, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(ReadPreference, getMode, ai_ReadPreference_getMode, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(ReadPreference, getTagSets, ai_ReadPreference_getTagSets, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_FE_END
};
/* }}} */
/* {{{ php_phongo_readpreference_t object handlers */
static void php_phongo_readpreference_free_object(phongo_free_object_arg *object TSRMLS_DC) /* {{{ */
{
php_phongo_readpreference_t *intern = Z_OBJ_READPREFERENCE(object);
zend_object_std_dtor(&intern->std TSRMLS_CC);
if (intern->read_preference) {
mongoc_read_prefs_destroy(intern->read_preference);
}
#if PHP_VERSION_ID < 70000
efree(intern);
#endif
} /* }}} */
phongo_create_object_retval php_phongo_readpreference_create_object(zend_class_entry *class_type TSRMLS_DC) /* {{{ */
{
php_phongo_readpreference_t *intern = NULL;
intern = PHONGO_ALLOC_OBJECT_T(php_phongo_readpreference_t, class_type);
zend_object_std_init(&intern->std, class_type TSRMLS_CC);
object_properties_init(&intern->std, class_type);
#if PHP_VERSION_ID >= 70000
intern->std.handlers = &php_phongo_handler_readpreference;
return &intern->std;
#else
{
zend_object_value retval;
retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t) zend_objects_destroy_object, php_phongo_readpreference_free_object, NULL TSRMLS_CC);
retval.handlers = &php_phongo_handler_readpreference;
return retval;
}
#endif
} /* }}} */
HashTable *php_phongo_readpreference_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval retval;
#else
zval retval = zval_used_for_init;
#endif
const mongoc_read_prefs_t *read_prefs = phongo_read_preference_from_zval(object TSRMLS_CC);
*is_temp = 1;
php_phongo_read_preference_to_zval(&retval, read_prefs);
return Z_ARRVAL(retval);
} /* }}} */
/* }}} */
/* {{{ PHP_MINIT_FUNCTION */
PHP_MINIT_FUNCTION(ReadPreference)
{
zend_class_entry ce;
(void)type;(void)module_number;
INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "ReadPreference", php_phongo_readpreference_me);
php_phongo_readpreference_ce = zend_register_internal_class(&ce TSRMLS_CC);
php_phongo_readpreference_ce->create_object = php_phongo_readpreference_create_object;
PHONGO_CE_INIT(php_phongo_readpreference_ce);
memcpy(&php_phongo_handler_readpreference, phongo_get_std_object_handlers(), sizeof(zend_object_handlers));
php_phongo_handler_readpreference.get_debug_info = php_phongo_readpreference_get_debug_info;
#if PHP_VERSION_ID >= 70000
php_phongo_handler_readpreference.free_obj = php_phongo_readpreference_free_object;
php_phongo_handler_readpreference.offset = XtOffsetOf(php_phongo_readpreference_t, std);
#endif
zend_declare_class_constant_long(php_phongo_readpreference_ce, ZEND_STRL("RP_PRIMARY"), MONGOC_READ_PRIMARY TSRMLS_CC);
zend_declare_class_constant_long(php_phongo_readpreference_ce, ZEND_STRL("RP_PRIMARY_PREFERRED"), MONGOC_READ_PRIMARY_PREFERRED TSRMLS_CC);
zend_declare_class_constant_long(php_phongo_readpreference_ce, ZEND_STRL("RP_SECONDARY"), MONGOC_READ_SECONDARY TSRMLS_CC);
zend_declare_class_constant_long(php_phongo_readpreference_ce, ZEND_STRL("RP_SECONDARY_PREFERRED"), MONGOC_READ_SECONDARY_PREFERRED TSRMLS_CC);
zend_declare_class_constant_long(php_phongo_readpreference_ce, ZEND_STRL("RP_NEAREST"), MONGOC_READ_NEAREST TSRMLS_CC);
return SUCCESS;
}
/* }}} */
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/
diff --git a/mongodb-1.1.1/src/MongoDB/Server.c b/mongodb-1.1.2/src/MongoDB/Server.c
similarity index 99%
rename from mongodb-1.1.1/src/MongoDB/Server.c
rename to mongodb-1.1.2/src/MongoDB/Server.c
index d12b45ef..65e03131 100644
--- a/mongodb-1.1.1/src/MongoDB/Server.c
+++ b/mongodb-1.1.2/src/MongoDB/Server.c
@@ -1,623 +1,623 @@
/*
+---------------------------------------------------------------------------+
| PHP Driver for MongoDB |
+---------------------------------------------------------------------------+
| Copyright 2013-2015 MongoDB, Inc. |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); |
| you may not use this file except in compliance with the License. |
| You may obtain a copy of the License at |
| |
| http://www.apache.org/licenses/LICENSE-2.0 |
| |
| Unless required by applicable law or agreed to in writing, software |
| distributed under the License is distributed on an "AS IS" BASIS, |
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| See the License for the specific language governing permissions and |
| limitations under the License. |
+---------------------------------------------------------------------------+
| Copyright (c) 2014-2015 MongoDB, Inc. |
+---------------------------------------------------------------------------+
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
/* External libs */
#include <bson.h>
#include <mongoc.h>
#include <mongoc-client-private.h>
/* PHP Core stuff */
#include <php.h>
#include <php_ini.h>
#include <ext/standard/info.h>
#include <ext/standard/file.h>
#include <Zend/zend_interfaces.h>
#include <ext/spl/spl_iterators.h>
/* Our Compatability header */
#include "phongo_compat.h"
/* Our stuffz */
#include "php_phongo.h"
#include "php_bson.h"
PHONGO_API zend_class_entry *php_phongo_server_ce;
zend_object_handlers php_phongo_handler_server;
/* {{{ proto MongoDB\Driver\Server Server::__construct()
Throws exception -- can only be created internally */
PHP_METHOD(Server, __construct)
{
SUPPRESS_UNUSED_WARNING(return_value) SUPPRESS_UNUSED_WARNING(return_value_used) SUPPRESS_UNUSED_WARNING(return_value_ptr) (void)ZEND_NUM_ARGS(); (void)getThis();
phongo_throw_exception(PHONGO_ERROR_RUNTIME TSRMLS_CC, "Accessing private constructor");
}
/* }}} */
/* {{{ proto MongoDB\Driver\Cursor Server::executeCommand(string $db, MongoDB\Driver\Command $command[, MongoDB\Driver\ReadPreference $readPreference = null]))
Executes a command on this server */
PHP_METHOD(Server, executeCommand)
{
php_phongo_server_t *intern;
char *db;
phongo_zpp_char_len db_len;
zval *command;
zval *readPreference = NULL;
php_phongo_command_t *cmd;
DECLARE_RETURN_VALUE_USED
SUPPRESS_UNUSED_WARNING(return_value_ptr)
intern = Z_SERVER_OBJ_P(getThis());
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sO|O!", &db, &db_len, &command, php_phongo_command_ce, &readPreference, php_phongo_readpreference_ce) == FAILURE) {
return;
}
cmd = Z_COMMAND_OBJ_P(command);
phongo_execute_command(intern->client, db, cmd->bson, phongo_read_preference_from_zval(readPreference TSRMLS_CC), intern->server_id, return_value, return_value_used TSRMLS_CC);
}
/* }}} */
/* {{{ proto MongoDB\Driver\Cursor Server::executeQuery(string $namespace, MongoDB\Driver\Query $zquery[, MongoDB\Driver\ReadPreference $readPreference = null]))
Executes a Query */
PHP_METHOD(Server, executeQuery)
{
php_phongo_server_t *intern;
char *namespace;
phongo_zpp_char_len namespace_len;
zval *zquery;
zval *readPreference = NULL;
DECLARE_RETURN_VALUE_USED
SUPPRESS_UNUSED_WARNING(return_value_ptr)
intern = Z_SERVER_OBJ_P(getThis());
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sO|O!", &namespace, &namespace_len, &zquery, php_phongo_query_ce, &readPreference, php_phongo_readpreference_ce) == FAILURE) {
return;
}
phongo_execute_query(intern->client, namespace, phongo_query_from_zval(zquery TSRMLS_CC), phongo_read_preference_from_zval(readPreference TSRMLS_CC), intern->server_id, return_value, return_value_used TSRMLS_CC);
}
/* }}} */
/* {{{ proto MongoDB\Driver\WriteResult Server::executeBulkWrite(string $namespace, MongoDB\Driver\BulkWrite $zbulk[, MongoDB\Driver\WriteConcern $writeConcern = null])
Executes a write operation bulk (e.g. insert, update, delete) */
PHP_METHOD(Server, executeBulkWrite)
{
php_phongo_server_t *intern;
char *namespace;
phongo_zpp_char_len namespace_len;
zval *zbulk;
zval *zwrite_concern = NULL;
php_phongo_bulkwrite_t *bulk;
DECLARE_RETURN_VALUE_USED
SUPPRESS_UNUSED_WARNING(return_value_ptr)
intern = Z_SERVER_OBJ_P(getThis());
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sO|O!", &namespace, &namespace_len, &zbulk, php_phongo_bulkwrite_ce, &zwrite_concern, php_phongo_writeconcern_ce) == FAILURE) {
return;
}
bulk = Z_BULKWRITE_OBJ_P(zbulk);
phongo_execute_write(intern->client, namespace, bulk->bulk, phongo_write_concern_from_zval(zwrite_concern TSRMLS_CC), intern->server_id, return_value, return_value_used TSRMLS_CC);
}
/* }}} */
/* {{{ proto string Server::getHost()
Returns the hostname used to connect to this Server */
PHP_METHOD(Server, getHost)
{
php_phongo_server_t *intern;
mongoc_server_description_t *sd;
bson_error_t error;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_SERVER_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
if ((sd = mongoc_topology_description_server_by_id(&intern->client->topology->description, intern->server_id, &error))) {
PHONGO_RETURN_STRING(sd->host.host);
}
phongo_throw_exception(PHONGO_ERROR_RUNTIME TSRMLS_CC, "Failed to get server description: %s", error.message);
}
/* }}} */
/* {{{ proto array Server::getTags()
Returns the currently configured tags for this node */
PHP_METHOD(Server, getTags)
{
php_phongo_server_t *intern;
mongoc_server_description_t *sd;
bson_error_t error;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_SERVER_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
if ((sd = mongoc_topology_description_server_by_id(&intern->client->topology->description, intern->server_id, &error))) {
php_phongo_bson_state state = PHONGO_BSON_STATE_INITIALIZER;
state.map.root_type = PHONGO_TYPEMAP_NATIVE_ARRAY;
state.map.document_type = PHONGO_TYPEMAP_NATIVE_ARRAY;
- bson_to_zval_ex(bson_get_data(&sd->tags), sd->tags.len, &state);
+ phongo_bson_to_zval_ex(bson_get_data(&sd->tags), sd->tags.len, &state);
#if PHP_VERSION_ID >= 70000
RETURN_ZVAL(&state.zchild, 0, 1);
#else
RETURN_ZVAL(state.zchild, 0, 1);
#endif
}
phongo_throw_exception(PHONGO_ERROR_RUNTIME TSRMLS_CC, "Failed to get server description: %s", error.message);
}
/* }}} */
/* {{{ proto array Server::getInfo()
Returns the last isMaster() result document */
PHP_METHOD(Server, getInfo)
{
php_phongo_server_t *intern;
mongoc_server_description_t *sd;
bson_error_t error;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_SERVER_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
if ((sd = mongoc_topology_description_server_by_id(&intern->client->topology->description, intern->server_id, &error))) {
php_phongo_bson_state state = PHONGO_BSON_STATE_INITIALIZER;
state.map.root_type = PHONGO_TYPEMAP_NATIVE_ARRAY;
state.map.document_type = PHONGO_TYPEMAP_NATIVE_ARRAY;
- bson_to_zval_ex(bson_get_data(&sd->last_is_master), sd->last_is_master.len, &state);
+ phongo_bson_to_zval_ex(bson_get_data(&sd->last_is_master), sd->last_is_master.len, &state);
#if PHP_VERSION_ID >= 70000
RETURN_ZVAL(&state.zchild, 0, 1);
#else
RETURN_ZVAL(state.zchild, 0, 1);
#endif
}
phongo_throw_exception(PHONGO_ERROR_RUNTIME TSRMLS_CC, "Failed to get server description: %s", error.message);
}
/* }}} */
/* {{{ proto integer Server::getLatency()
Returns the last messured latency */
PHP_METHOD(Server, getLatency)
{
php_phongo_server_t *intern;
mongoc_server_description_t *sd;
bson_error_t error;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_SERVER_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
if ((sd = mongoc_topology_description_server_by_id(&intern->client->topology->description, intern->server_id, &error))) {
RETURN_LONG(sd->round_trip_time);
}
phongo_throw_exception(PHONGO_ERROR_RUNTIME TSRMLS_CC, "Failed to get server description: %s", error.message);
}
/* }}} */
/* {{{ proto integer Server::getPort()
Returns the port used to create this Server */
PHP_METHOD(Server, getPort)
{
php_phongo_server_t *intern;
mongoc_server_description_t *sd;
bson_error_t error;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_SERVER_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
if ((sd = mongoc_topology_description_server_by_id(&intern->client->topology->description, intern->server_id, &error))) {
RETURN_LONG(sd->host.port);
}
phongo_throw_exception(PHONGO_ERROR_RUNTIME TSRMLS_CC, "Failed to get server description: %s", error.message);
}
/* }}} */
/* {{{ proto integer Server::getType()
Returns the node type of this Server */
PHP_METHOD(Server, getType)
{
php_phongo_server_t *intern;
mongoc_server_description_t *sd;
bson_error_t error;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_SERVER_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
if ((sd = mongoc_topology_description_server_by_id(&intern->client->topology->description, intern->server_id, &error))) {
RETURN_LONG(sd->type);
}
phongo_throw_exception(PHONGO_ERROR_RUNTIME TSRMLS_CC, "Failed to get server description: %s", error.message);
}
/* }}} */
/* {{{ proto bool Server::isPrimary()
Checks if this is a special "Primary" member of a RepilcaSet */
PHP_METHOD(Server, isPrimary)
{
php_phongo_server_t *intern;
mongoc_server_description_t *sd;
bson_error_t error;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_SERVER_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
if ((sd = mongoc_topology_description_server_by_id(&intern->client->topology->description, intern->server_id, &error))) {
RETURN_BOOL(sd->type == MONGOC_SERVER_RS_PRIMARY);
}
phongo_throw_exception(PHONGO_ERROR_RUNTIME TSRMLS_CC, "Failed to get server description: %s", error.message);
}
/* }}} */
/* {{{ proto bool Server::isSecondary()
Checks if this is a special "Secondary" member of a RepilcaSet */
PHP_METHOD(Server, isSecondary)
{
php_phongo_server_t *intern;
mongoc_server_description_t *sd;
bson_error_t error;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_SERVER_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
if ((sd = mongoc_topology_description_server_by_id(&intern->client->topology->description, intern->server_id, &error))) {
RETURN_BOOL(sd->type == MONGOC_SERVER_RS_SECONDARY);
}
phongo_throw_exception(PHONGO_ERROR_RUNTIME TSRMLS_CC, "Failed to get server description: %s", error.message);
}
/* }}} */
/* {{{ proto bool Server::isArbiter()
Checks if this is a special "Arbiter" member of a RepilcaSet */
PHP_METHOD(Server, isArbiter)
{
php_phongo_server_t *intern;
mongoc_server_description_t *sd;
bson_error_t error;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_SERVER_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
if ((sd = mongoc_topology_description_server_by_id(&intern->client->topology->description, intern->server_id, &error))) {
RETURN_BOOL(sd->type == MONGOC_SERVER_RS_ARBITER);
}
phongo_throw_exception(PHONGO_ERROR_RUNTIME TSRMLS_CC, "Failed to get server description: %s", error.message);
}
/* }}} */
/* {{{ proto bool Server::isHidden()
Checks if this is a special "hidden" member of a RepilcaSet */
PHP_METHOD(Server, isHidden)
{
php_phongo_server_t *intern;
mongoc_server_description_t *sd;
bson_error_t error;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_SERVER_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
if ((sd = mongoc_topology_description_server_by_id(&intern->client->topology->description, intern->server_id, &error))) {
bson_iter_t iter;
RETURN_BOOL(bson_iter_init_find_case(&iter, &sd->last_is_master, "hidden") && bson_iter_as_bool(&iter));
}
phongo_throw_exception(PHONGO_ERROR_RUNTIME TSRMLS_CC, "Failed to get server description: %s", error.message);
}
/* }}} */
/* {{{ proto bool Server::isPassive()
Checks if this is a special passive node member of a ReplicaSet */
PHP_METHOD(Server, isPassive)
{
php_phongo_server_t *intern;
mongoc_server_description_t *sd;
bson_error_t error;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_SERVER_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
if ((sd = mongoc_topology_description_server_by_id(&intern->client->topology->description, intern->server_id, &error))) {
bson_iter_t iter;
RETURN_BOOL(bson_iter_init_find_case(&iter, &sd->last_is_master, "passive") && bson_iter_as_bool(&iter));
}
phongo_throw_exception(PHONGO_ERROR_RUNTIME TSRMLS_CC, "Failed to get server description: %s", error.message);
}
/* }}} */
/* {{{ MongoDB\Driver\Server */
ZEND_BEGIN_ARG_INFO_EX(ai_Server_executeCommand, 0, 0, 2)
ZEND_ARG_INFO(0, db)
ZEND_ARG_OBJ_INFO(0, command, MongoDB\\Driver\\Command, 0)
ZEND_ARG_OBJ_INFO(0, readPreference, MongoDB\\Driver\\ReadPreference, 1)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_Server_executeQuery, 0, 0, 2)
ZEND_ARG_INFO(0, namespace)
ZEND_ARG_OBJ_INFO(0, zquery, MongoDB\\Driver\\Query, 0)
ZEND_ARG_OBJ_INFO(0, readPreference, MongoDB\\Driver\\ReadPreference, 1)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_Server_executeBulkWrite, 0, 0, 2)
ZEND_ARG_INFO(0, namespace)
ZEND_ARG_OBJ_INFO(0, zbulk, MongoDB\\Driver\\BulkWrite, 0)
ZEND_ARG_OBJ_INFO(0, writeConcern, MongoDB\\Driver\\WriteConcern, 1)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_Server_getHost, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_Server_getTags, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_Server_getInfo, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_Server_getLatency, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_Server_getPort, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_Server_getType, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_Server_isPrimary, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_Server_isSecondary, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_Server_isArbiter, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_Server_isHidden, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_Server_isPassive, 0, 0, 0)
ZEND_END_ARG_INFO();
static zend_function_entry php_phongo_server_me[] = {
PHP_ME(Server, __construct, NULL, ZEND_ACC_FINAL|ZEND_ACC_PRIVATE)
PHP_ME(Server, executeCommand, ai_Server_executeCommand, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(Server, executeQuery, ai_Server_executeQuery, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(Server, executeBulkWrite, ai_Server_executeBulkWrite, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(Server, getHost, ai_Server_getHost, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(Server, getTags, ai_Server_getTags, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(Server, getInfo, ai_Server_getInfo, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(Server, getLatency, ai_Server_getLatency, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(Server, getPort, ai_Server_getPort, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(Server, getType, ai_Server_getType, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(Server, isPrimary, ai_Server_isPrimary, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(Server, isSecondary, ai_Server_isSecondary, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(Server, isArbiter, ai_Server_isArbiter, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(Server, isHidden, ai_Server_isHidden, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(Server, isPassive, ai_Server_isPassive, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(Manager, __wakeUp, NULL, ZEND_ACC_PUBLIC)
PHP_FE_END
};
/* }}} */
/* {{{ Other functions */
static int php_phongo_server_compare_objects(zval *o1, zval *o2 TSRMLS_DC) /* {{{ */
{
php_phongo_server_t *intern1;
php_phongo_server_t *intern2;
bson_error_t error1;
bson_error_t error2;
mongoc_server_description_t *sd1, *sd2;
intern1 = Z_SERVER_OBJ_P(o1);
intern2 = Z_SERVER_OBJ_P(o2);
sd1 = mongoc_topology_description_server_by_id(&intern1->client->topology->description, intern1->server_id, &error1);
sd2 = mongoc_topology_description_server_by_id(&intern2->client->topology->description, intern2->server_id, &error2);
if (!sd1 || !sd2) {
if (!sd1 && !sd2) {
phongo_throw_exception(PHONGO_ERROR_RUNTIME TSRMLS_CC, "Failed to get server descriptions: %s and %s", error1.message, error2.message);
} else if (!sd1) {
phongo_throw_exception(PHONGO_ERROR_RUNTIME TSRMLS_CC, "Failed to get server description: %s", error1.message);
} else {
phongo_throw_exception(PHONGO_ERROR_RUNTIME TSRMLS_CC, "Failed to get server description: %s", error2.message);
}
return 0;
}
return strcasecmp(sd1->host.host_and_port, sd2->host.host_and_port);
} /* }}} */
/* }}} */
/* {{{ php_phongo_server_t object handlers */
static void php_phongo_server_free_object(phongo_free_object_arg *object TSRMLS_DC) /* {{{ */
{
php_phongo_server_t *intern = Z_OBJ_SERVER(object);
zend_object_std_dtor(&intern->std TSRMLS_CC);
#if PHP_VERSION_ID < 70000
efree(intern);
#endif
} /* }}} */
phongo_create_object_retval php_phongo_server_create_object(zend_class_entry *class_type TSRMLS_DC) /* {{{ */
{
php_phongo_server_t *intern = NULL;
intern = PHONGO_ALLOC_OBJECT_T(php_phongo_server_t, class_type);
zend_object_std_init(&intern->std, class_type TSRMLS_CC);
object_properties_init(&intern->std, class_type);
#if PHP_VERSION_ID >= 70000
intern->std.handlers = &php_phongo_handler_server;
return &intern->std;
#else
{
zend_object_value retval;
retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t) zend_objects_destroy_object, php_phongo_server_free_object, NULL TSRMLS_CC);
retval.handlers = &php_phongo_handler_server;
return retval;
}
#endif
} /* }}} */
HashTable *php_phongo_server_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */
{
php_phongo_server_t *intern = NULL;
#if PHP_VERSION_ID >= 70000
zval retval;
#else
zval retval = zval_used_for_init;
#endif
mongoc_server_description_t *sd;
bson_error_t error;
*is_temp = 1;
intern = Z_SERVER_OBJ_P(object);
if (!(sd = mongoc_topology_description_server_by_id(&intern->client->topology->description, intern->server_id, &error))) {
phongo_throw_exception(PHONGO_ERROR_RUNTIME TSRMLS_CC, "Failed to get server description: %s", error.message);
return NULL;
}
php_phongo_server_to_zval(&retval, sd);
return Z_ARRVAL(retval);
} /* }}} */
/* }}} */
/* {{{ PHP_MINIT_FUNCTION */
PHP_MINIT_FUNCTION(Server)
{
zend_class_entry ce;
(void)type;(void)module_number;
INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "Server", php_phongo_server_me);
php_phongo_server_ce = zend_register_internal_class(&ce TSRMLS_CC);
php_phongo_server_ce->create_object = php_phongo_server_create_object;
PHONGO_CE_INIT(php_phongo_server_ce);
memcpy(&php_phongo_handler_server, phongo_get_std_object_handlers(), sizeof(zend_object_handlers));
php_phongo_handler_server.compare_objects = php_phongo_server_compare_objects;
php_phongo_handler_server.get_debug_info = php_phongo_server_get_debug_info;
#if PHP_VERSION_ID >= 70000
php_phongo_handler_server.free_obj = php_phongo_server_free_object;
php_phongo_handler_server.offset = XtOffsetOf(php_phongo_server_t, std);
#endif
zend_declare_class_constant_long(php_phongo_server_ce, ZEND_STRL("TYPE_UNKNOWN"), MONGOC_SERVER_UNKNOWN TSRMLS_CC);
zend_declare_class_constant_long(php_phongo_server_ce, ZEND_STRL("TYPE_STANDALONE"), MONGOC_SERVER_STANDALONE TSRMLS_CC);
zend_declare_class_constant_long(php_phongo_server_ce, ZEND_STRL("TYPE_MONGOS"), MONGOC_SERVER_MONGOS TSRMLS_CC);
zend_declare_class_constant_long(php_phongo_server_ce, ZEND_STRL("TYPE_POSSIBLE_PRIMARY"), MONGOC_SERVER_POSSIBLE_PRIMARY TSRMLS_CC);
zend_declare_class_constant_long(php_phongo_server_ce, ZEND_STRL("TYPE_RS_PRIMARY"), MONGOC_SERVER_RS_PRIMARY TSRMLS_CC);
zend_declare_class_constant_long(php_phongo_server_ce, ZEND_STRL("TYPE_RS_SECONDARY"), MONGOC_SERVER_RS_SECONDARY TSRMLS_CC);
zend_declare_class_constant_long(php_phongo_server_ce, ZEND_STRL("TYPE_RS_ARBITER"), MONGOC_SERVER_RS_ARBITER TSRMLS_CC);
zend_declare_class_constant_long(php_phongo_server_ce, ZEND_STRL("TYPE_RS_OTHER"), MONGOC_SERVER_RS_OTHER TSRMLS_CC);
zend_declare_class_constant_long(php_phongo_server_ce, ZEND_STRL("TYPE_RS_GHOST"), MONGOC_SERVER_RS_GHOST TSRMLS_CC);
return SUCCESS;
}
/* }}} */
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/
diff --git a/mongodb-1.1.1/src/MongoDB/WriteConcern.c b/mongodb-1.1.2/src/MongoDB/WriteConcern.c
similarity index 100%
rename from mongodb-1.1.1/src/MongoDB/WriteConcern.c
rename to mongodb-1.1.2/src/MongoDB/WriteConcern.c
diff --git a/mongodb-1.1.1/src/MongoDB/WriteConcernError.c b/mongodb-1.1.2/src/MongoDB/WriteConcernError.c
similarity index 100%
rename from mongodb-1.1.1/src/MongoDB/WriteConcernError.c
rename to mongodb-1.1.2/src/MongoDB/WriteConcernError.c
diff --git a/mongodb-1.1.1/src/MongoDB/WriteError.c b/mongodb-1.1.2/src/MongoDB/WriteError.c
similarity index 100%
rename from mongodb-1.1.1/src/MongoDB/WriteError.c
rename to mongodb-1.1.2/src/MongoDB/WriteError.c
diff --git a/mongodb-1.1.1/src/MongoDB/WriteResult.c b/mongodb-1.1.2/src/MongoDB/WriteResult.c
similarity index 98%
rename from mongodb-1.1.1/src/MongoDB/WriteResult.c
rename to mongodb-1.1.2/src/MongoDB/WriteResult.c
index 92735f92..61049845 100644
--- a/mongodb-1.1.1/src/MongoDB/WriteResult.c
+++ b/mongodb-1.1.2/src/MongoDB/WriteResult.c
@@ -1,578 +1,578 @@
/*
+---------------------------------------------------------------------------+
| PHP Driver for MongoDB |
+---------------------------------------------------------------------------+
| Copyright 2013-2015 MongoDB, Inc. |
| |
| Licensed under the Apache License, Version 2.0 (the "License"); |
| you may not use this file except in compliance with the License. |
| You may obtain a copy of the License at |
| |
| http://www.apache.org/licenses/LICENSE-2.0 |
| |
| Unless required by applicable law or agreed to in writing, software |
| distributed under the License is distributed on an "AS IS" BASIS, |
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| See the License for the specific language governing permissions and |
| limitations under the License. |
+---------------------------------------------------------------------------+
| Copyright (c) 2014-2015 MongoDB, Inc. |
+---------------------------------------------------------------------------+
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
/* External libs */
#include <bson.h>
#include <mongoc.h>
#include <mongoc-write-concern-private.h>
/* PHP Core stuff */
#include <php.h>
#include <php_ini.h>
#include <ext/standard/info.h>
#include <Zend/zend_interfaces.h>
#include <ext/spl/spl_iterators.h>
/* Our Compatability header */
#include "phongo_compat.h"
/* Our stuffz */
#include "php_phongo.h"
#include "php_bson.h"
PHONGO_API zend_class_entry *php_phongo_writeresult_ce;
zend_object_handlers php_phongo_handler_writeresult;
/* {{{ proto integer WriteResult::getInsertedCount()
Returns the number of documents that were inserted */
PHP_METHOD(WriteResult, getInsertedCount)
{
php_phongo_writeresult_t *intern;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_WRITERESULT_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
RETURN_LONG(intern->write_result.nInserted);
}
/* }}} */
/* {{{ proto integer WriteResult::getMatchedCount()
Returns the number of documents that matched the update criteria */
PHP_METHOD(WriteResult, getMatchedCount)
{
php_phongo_writeresult_t *intern;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_WRITERESULT_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
RETURN_LONG(intern->write_result.nMatched);
}
/* }}} */
/* {{{ proto integer|null WriteResult::getModifiedCount()
Returns the number of documents that were actually modified by an update */
PHP_METHOD(WriteResult, getModifiedCount)
{
php_phongo_writeresult_t *intern;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_WRITERESULT_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
if (intern->write_result.omit_nModified) {
RETURN_NULL();
}
RETURN_LONG(intern->write_result.nModified);
}
/* }}} */
/* {{{ proto integer WriteResult::getDeletedCount()
Returns the number of documents that were deleted */
PHP_METHOD(WriteResult, getDeletedCount)
{
php_phongo_writeresult_t *intern;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_WRITERESULT_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
RETURN_LONG(intern->write_result.nRemoved);
}
/* }}} */
/* {{{ proto integer WriteResult::getUpsertedCount()
Returns the number of documents that were upserted */
PHP_METHOD(WriteResult, getUpsertedCount)
{
php_phongo_writeresult_t *intern;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_WRITERESULT_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
RETURN_LONG(intern->write_result.nUpserted);
}
/* }}} */
/* {{{ proto MongoDB\Driver\Server WriteResult::getServer()
Returns the Server from which the result originated */
PHP_METHOD(WriteResult, getServer)
{
php_phongo_writeresult_t *intern;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_WRITERESULT_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
phongo_server_init(return_value, intern->client, intern->server_id TSRMLS_CC);
}
/* }}} */
/* {{{ proto array WriteResult::getUpsertedIds()
Returns the identifiers generated by the server for upsert operations. */
PHP_METHOD(WriteResult, getUpsertedIds)
{
php_phongo_writeresult_t *intern;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_WRITERESULT_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
array_init(return_value);
if (!bson_empty0(&intern->write_result.upserted)) {
bson_iter_t iter;
bson_iter_init(&iter, &intern->write_result.upserted);
while (bson_iter_next(&iter)) {
int32_t index;
bson_iter_t outer;
if (!BSON_ITER_HOLDS_DOCUMENT(&iter) || !bson_iter_recurse(&iter, &outer)) {
continue;
}
if (!bson_iter_find(&outer, "index") || !BSON_ITER_HOLDS_INT32(&outer)) {
continue;
}
index = bson_iter_int32(&outer);
if (!bson_iter_find(&outer, "_id")) {
continue;
}
if (BSON_ITER_HOLDS_OID(&outer)) {
#if PHP_VERSION_ID >= 70000
zval zid;
php_phongo_objectid_new_from_oid(&zid, bson_iter_oid(&outer) TSRMLS_CC);
add_index_zval(return_value, index, &zid);
#else
zval *zid = NULL;
MAKE_STD_ZVAL(zid);
php_phongo_objectid_new_from_oid(zid, bson_iter_oid(&outer) TSRMLS_CC);
add_index_zval(return_value, index, zid);
#endif
} else if (BSON_ITER_HOLDS_INT32(&outer)) {
int32_t val = bson_iter_int32(&outer);
add_index_long(return_value, index, val);
} else if (BSON_ITER_HOLDS_INT64(&outer)) {
int64_t val = bson_iter_int64(&outer);
ADD_INDEX_INT64(return_value, index, val);
}
}
}
}
/* }}} */
/* {{{ proto WriteConcernError WriteResult::getWriteConcernError()
Return any write concern error that occurred */
PHP_METHOD(WriteResult, getWriteConcernError)
{
php_phongo_writeresult_t *intern;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_WRITERESULT_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
if (!bson_empty0(&intern->write_result.writeConcernErrors)) {
bson_iter_t iter;
bson_iter_init(&iter, &intern->write_result.writeConcernErrors);
while (bson_iter_next(&iter)) {
bson_t cbson;
uint32_t len;
const uint8_t *data;
if (!BSON_ITER_HOLDS_DOCUMENT(&iter)) {
continue;
}
bson_iter_document(&iter, &len, &data);
if (!bson_init_static(&cbson, data, len)) {
continue;
}
object_init_ex(return_value, php_phongo_writeconcernerror_ce);
if (!phongo_writeconcernerror_init(return_value, &cbson TSRMLS_CC)) {
#if PHP_VERSION_ID >= 70000
zval_ptr_dtor(return_value);
#else
zval_ptr_dtor(&return_value);
#endif
}
return;
}
}
}
/* }}} */
/* {{{ proto WriteError[] WriteResult::getWriteErrors()
Returns any write errors that occurred */
PHP_METHOD(WriteResult, getWriteErrors)
{
php_phongo_writeresult_t *intern;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_WRITERESULT_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
array_init(return_value);
if (!bson_empty0(&intern->write_result.writeErrors)) {
bson_iter_t iter;
bson_iter_init(&iter, &intern->write_result.writeErrors);
while (bson_iter_next(&iter)) {
bson_t cbson;
uint32_t len;
const uint8_t *data;
#if PHP_VERSION_ID >= 70000
zval writeerror;
#else
zval *writeerror = NULL;
#endif
if (!BSON_ITER_HOLDS_DOCUMENT(&iter)) {
continue;
}
bson_iter_document(&iter, &len, &data);
if (!bson_init_static(&cbson, data, len)) {
continue;
}
#if PHP_VERSION_ID >= 70000
object_init_ex(&writeerror, php_phongo_writeerror_ce);
if (!phongo_writeerror_init(&writeerror, &cbson TSRMLS_CC)) {
zval_ptr_dtor(&writeerror);
continue;
}
add_next_index_zval(return_value, &writeerror);
#else
MAKE_STD_ZVAL(writeerror);
object_init_ex(writeerror, php_phongo_writeerror_ce);
if (!phongo_writeerror_init(writeerror, &cbson TSRMLS_CC)) {
zval_ptr_dtor(&writeerror);
continue;
}
add_next_index_zval(return_value, writeerror);
#endif
}
}
}
/* }}} */
/* {{{ proto boolean WriteResult::isAcknowledged()
Returns the number of documents that were upserted */
PHP_METHOD(WriteResult, isAcknowledged)
{
php_phongo_writeresult_t *intern;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(return_value_used)
intern = Z_WRITERESULT_OBJ_P(getThis());
if (zend_parse_parameters_none() == FAILURE) {
return;
}
RETURN_BOOL(_mongoc_write_concern_needs_gle(intern->write_concern));
}
/* }}} */
/**
* Result returned by Server and Manager executeBulkWrite() methods.
*
* This class may be constructed internally if it will encapsulate a libmongoc
* data structure.
*/
/* {{{ MongoDB\Driver\WriteResult */
ZEND_BEGIN_ARG_INFO_EX(ai_WriteResult_getInsertedCount, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_WriteResult_getMatchedCount, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_WriteResult_getModifiedCount, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_WriteResult_getDeletedCount, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_WriteResult_getUpsertedCount, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_WriteResult_getServer, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_WriteResult_getUpsertedIds, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_WriteResult_getWriteConcernError, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_WriteResult_getWriteErrors, 0, 0, 0)
ZEND_END_ARG_INFO();
ZEND_BEGIN_ARG_INFO_EX(ai_WriteResult_isAcknowledged, 0, 0, 0)
ZEND_END_ARG_INFO();
static zend_function_entry php_phongo_writeresult_me[] = {
PHP_ME(Server, __construct, NULL, ZEND_ACC_FINAL|ZEND_ACC_PRIVATE)
PHP_ME(WriteResult, getInsertedCount, ai_WriteResult_getInsertedCount, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(WriteResult, getMatchedCount, ai_WriteResult_getMatchedCount, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(WriteResult, getModifiedCount, ai_WriteResult_getModifiedCount, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(WriteResult, getDeletedCount, ai_WriteResult_getDeletedCount, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(WriteResult, getUpsertedCount, ai_WriteResult_getUpsertedCount, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(WriteResult, getServer, ai_WriteResult_getServer, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(WriteResult, getUpsertedIds, ai_WriteResult_getUpsertedIds, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(WriteResult, getWriteConcernError, ai_WriteResult_getWriteConcernError, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(WriteResult, getWriteErrors, ai_WriteResult_getWriteErrors, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(WriteResult, isAcknowledged, ai_WriteResult_isAcknowledged, ZEND_ACC_PUBLIC|ZEND_ACC_FINAL)
PHP_ME(Manager, __wakeUp, NULL, ZEND_ACC_PUBLIC)
PHP_FE_END
};
/* }}} */
/* {{{ php_phongo_writeresult_t object handlers */
static void php_phongo_writeresult_free_object(phongo_free_object_arg *object TSRMLS_DC) /* {{{ */
{
php_phongo_writeresult_t *intern = Z_OBJ_WRITERESULT(object);
zend_object_std_dtor(&intern->std TSRMLS_CC);
_mongoc_write_result_destroy(&intern->write_result);
if (intern->write_concern) {
mongoc_write_concern_destroy(intern->write_concern);
}
#if PHP_VERSION_ID < 70000
efree(intern);
#endif
} /* }}} */
phongo_create_object_retval php_phongo_writeresult_create_object(zend_class_entry *class_type TSRMLS_DC) /* {{{ */
{
php_phongo_writeresult_t *intern = NULL;
intern = PHONGO_ALLOC_OBJECT_T(php_phongo_writeresult_t, class_type);
zend_object_std_init(&intern->std, class_type TSRMLS_CC);
object_properties_init(&intern->std, class_type);
#if PHP_VERSION_ID >= 70000
intern->std.handlers = &php_phongo_handler_writeresult;
return &intern->std;
#else
{
zend_object_value retval;
retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t) zend_objects_destroy_object, php_phongo_writeresult_free_object, NULL TSRMLS_CC);
retval.handlers = &php_phongo_handler_writeresult;
return retval;
}
#endif
} /* }}} */
HashTable *php_phongo_writeresult_get_debug_info(zval *object, int *is_temp TSRMLS_DC) /* {{{ */
{
php_phongo_writeresult_t *intern;
#if PHP_VERSION_ID >= 70000
zval retval;
#else
zval retval = zval_used_for_init;
#endif
php_phongo_bson_state state = PHONGO_BSON_STATE_INITIALIZER;
bson_iter_t iter;
intern = Z_WRITERESULT_OBJ_P(object);
*is_temp = 1;
array_init_size(&retval, 9);
ADD_ASSOC_LONG_EX(&retval, "nInserted", intern->write_result.nInserted);
ADD_ASSOC_LONG_EX(&retval, "nMatched", intern->write_result.nMatched);
if (intern->write_result.omit_nModified) {
ADD_ASSOC_NULL_EX(&retval, "nModified");
} else {
ADD_ASSOC_LONG_EX(&retval, "nModified", intern->write_result.nModified);
}
ADD_ASSOC_LONG_EX(&retval, "nRemoved", intern->write_result.nRemoved);
ADD_ASSOC_LONG_EX(&retval, "nUpserted", intern->write_result.nUpserted);
/* Use native arrays for debugging output */
state.map.root_type = PHONGO_TYPEMAP_NATIVE_ARRAY;
state.map.document_type = PHONGO_TYPEMAP_NATIVE_ARRAY;
- bson_to_zval_ex(bson_get_data(&intern->write_result.upserted), intern->write_result.upserted.len, &state);
+ phongo_bson_to_zval_ex(bson_get_data(&intern->write_result.upserted), intern->write_result.upserted.len, &state);
#if PHP_VERSION_ID >= 70000
ADD_ASSOC_ZVAL_EX(&retval, "upsertedIds", &state.zchild);
#else
ADD_ASSOC_ZVAL_EX(&retval, "upsertedIds", state.zchild);
#endif
- bson_to_zval_ex(bson_get_data(&intern->write_result.writeErrors), intern->write_result.writeErrors.len, &state);
+ phongo_bson_to_zval_ex(bson_get_data(&intern->write_result.writeErrors), intern->write_result.writeErrors.len, &state);
#if PHP_VERSION_ID >= 70000
ADD_ASSOC_ZVAL_EX(&retval, "writeErrors", &state.zchild);
#else
ADD_ASSOC_ZVAL_EX(&retval, "writeErrors", state.zchild);
#endif
if (!bson_empty0(&intern->write_result.writeConcernErrors) &&
bson_iter_init(&iter, &intern->write_result.writeConcernErrors) &&
bson_iter_next(&iter) &&
BSON_ITER_HOLDS_DOCUMENT(&iter)) {
uint32_t len;
const uint8_t *data;
bson_iter_document(&iter, &len, &data);
- bson_to_zval_ex(data, len, &state);
+ phongo_bson_to_zval_ex(data, len, &state);
#if PHP_VERSION_ID >= 70000
ADD_ASSOC_ZVAL_EX(&retval, "writeConcernError", &state.zchild);
#else
ADD_ASSOC_ZVAL_EX(&retval, "writeConcernError", state.zchild);
#endif
} else {
ADD_ASSOC_NULL_EX(&retval, "writeConcernError");
}
if (intern->write_concern) {
#if PHP_VERSION_ID >= 70000
zval write_concern;
php_phongo_write_concern_to_zval(&write_concern, intern->write_concern);
#else
zval *write_concern = NULL;
MAKE_STD_ZVAL(write_concern);
php_phongo_write_concern_to_zval(write_concern, intern->write_concern);
#endif
#if PHP_VERSION_ID >= 70000
ADD_ASSOC_ZVAL_EX(&retval, "writeConcern", &write_concern);
#else
ADD_ASSOC_ZVAL_EX(&retval, "writeConcern", write_concern);
#endif
} else {
ADD_ASSOC_NULL_EX(&retval, "writeConcern");
}
return Z_ARRVAL(retval);
} /* }}} */
/* }}} */
/* {{{ PHP_MINIT_FUNCTION */
PHP_MINIT_FUNCTION(WriteResult)
{
zend_class_entry ce;
(void)type;(void)module_number;
INIT_NS_CLASS_ENTRY(ce, "MongoDB\\Driver", "WriteResult", php_phongo_writeresult_me);
php_phongo_writeresult_ce = zend_register_internal_class(&ce TSRMLS_CC);
php_phongo_writeresult_ce->create_object = php_phongo_writeresult_create_object;
PHONGO_CE_INIT(php_phongo_writeresult_ce);
memcpy(&php_phongo_handler_writeresult, phongo_get_std_object_handlers(), sizeof(zend_object_handlers));
php_phongo_handler_writeresult.get_debug_info = php_phongo_writeresult_get_debug_info;
#if PHP_VERSION_ID >= 70000
php_phongo_handler_writeresult.free_obj = php_phongo_writeresult_free_object;
php_phongo_handler_writeresult.offset = XtOffsetOf(php_phongo_writeresult_t, std);
#endif
return SUCCESS;
}
/* }}} */
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/
diff --git a/mongodb-1.1.1/src/bson.c b/mongodb-1.1.2/src/bson.c
similarity index 96%
rename from mongodb-1.1.1/src/bson.c
rename to mongodb-1.1.2/src/bson.c
index 98318168..c3ab1495 100644
--- a/mongodb-1.1.1/src/bson.c
+++ b/mongodb-1.1.2/src/bson.c
@@ -1,1620 +1,1629 @@
/*
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
| Copyright (c) 2014-2015 Hannes Magnusson |
+----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
| http://www.php.net/license/3_01.txt |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| license@php.net so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Author: Hannes Magnusson <bjori@php.net> |
+----------------------------------------------------------------------+
*/
/* $Id$ */
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
/* External libs */
#include <bson.h>
/* PHP Core stuff */
#include <php.h>
#include <ext/spl/spl_array.h>
#include <Zend/zend_hash.h>
#include <Zend/zend_interfaces.h>
/* PHP array helpers */
#include "php_array_api.h"
/* Our Compatability header */
#include "phongo_compat.h"
/* Our stuffz */
#include "php_phongo.h"
#include "php_bson.h"
#define BSON_APPEND_INT32(b,key,val) \
bson_append_int32 (b, key, (int) strlen (key), val)
#if SIZEOF_LONG == 8
# define BSON_APPEND_INT(b, key, keylen, val) \
if (val > INT_MAX || val < INT_MIN) { \
bson_append_int64(b, key, keylen, val); \
} else { \
bson_append_int32(b, key, keylen, val); \
}
#elif SIZEOF_LONG == 4
# define BSON_APPEND_INT(b, key, keylen, val) \
bson_append_int32(b, key, keylen, val);
#endif
#undef MONGOC_LOG_DOMAIN
#define MONGOC_LOG_DOMAIN "PHONGO-BSON"
#define PHONGO_ODM_FIELD_NAME "__pclass"
#define PHONGO_IS_CLASS_INSTANTIATABLE(ce) \
(!(ce->ce_flags & (ZEND_ACC_INTERFACE|ZEND_ACC_IMPLICIT_ABSTRACT_CLASS|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)))
PHP_MINIT_FUNCTION(bson)
{
(void)type; /* We don't care if we are loaded via dl() or extension= */
(void)module_number; /* Really doesn't matter which module number we are */
/* Register BSONable */
return SUCCESS;
}
/* Forward declarations */
bool php_phongo_bson_visit_document(const bson_iter_t *iter ARG_UNUSED, const char *key, const bson_t *v_document, void *data);
bool php_phongo_bson_visit_array(const bson_iter_t *iter ARG_UNUSED, const char *key, const bson_t *v_document, void *data);
/* {{{ Santa's Little Helper: Object getters */
void php_phongo_objectid_get_id(zval *object, bson_oid_t *oid TSRMLS_DC)
{
php_phongo_objectid_t *intern;
intern = Z_OBJECTID_OBJ_P(object);
bson_oid_init_from_string(oid, intern->oid);
}
int64_t php_phongo_utcdatetime_get_milliseconds(zval *object TSRMLS_DC)
{
php_phongo_utcdatetime_t *intern;
intern = Z_UTCDATETIME_OBJ_P(object);
return intern->milliseconds;
}
int32_t php_phongo_timestamp_get_increment(zval *object TSRMLS_DC)
{
php_phongo_timestamp_t *intern;
intern = Z_TIMESTAMP_OBJ_P(object);
return intern->increment;
}
int32_t php_phongo_timestamp_get_timestamp(zval *object TSRMLS_DC)
{
php_phongo_timestamp_t *intern;
intern = Z_TIMESTAMP_OBJ_P(object);
return intern->timestamp;
}
bool php_phongo_javascript_has_scope(zval *object TSRMLS_DC)
{
php_phongo_javascript_t *intern;
intern = Z_JAVASCRIPT_OBJ_P(object);
return !!intern->document;
}
char *php_phongo_javascript_get_javascript(zval *object TSRMLS_DC)
{
php_phongo_javascript_t *intern;
intern = Z_JAVASCRIPT_OBJ_P(object);
return intern->javascript;
}
bson_t *php_phongo_javascript_get_scope(zval *object TSRMLS_DC)
{
php_phongo_javascript_t *intern;
intern = Z_JAVASCRIPT_OBJ_P(object);
return intern->document;
}
int php_phongo_binary_get_data(zval *object, char **data TSRMLS_DC)
{
php_phongo_binary_t *intern;
intern = Z_BINARY_OBJ_P(object);
*data = intern->data;
return intern->data_len;
}
int php_phongo_binary_get_type(zval *object TSRMLS_DC)
{
php_phongo_binary_t *intern;
intern = Z_BINARY_OBJ_P(object);
return intern->type;
}
char *php_phongo_regex_get_pattern(zval *object TSRMLS_DC)
{
php_phongo_regex_t *intern;
intern = Z_REGEX_OBJ_P(object);
return intern->pattern;
}
char *php_phongo_regex_get_flags(zval *object TSRMLS_DC)
{
php_phongo_regex_t *intern;
intern = Z_REGEX_OBJ_P(object);
return intern->flags;
}
/* }}} */
#if 0
bool php_phongo_bson_visit_before(const bson_iter_t *iter ARG_UNUSED, const char *key, void *data) /* {{{ */
{
return false;
}
/* }}} */
bool php_phongo_bson_visit_after(const bson_iter_t *iter ARG_UNUSED, const char *key, void *data) /* {{{ */
{
return false;
}
/* }}} */
#endif
void php_phongo_bson_visit_corrupt(const bson_iter_t *iter ARG_UNUSED, void *data) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *retval = &((php_phongo_bson_state *)data)->zchild;
#else
zval *retval = ((php_phongo_bson_state *)data)->zchild;
#endif
mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "Corrupt BSON data detected!");
#if PHP_VERSION_ID >= 70000
zval_ptr_dtor(retval);
#else
zval_ptr_dtor(&retval);
#endif
}
/* }}} */
bool php_phongo_bson_visit_double(const bson_iter_t *iter ARG_UNUSED, const char *key, double v_double, void *data) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *retval = &((php_phongo_bson_state *)data)->zchild;
#else
zval *retval = ((php_phongo_bson_state *)data)->zchild;
#endif
add_assoc_double(retval, key, v_double);
return false;
}
/* }}} */
bool php_phongo_bson_visit_utf8(const bson_iter_t *iter ARG_UNUSED, const char *key, size_t v_utf8_len, const char *v_utf8, void *data) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *retval = &((php_phongo_bson_state *)data)->zchild;
#else
zval *retval = ((php_phongo_bson_state *)data)->zchild;
#endif
ADD_ASSOC_STRING_EX(retval, key, strlen(key), (char *)v_utf8, v_utf8_len);
return false;
}
/* }}} */
bool php_phongo_bson_visit_binary(const bson_iter_t *iter ARG_UNUSED, const char *key, bson_subtype_t v_subtype, size_t v_binary_len, const uint8_t *v_binary, void *data) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *retval = &((php_phongo_bson_state *)data)->zchild;
#else
zval *retval = ((php_phongo_bson_state *)data)->zchild;
#endif
TSRMLS_FETCH();
if (v_subtype == 0x80 && strcmp(key, PHONGO_ODM_FIELD_NAME) == 0) {
#if PHP_VERSION_ID >= 70000
zend_string *zs_classname = zend_string_init((const char *)v_binary, v_binary_len, 0);
zend_class_entry *found_ce = zend_fetch_class(zs_classname, ZEND_FETCH_CLASS_AUTO|ZEND_FETCH_CLASS_SILENT TSRMLS_CC);
zend_string_free(zs_classname);
#else
zend_class_entry *found_ce = zend_fetch_class((char *)v_binary, v_binary_len, ZEND_FETCH_CLASS_AUTO|ZEND_FETCH_CLASS_SILENT TSRMLS_CC);
#endif
if (found_ce && PHONGO_IS_CLASS_INSTANTIATABLE(found_ce) && instanceof_function(found_ce, php_phongo_persistable_ce TSRMLS_CC)) {
((php_phongo_bson_state *)data)->odm = found_ce;
}
}
{
#if PHP_VERSION_ID >= 70000
zval zchild;
php_phongo_new_binary_from_binary_and_type(&zchild, (const char *)v_binary, v_binary_len, v_subtype TSRMLS_CC);
ADD_ASSOC_ZVAL(retval, key, &zchild);
Z_SET_REFCOUNT(zchild, 1);
#else
zval *zchild = NULL;
MAKE_STD_ZVAL(zchild);
php_phongo_new_binary_from_binary_and_type(zchild, (const char *)v_binary, v_binary_len, v_subtype TSRMLS_CC);
ADD_ASSOC_ZVAL(retval, key, zchild);
Z_SET_REFCOUNT_P(zchild, 1);
#endif
}
return false;
}
/* }}} */
#if 0
bool php_phongo_bson_visit_undefined(const bson_iter_t *iter ARG_UNUSED, const char *key, void *data) /* {{{ */
{
printf("Not Implemented\n");
return true;
}
/* }}} */
#endif
bool php_phongo_bson_visit_oid(const bson_iter_t *iter ARG_UNUSED, const char *key, const bson_oid_t *v_oid, void *data) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *retval = &((php_phongo_bson_state *)data)->zchild;
#else
zval *retval = ((php_phongo_bson_state *)data)->zchild;
#endif
#if PHP_VERSION_ID >= 70000
zval zchild;
php_phongo_objectid_new_from_oid(&zchild, v_oid TSRMLS_CC);
ADD_ASSOC_ZVAL(retval, key, &zchild);
#else
zval *zchild = NULL;
TSRMLS_FETCH();
MAKE_STD_ZVAL(zchild);
php_phongo_objectid_new_from_oid(zchild, v_oid TSRMLS_CC);
ADD_ASSOC_ZVAL(retval, key, zchild);
Z_SET_REFCOUNT_P(zchild, 1);
#endif
return false;
}
/* }}} */
bool php_phongo_bson_visit_bool(const bson_iter_t *iter ARG_UNUSED, const char *key, bool v_bool, void *data) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *retval = &((php_phongo_bson_state *)data)->zchild;
#else
zval *retval = ((php_phongo_bson_state *)data)->zchild;
#endif
add_assoc_bool(retval, key, v_bool);
return false;
}
/* }}} */
bool php_phongo_bson_visit_date_time(const bson_iter_t *iter ARG_UNUSED, const char *key, int64_t msec_since_epoch, void *data) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *retval = &((php_phongo_bson_state *)data)->zchild;
#else
zval *retval = ((php_phongo_bson_state *)data)->zchild;
#endif
#if PHP_VERSION_ID >= 70000
zval zchild;
php_phongo_new_utcdatetime_from_epoch(&zchild, msec_since_epoch TSRMLS_CC);
ADD_ASSOC_ZVAL(retval, key, &zchild);
#else
zval *zchild = NULL;
TSRMLS_FETCH();
MAKE_STD_ZVAL(zchild);
php_phongo_new_utcdatetime_from_epoch(zchild, msec_since_epoch TSRMLS_CC);
ADD_ASSOC_ZVAL(retval, key, zchild);
Z_SET_REFCOUNT_P(zchild, 1);
#endif
return false;
}
/* }}} */
bool php_phongo_bson_visit_null(const bson_iter_t *iter ARG_UNUSED, const char *key, void *data) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *retval = &((php_phongo_bson_state *)data)->zchild;
#else
zval *retval = ((php_phongo_bson_state *)data)->zchild;
#endif
add_assoc_null(retval, key);
return false;
}
/* }}} */
bool php_phongo_bson_visit_regex(const bson_iter_t *iter ARG_UNUSED, const char *key, const char *v_regex, const char *v_options, void *data) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *retval = &((php_phongo_bson_state *)data)->zchild;
#else
zval *retval = ((php_phongo_bson_state *)data)->zchild;
#endif
#if PHP_VERSION_ID >= 70000
zval zchild;
php_phongo_new_regex_from_regex_and_options(&zchild, v_regex, v_options TSRMLS_CC);
ADD_ASSOC_ZVAL(retval, key, &zchild);
#else
zval *zchild = NULL;
TSRMLS_FETCH();
MAKE_STD_ZVAL(zchild);
php_phongo_new_regex_from_regex_and_options(zchild, v_regex, v_options TSRMLS_CC);
ADD_ASSOC_ZVAL(retval, key, zchild);
Z_SET_REFCOUNT_P(zchild, 1);
#endif
return false;
}
/* }}} */
#if 0
bool php_phongo_bson_visit_dbpointer(const bson_iter_t *iter ARG_UNUSED, const char *key, size_t v_collection_len, const char *v_collection, const bson_oid_t *v_oid, void *data) /* {{{ */
{
printf("Not Implemented\n");
return true;
}
/* }}} */
#endif
bool php_phongo_bson_visit_code(const bson_iter_t *iter ARG_UNUSED, const char *key, size_t v_code_len, const char *v_code, void *data) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *retval = &((php_phongo_bson_state *)data)->zchild;
#else
zval *retval = ((php_phongo_bson_state *)data)->zchild;
#endif
#if PHP_VERSION_ID >= 70000
zval zchild;
php_phongo_new_javascript_from_javascript(1, &zchild, v_code, v_code_len TSRMLS_CC);
ADD_ASSOC_ZVAL(retval, key, &zchild);
#else
zval *zchild = NULL;
TSRMLS_FETCH();
MAKE_STD_ZVAL(zchild);
php_phongo_new_javascript_from_javascript(1, zchild, v_code, v_code_len TSRMLS_CC);
ADD_ASSOC_ZVAL(retval, key, zchild);
Z_SET_REFCOUNT_P(zchild, 1);
#endif
return false;
}
/* }}} */
#if 0
bool php_phongo_bson_visit_symbol(const bson_iter_t *iter ARG_UNUSED, const char *key, size_t v_symbol_len, const char *v_symbol, void *data) /* {{{ */
{
printf("Not Implemented\n");
return true;
}
/* }}} */
#endif
bool php_phongo_bson_visit_codewscope(const bson_iter_t *iter ARG_UNUSED, const char *key, size_t v_code_len, const char *v_code, const bson_t *v_scope, void *data) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *retval = &((php_phongo_bson_state *)data)->zchild;
#else
zval *retval = ((php_phongo_bson_state *)data)->zchild;
#endif
#if PHP_VERSION_ID >= 70000
zval zchild;
php_phongo_new_javascript_from_javascript_and_scope(1, &zchild, v_code, v_code_len, v_scope TSRMLS_CC);
ADD_ASSOC_ZVAL(retval, key, &zchild);
#else
zval *zchild = NULL;
TSRMLS_FETCH();
MAKE_STD_ZVAL(zchild);
php_phongo_new_javascript_from_javascript_and_scope(1, zchild, v_code, v_code_len, v_scope TSRMLS_CC);
ADD_ASSOC_ZVAL(retval, key, zchild);
Z_SET_REFCOUNT_P(zchild, 1);
#endif
return false;
}
/* }}} */
bool php_phongo_bson_visit_int32(const bson_iter_t *iter ARG_UNUSED, const char *key, int32_t v_int32, void *data) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *retval = &((php_phongo_bson_state *)data)->zchild;
#else
zval *retval = ((php_phongo_bson_state *)data)->zchild;
#endif
add_assoc_long(retval, key, v_int32);
return false;
}
/* }}} */
bool php_phongo_bson_visit_timestamp(const bson_iter_t *iter ARG_UNUSED, const char *key, uint32_t v_timestamp, uint32_t v_increment, void *data) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *retval = &((php_phongo_bson_state *)data)->zchild;
#else
zval *retval = ((php_phongo_bson_state *)data)->zchild;
#endif
#if PHP_VERSION_ID >= 70000
zval zchild;
php_phongo_new_timestamp_from_increment_and_timestamp(&zchild, v_increment, v_timestamp TSRMLS_CC);
ADD_ASSOC_ZVAL(retval, key, &zchild);
#else
zval *zchild = NULL;
TSRMLS_FETCH();
MAKE_STD_ZVAL(zchild);
php_phongo_new_timestamp_from_increment_and_timestamp(zchild, v_increment, v_timestamp TSRMLS_CC);
ADD_ASSOC_ZVAL(retval, key, zchild);
Z_SET_REFCOUNT_P(zchild, 1);
#endif
return false;
}
/* }}} */
bool php_phongo_bson_visit_int64(const bson_iter_t *iter ARG_UNUSED, const char *key, int64_t v_int64, void *data) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *retval = &((php_phongo_bson_state *)data)->zchild;
#else
zval *retval = ((php_phongo_bson_state *)data)->zchild;
#endif
ADD_ASSOC_INT64(retval, key, v_int64);
return false;
}
/* }}} */
bool php_phongo_bson_visit_maxkey(const bson_iter_t *iter ARG_UNUSED, const char *key, void *data) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *retval = &((php_phongo_bson_state *)data)->zchild;
#else
zval *retval = ((php_phongo_bson_state *)data)->zchild;
#endif
#if PHP_VERSION_ID >= 70000
zval zchild;
object_init_ex(&zchild, php_phongo_maxkey_ce);
ADD_ASSOC_ZVAL(retval, key, &zchild);
#else
zval *zchild = NULL;
TSRMLS_FETCH();
MAKE_STD_ZVAL(zchild);
object_init_ex(zchild, php_phongo_maxkey_ce);
ADD_ASSOC_ZVAL(retval, key, zchild);
Z_SET_REFCOUNT_P(zchild, 1);
#endif
return false;
}
/* }}} */
bool php_phongo_bson_visit_minkey(const bson_iter_t *iter ARG_UNUSED, const char *key, void *data) /* {{{ */
{
#if PHP_VERSION_ID >= 70000
zval *retval = &((php_phongo_bson_state *)data)->zchild;
#else
zval *retval = ((php_phongo_bson_state *)data)->zchild;
#endif
#if PHP_VERSION_ID >= 70000
zval zchild;
object_init_ex(&zchild, php_phongo_minkey_ce);
ADD_ASSOC_ZVAL(retval, key, &zchild);
#else
zval *zchild = NULL;
TSRMLS_FETCH();
MAKE_STD_ZVAL(zchild);
object_init_ex(zchild, php_phongo_minkey_ce);
Z_SET_REFCOUNT_P(zchild, 1);
ADD_ASSOC_ZVAL(retval, key, zchild);
#endif
return false;
}
/* }}} */
static const bson_visitor_t php_bson_visitors = {
NULL /* php_phongo_bson_visit_before*/,
NULL /*php_phongo_bson_visit_after*/,
php_phongo_bson_visit_corrupt,
php_phongo_bson_visit_double,
php_phongo_bson_visit_utf8,
php_phongo_bson_visit_document,
php_phongo_bson_visit_array,
php_phongo_bson_visit_binary,
NULL /*php_phongo_bson_visit_undefined*/,
php_phongo_bson_visit_oid,
php_phongo_bson_visit_bool,
php_phongo_bson_visit_date_time,
php_phongo_bson_visit_null,
php_phongo_bson_visit_regex,
NULL /*php_phongo_bson_visit_dbpointer*/,
php_phongo_bson_visit_code,
NULL /*php_phongo_bson_visit_symbol*/,
php_phongo_bson_visit_codewscope,
php_phongo_bson_visit_int32,
php_phongo_bson_visit_timestamp,
php_phongo_bson_visit_int64,
php_phongo_bson_visit_maxkey,
php_phongo_bson_visit_minkey,
{ NULL }
};
bool php_phongo_bson_visit_document(const bson_iter_t *iter ARG_UNUSED, const char *key, const bson_t *v_document, void *data)
{
#if PHP_VERSION_ID >= 70000
zval *retval = &((php_phongo_bson_state *)data)->zchild;
#else
zval *retval = ((php_phongo_bson_state *)data)->zchild;
#endif
bson_iter_t child;
TSRMLS_FETCH();
if (bson_iter_init(&child, v_document)) {
php_phongo_bson_state state = PHONGO_BSON_STATE_INITIALIZER;
state.map = ((php_phongo_bson_state *)data)->map;
#if PHP_VERSION_ID >= 70000
array_init(&state.zchild);
#else
MAKE_STD_ZVAL(state.zchild);
array_init(state.zchild);
#endif
if (!bson_iter_visit_all(&child, &php_bson_visitors, &state)) {
/* If php_phongo_bson_visit_binary() finds an ODM class, it should
* supersede a default type map and named document class. */
if (state.odm && state.map.document_type == PHONGO_TYPEMAP_NONE) {
state.map.document_type = PHONGO_TYPEMAP_CLASS;
}
switch(state.map.document_type) {
case PHONGO_TYPEMAP_NATIVE_ARRAY:
#if PHP_VERSION_ID >= 70000
ADD_ASSOC_ZVAL(retval, key, &state.zchild);
Z_SET_REFCOUNT(state.zchild, 1);
#else
ADD_ASSOC_ZVAL(retval, key, state.zchild);
Z_SET_REFCOUNT_P(state.zchild, 1);
#endif
break;
case PHONGO_TYPEMAP_CLASS: {
#if PHP_VERSION_ID >= 70000
zval obj;
object_init_ex(&obj, state.odm ? state.odm : state.map.document);
zend_call_method_with_1_params(&obj, NULL, NULL, BSON_UNSERIALIZE_FUNC_NAME, NULL, &state.zchild);
add_assoc_zval(retval, key, &obj);
zval_ptr_dtor(&state.zchild);
#else
zval *obj = NULL;
MAKE_STD_ZVAL(obj);
object_init_ex(obj, state.odm ? state.odm : state.map.document);
zend_call_method_with_1_params(&obj, NULL, NULL, BSON_UNSERIALIZE_FUNC_NAME, NULL, state.zchild);
add_assoc_zval(retval, key, obj);
zval_ptr_dtor(&state.zchild);
#endif
break;
}
case PHONGO_TYPEMAP_NATIVE_OBJECT:
default:
#if PHP_VERSION_ID >= 70000
object_and_properties_init(&state.zchild, zend_standard_class_def, Z_ARRVAL(state.zchild));
add_assoc_zval(retval, key, &state.zchild);
Z_SET_REFCOUNT(state.zchild, 1);
#else
object_and_properties_init(state.zchild, zend_standard_class_def, Z_ARRVAL_P(state.zchild));
add_assoc_zval(retval, key, state.zchild);
Z_SET_REFCOUNT_P(state.zchild, 1);
#endif
}
}
}
return false;
}
bool php_phongo_bson_visit_array(const bson_iter_t *iter ARG_UNUSED, const char *key, const bson_t *v_array, void *data)
{
#if PHP_VERSION_ID >= 70000
zval *retval = &((php_phongo_bson_state *)data)->zchild;
#else
zval *retval = ((php_phongo_bson_state *)data)->zchild;
#endif
bson_iter_t child;
TSRMLS_FETCH();
if (bson_iter_init(&child, v_array)) {
php_phongo_bson_state state = PHONGO_BSON_STATE_INITIALIZER;
state.map = ((php_phongo_bson_state *)data)->map;
#if PHP_VERSION_ID >= 70000
array_init(&state.zchild);
#else
MAKE_STD_ZVAL(state.zchild);
array_init(state.zchild);
#endif
if (!bson_iter_visit_all(&child, &php_bson_visitors, &state)) {
switch(state.map.array_type) {
case PHONGO_TYPEMAP_CLASS: {
#if PHP_VERSION_ID >= 70000
zval obj;
object_init_ex(&obj, state.map.array);
zend_call_method_with_1_params(&obj, NULL, NULL, BSON_UNSERIALIZE_FUNC_NAME, NULL, &state.zchild);
add_assoc_zval(retval, key, &obj);
zval_ptr_dtor(&state.zchild);
#else
zval *obj = NULL;
MAKE_STD_ZVAL(obj);
object_init_ex(obj, state.map.array);
zend_call_method_with_1_params(&obj, NULL, NULL, BSON_UNSERIALIZE_FUNC_NAME, NULL, state.zchild);
add_assoc_zval(retval, key, obj);
zval_ptr_dtor(&state.zchild);
#endif
break;
}
case PHONGO_TYPEMAP_NATIVE_OBJECT:
#if PHP_VERSION_ID >= 70000
object_and_properties_init(&state.zchild, zend_standard_class_def, Z_ARRVAL(state.zchild));
add_assoc_zval(retval, key, &state.zchild);
Z_SET_REFCOUNT(state.zchild, 1);
#else
object_and_properties_init(state.zchild, zend_standard_class_def, Z_ARRVAL_P(state.zchild));
add_assoc_zval(retval, key, state.zchild);
Z_SET_REFCOUNT_P(state.zchild, 1);
#endif
break;
case PHONGO_TYPEMAP_NATIVE_ARRAY:
default:
#if PHP_VERSION_ID >= 70000
ADD_ASSOC_ZVAL(retval, key, &state.zchild);
Z_SET_REFCOUNT(state.zchild, 1);
#else
ADD_ASSOC_ZVAL(retval, key, state.zchild);
Z_SET_REFCOUNT_P(state.zchild, 1);
#endif
break;
}
}
}
return false;
}
int php_phongo_is_array_or_document(zval *val TSRMLS_DC) /* {{{ */
{
HashTable *ht_data = HASH_OF(val);
int count;
if (Z_TYPE_P(val) != IS_ARRAY) {
return IS_OBJECT;
}
count = ht_data ? zend_hash_num_elements(ht_data) : 0;
if (count > 0) {
#if PHP_VERSION_ID >= 70000
zend_string *key;
zend_ulong index, idx;
idx = 0;
ZEND_HASH_FOREACH_KEY(ht_data, index, key) {
if (key) {
return IS_OBJECT;
} else {
if (index != idx) {
return IS_OBJECT;
}
}
idx++;
} ZEND_HASH_FOREACH_END();
#else
char *key;
unsigned int key_len;
unsigned long index = 0;
unsigned long idx = 0;
int hash_type = 0;
HashPosition pos;
zend_hash_internal_pointer_reset_ex(ht_data, &pos);
for (;; zend_hash_move_forward_ex(ht_data, &pos)) {
hash_type = zend_hash_get_current_key_ex(ht_data, &key, &key_len, &index, 0, &pos);
if (hash_type == HASH_KEY_NON_EXISTENT) {
break;
}
if (hash_type == HASH_KEY_IS_STRING) {
return IS_OBJECT;
} else {
if (index != idx) {
return IS_OBJECT;
}
}
idx++;
}
#endif
} else {
return Z_TYPE_P(val);
}
return IS_ARRAY;
}
/* }}} */
void object_to_bson(zval *object, php_phongo_bson_flags_t flags, const char *key, long key_len, bson_t *bson TSRMLS_DC)
{
bson_t child;
if (Z_TYPE_P(object) == IS_OBJECT && instanceof_function(Z_OBJCE_P(object), php_phongo_type_ce TSRMLS_CC)) {
if (instanceof_function(Z_OBJCE_P(object), php_phongo_serializable_ce TSRMLS_CC)) {
#if PHP_VERSION_ID >= 70000
zval obj_data;
#else
zval *obj_data = NULL;
#endif
bson_t child;
HashTable *tmp_ht;
#if PHP_VERSION_ID >= 70000
zend_call_method_with_0_params(object, NULL, NULL, BSON_SERIALIZE_FUNC_NAME, &obj_data);
#else
zend_call_method_with_0_params(&object, NULL, NULL, BSON_SERIALIZE_FUNC_NAME, &obj_data);
#endif
if (Z_ISUNDEF(obj_data)) {
/* zend_call_method() failed */
return;
}
#if PHP_VERSION_ID >= 70000
if (Z_TYPE(obj_data) != IS_ARRAY && !(Z_TYPE(obj_data) == IS_OBJECT && instanceof_function(Z_OBJCE(obj_data), zend_standard_class_def TSRMLS_CC))) {
phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC,
"Expected %s::%s() to return an array or stdClass, %s given",
Z_OBJCE_P(object)->name->val,
BSON_SERIALIZE_FUNC_NAME,
(Z_TYPE(obj_data) == IS_OBJECT
? Z_OBJCE(obj_data)->name->val
: zend_get_type_by_const(Z_TYPE(obj_data))
)
);
zval_ptr_dtor(&obj_data);
#else
if (Z_TYPE_P(obj_data) != IS_ARRAY && !(Z_TYPE_P(obj_data) == IS_OBJECT && instanceof_function(Z_OBJCE_P(obj_data), zend_standard_class_def TSRMLS_CC))) {
phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC,
"Expected %s::%s() to return an array or stdClass, %s given",
Z_OBJCE_P(object)->name,
BSON_SERIALIZE_FUNC_NAME,
(Z_TYPE_P(obj_data) == IS_OBJECT
? Z_OBJCE_P(obj_data)->name
: zend_get_type_by_const(Z_TYPE_P(obj_data))
)
);
zval_ptr_dtor(&obj_data);
#endif
return;
}
#if PHP_VERSION_ID >= 70000
tmp_ht = HASH_OF(&obj_data);
#else
tmp_ht = HASH_OF(obj_data);
#endif
if (tmp_ht) {
ZEND_HASH_APPLY_COUNT(tmp_ht)++;
}
/* Persistable objects must always be serialized as BSON documents;
* otherwise, infer based on bsonSerialize()'s return value. */
#if PHP_VERSION_ID >= 70000
if (instanceof_function(Z_OBJCE_P(object), php_phongo_persistable_ce TSRMLS_CC) || php_phongo_is_array_or_document(&obj_data TSRMLS_CC) == IS_OBJECT) {
#else
if (instanceof_function(Z_OBJCE_P(object), php_phongo_persistable_ce TSRMLS_CC) || php_phongo_is_array_or_document(obj_data TSRMLS_CC) == IS_OBJECT) {
#endif
bson_append_document_begin(bson, key, key_len, &child);
if (instanceof_function(Z_OBJCE_P(object), php_phongo_persistable_ce TSRMLS_CC)) {
if (flags & PHONGO_BSON_ADD_CHILD_ODS) {
#if PHP_VERSION_ID >= 70000
bson_append_binary(&child, PHONGO_ODM_FIELD_NAME, -1, 0x80, (const uint8_t *)Z_OBJCE_P(object)->name->val, Z_OBJCE_P(object)->name->len);
#else
bson_append_binary(&child, PHONGO_ODM_FIELD_NAME, -1, 0x80, (const uint8_t *)Z_OBJCE_P(object)->name, strlen(Z_OBJCE_P(object)->name));
#endif
}
}
#if PHP_VERSION_ID >= 70000
- zval_to_bson(&obj_data, flags, &child, NULL TSRMLS_CC);
+ phongo_zval_to_bson(&obj_data, flags, &child, NULL TSRMLS_CC);
#else
- zval_to_bson(obj_data, flags, &child, NULL TSRMLS_CC);
+ phongo_zval_to_bson(obj_data, flags, &child, NULL TSRMLS_CC);
#endif
bson_append_document_end(bson, &child);
} else {
bson_append_array_begin(bson, key, key_len, &child);
#if PHP_VERSION_ID >= 70000
- zval_to_bson(&obj_data, flags, &child, NULL TSRMLS_CC);
+ phongo_zval_to_bson(&obj_data, flags, &child, NULL TSRMLS_CC);
#else
- zval_to_bson(obj_data, flags, &child, NULL TSRMLS_CC);
+ phongo_zval_to_bson(obj_data, flags, &child, NULL TSRMLS_CC);
#endif
bson_append_array_end(bson, &child);
}
if (tmp_ht) {
ZEND_HASH_APPLY_COUNT(tmp_ht)--;
}
zval_ptr_dtor(&obj_data);
return;
}
if (instanceof_function(Z_OBJCE_P(object), php_phongo_objectid_ce TSRMLS_CC)) {
bson_oid_t oid;
mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "encoding ObjectId");
php_phongo_objectid_get_id(object, &oid TSRMLS_CC);
bson_append_oid(bson, key, key_len, &oid);
return;
}
if (instanceof_function(Z_OBJCE_P(object), php_phongo_utcdatetime_ce TSRMLS_CC)) {
mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "encoding UTCDateTime");
bson_append_date_time(bson, key, key_len, php_phongo_utcdatetime_get_milliseconds(object TSRMLS_CC));
return;
}
if (instanceof_function(Z_OBJCE_P(object), php_phongo_binary_ce TSRMLS_CC)) {
const unsigned char *data;
size_t data_len;
data_len = php_phongo_binary_get_data(object, (char **)&data TSRMLS_CC);
mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "encoding Binary");
bson_append_binary(bson, key, key_len, php_phongo_binary_get_type(object TSRMLS_CC), data, data_len);
return;
}
if (instanceof_function(Z_OBJCE_P(object), php_phongo_regex_ce TSRMLS_CC)) {
mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "encoding Regex");
bson_append_regex(bson, key, key_len, php_phongo_regex_get_pattern(object TSRMLS_CC), php_phongo_regex_get_flags(object TSRMLS_CC));
return;
}
if (instanceof_function(Z_OBJCE_P(object), php_phongo_javascript_ce TSRMLS_CC)) {
if (php_phongo_javascript_has_scope(object TSRMLS_CC)) {
mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "encoding Javascript with scope");
bson_append_code(bson, key, key_len, php_phongo_javascript_get_javascript(object TSRMLS_CC));
} else {
mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "encoding Javascript without scope");
bson_append_code_with_scope(bson, key, key_len, php_phongo_javascript_get_javascript(object TSRMLS_CC), php_phongo_javascript_get_scope(object TSRMLS_CC));
}
return;
}
if (instanceof_function(Z_OBJCE_P(object), php_phongo_timestamp_ce TSRMLS_CC)) {
mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "encoding Timestamp");
/*
* WHOOPS! libbson swaps the increment/timestamp compared to BSON
*
* "Timestamp - Special internal type used by MongoDB replication and sharding.
* First 4 bytes are an increment, second 4 are a timestamp."
*/
bson_append_timestamp(bson, key, key_len, php_phongo_timestamp_get_timestamp(object TSRMLS_CC), php_phongo_timestamp_get_increment(object TSRMLS_CC));
return;
}
if (instanceof_function(Z_OBJCE_P(object), php_phongo_maxkey_ce TSRMLS_CC)) {
mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "encoding MaxKey");
bson_append_maxkey(bson, key, key_len);
return;
}
if (instanceof_function(Z_OBJCE_P(object), php_phongo_minkey_ce TSRMLS_CC)) {
mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "encoding MinKey");
bson_append_minkey(bson, key, key_len);
return;
}
#if PHP_VERSION_ID >= 70000
phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "Unexpected %s instance: %s", ZSTR_VAL(php_phongo_type_ce->name), ZSTR_VAL(Z_OBJCE_P(object)->name));
#else
phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "Unexpected %s instance: %s", php_phongo_type_ce->name, Z_OBJCE_P(object)->name);
#endif
return;
}
mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "encoding document");
bson_append_document_begin(bson, key, key_len, &child);
- zval_to_bson(object, flags, &child, NULL TSRMLS_CC);
+ phongo_zval_to_bson(object, flags, &child, NULL TSRMLS_CC);
bson_append_document_end(bson, &child);
}
-void phongo_bson_append(bson_t *bson, php_phongo_bson_flags_t flags, const char *key, long key_len, int entry_type, zval *entry TSRMLS_DC)
+
+static void phongo_bson_append(bson_t *bson, php_phongo_bson_flags_t flags, const char *key, long key_len, zval *entry TSRMLS_DC)
{
- switch (entry_type)
+#if PHP_VERSION_ID >= 70000
+try_again:
+#endif
+ switch (Z_TYPE_P(entry))
{
case IS_NULL:
bson_append_null(bson, key, key_len);
break;
#if PHP_VERSION_ID >= 70000
case IS_TRUE:
bson_append_bool(bson, key, key_len, true);
break;
case IS_FALSE:
bson_append_bool(bson, key, key_len, false);
break;
#else
case IS_BOOL:
bson_append_bool(bson, key, key_len, Z_BVAL_P(entry));
break;
#endif
case IS_LONG:
BSON_APPEND_INT(bson, key, key_len, Z_LVAL_P(entry));
break;
case IS_DOUBLE:
bson_append_double(bson, key, key_len, Z_DVAL_P(entry));
break;
case IS_STRING:
if (bson_utf8_validate(Z_STRVAL_P(entry), Z_STRLEN_P(entry), true)) {
bson_append_utf8(bson, key, key_len, Z_STRVAL_P(entry), Z_STRLEN_P(entry));
} else {
phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "Got invalid UTF-8 value serializing '%s'", Z_STRVAL_P(entry));
}
break;
case IS_ARRAY:
if (php_phongo_is_array_or_document(entry TSRMLS_CC) == IS_ARRAY) {
bson_t child;
HashTable *tmp_ht = HASH_OF(entry);
if (tmp_ht) {
ZEND_HASH_APPLY_COUNT(tmp_ht)++;
}
bson_append_array_begin(bson, key, key_len, &child);
- zval_to_bson(entry, flags, &child, NULL TSRMLS_CC);
+ phongo_zval_to_bson(entry, flags, &child, NULL TSRMLS_CC);
bson_append_array_end(bson, &child);
if (tmp_ht) {
ZEND_HASH_APPLY_COUNT(tmp_ht)--;
}
break;
}
/* break intentionally omitted */
case IS_OBJECT:
object_to_bson(entry, flags, key, key_len, bson TSRMLS_CC);
break;
#if PHP_VERSION_ID >= 70000
case IS_INDIRECT:
- phongo_bson_append(bson, flags, key, key_len, Z_TYPE_P(Z_INDIRECT_P(entry)), Z_INDIRECT_P(entry) TSRMLS_DC);
+ phongo_bson_append(bson, flags, key, key_len, Z_INDIRECT_P(entry) TSRMLS_DC);
break;
+
+ case IS_REFERENCE:
+ ZVAL_DEREF(entry);
+ goto try_again;
#endif
default:
- phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "Got unsupported type %d '%s'", entry_type, zend_get_type_by_const(entry_type));
+ phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "Got unsupported type %d '%s'", Z_TYPE_P(entry), zend_get_type_by_const(Z_TYPE_P(entry)));
}
}
#if PHP_VERSION_ID >= 70000
static bool is_public_property(zend_class_entry *ce, zend_string *name, zend_string **member TSRMLS_DC) /* {{{ */
#else
static bool is_public_property(zend_class_entry *ce, const char *prop_name, int prop_name_len TSRMLS_DC) /* {{{ */
#endif
{
zend_property_info *property_info = NULL;
#if PHP_VERSION_ID >= 70000
if (ZSTR_VAL(name)[0] == 0) {
const char *prop_name,
*class_name;
size_t prop_name_len;
zend_unmangle_property_name_ex(name,
&class_name, &prop_name, &prop_name_len);
(*member) = zend_string_init(prop_name, prop_name_len, 0);
} else (*member) = zend_string_copy(name);
property_info = zend_get_property_info(ce, (*member), 1 TSRMLS_CC);
if (!property_info) /* undefined property */
return true;
if (property_info == ZEND_WRONG_PROPERTY_INFO) {
return false;
}
return (property_info->flags & ZEND_ACC_PUBLIC);
#else
zval member;
ZVAL_STRINGL(&member, prop_name, prop_name_len, 0);
property_info = zend_get_property_info(ce, &member, 1 TSRMLS_CC);
return (property_info && (property_info->flags & ZEND_ACC_PUBLIC));
#endif
}
/* }}} */
-PHONGO_API void zval_to_bson(zval *data, php_phongo_bson_flags_t flags, bson_t *bson, bson_t **bson_out TSRMLS_DC) /* {{{ */
+PHONGO_API void phongo_zval_to_bson(zval *data, php_phongo_bson_flags_t flags, bson_t *bson, bson_t **bson_out TSRMLS_DC) /* {{{ */
{
HashTable *ht_data = NULL;
#if PHP_VERSION_ID >= 70000
zval obj_data;
#else
HashPosition pos;
zval *obj_data = NULL;
#endif
/* If we will be encoding a class that may contain protected and private
* properties, we'll need to filter them out later. */
bool ht_data_from_properties = false;
switch(Z_TYPE_P(data)) {
case IS_OBJECT:
if (instanceof_function(Z_OBJCE_P(data), php_phongo_serializable_ce TSRMLS_CC)) {
#if PHP_VERSION_ID >= 70000
zend_call_method_with_0_params(data, NULL, NULL, BSON_SERIALIZE_FUNC_NAME, &obj_data);
#else
zend_call_method_with_0_params(&data, NULL, NULL, BSON_SERIALIZE_FUNC_NAME, &obj_data);
#endif
if (Z_ISUNDEF(obj_data)) {
/* zend_call_method() failed */
break;
}
#if PHP_VERSION_ID >= 70000
if (Z_TYPE(obj_data) != IS_ARRAY && !(Z_TYPE(obj_data) == IS_OBJECT && instanceof_function(Z_OBJCE(obj_data), zend_standard_class_def TSRMLS_CC))) {
#else
if (Z_TYPE_P(obj_data) != IS_ARRAY && !(Z_TYPE_P(obj_data) == IS_OBJECT && instanceof_function(Z_OBJCE_P(obj_data), zend_standard_class_def TSRMLS_CC))) {
#endif
phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC,
"Expected %s::%s() to return an array or stdClass, %s given",
#if PHP_VERSION_ID >= 70000
Z_OBJCE_P(data)->name->val,
#else
Z_OBJCE_P(data)->name,
#endif
BSON_SERIALIZE_FUNC_NAME,
#if PHP_VERSION_ID >= 70000
(Z_TYPE(obj_data) == IS_OBJECT
? Z_OBJCE(obj_data)->name->val
: zend_get_type_by_const(Z_TYPE(obj_data))
#else
(Z_TYPE_P(obj_data) == IS_OBJECT
? Z_OBJCE_P(obj_data)->name
: zend_get_type_by_const(Z_TYPE_P(obj_data))
#endif
)
);
break;
}
#if PHP_VERSION_ID >= 70000
ht_data = HASH_OF(&obj_data);
#else
ht_data = HASH_OF(obj_data);
#endif
if (instanceof_function(Z_OBJCE_P(data), php_phongo_persistable_ce TSRMLS_CC)) {
if (flags & PHONGO_BSON_ADD_ODS) {
#if PHP_VERSION_ID >= 70000
bson_append_binary(bson, PHONGO_ODM_FIELD_NAME, -1, 0x80, (const uint8_t *)Z_OBJCE_P(data)->name->val, Z_OBJCE_P(data)->name->len);
zend_hash_str_del(ht_data, PHONGO_ODM_FIELD_NAME, sizeof(PHONGO_ODM_FIELD_NAME)-1);
#else
bson_append_binary(bson, PHONGO_ODM_FIELD_NAME, -1, 0x80, (const uint8_t *)Z_OBJCE_P(data)->name, strlen(Z_OBJCE_P(data)->name));
zend_hash_del(ht_data, PHONGO_ODM_FIELD_NAME, sizeof(PHONGO_ODM_FIELD_NAME));
#endif
}
}
break;
}
if (instanceof_function(Z_OBJCE_P(data), php_phongo_type_ce TSRMLS_CC)) {
#if PHP_VERSION_ID >= 70000
phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "%s instance %s cannot be serialized as a root element", ZSTR_VAL(php_phongo_type_ce->name), ZSTR_VAL(Z_OBJCE_P(data)->name));
#else
phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "%s instance %s cannot be serialized as a root element", php_phongo_type_ce->name, Z_OBJCE_P(data)->name);
#endif
break;
}
ht_data = Z_OBJ_HT_P(data)->get_properties(data TSRMLS_CC);
ht_data_from_properties = true;
break;
case IS_ARRAY:
ht_data = HASH_OF(data);
break;
default:
return;
}
if (!ht_data || ZEND_HASH_APPLY_COUNT(ht_data) > 1) {
#if PHP_VERSION_ID >= 70000
if (Z_TYPE_P(data) == IS_OBJECT && instanceof_function(Z_OBJCE_P(data), php_phongo_serializable_ce TSRMLS_CC)) {
#endif
if (!Z_ISUNDEF(obj_data)) {
zval_ptr_dtor(&obj_data);
}
#if PHP_VERSION_ID >= 70000
}
#endif
return;
}
#if PHP_VERSION_ID >= 70000
{
zend_string *key;
zend_ulong num_key;
zval *value;
ZEND_HASH_FOREACH_KEY_VAL(ht_data, num_key, key, value) {
if (key) {
if (Z_TYPE_P(data) == IS_OBJECT) {
zend_string *member = NULL;
/* Ignore non-public properties */
if (!instanceof_function(Z_OBJCE_P(data), php_phongo_serializable_ce) &&
!is_public_property(Z_OBJCE_P(data), key, &member TSRMLS_CC)) {
if (member) {
zend_string_release(member);
}
continue;
}
if (flags & PHONGO_BSON_ADD_ID) {
if (!strncmp(member ? ZSTR_VAL(member) : ZSTR_VAL(key), "_id", sizeof("_id")-1)) {
flags &= ~PHONGO_BSON_ADD_ID;
}
}
phongo_bson_append(bson, flags & ~PHONGO_BSON_ADD_ID,
member ? ZSTR_VAL(member) : ZSTR_VAL(key),
member ? ZSTR_LEN(member) : ZSTR_LEN(key),
- Z_TYPE_P(value), value TSRMLS_CC);
+ value TSRMLS_CC);
if (member) {
zend_string_release(member);
}
} else {
if (flags & PHONGO_BSON_ADD_ID) {
if (!strncmp(ZSTR_VAL(key), "_id", sizeof("_id")-1)) {
flags &= ~PHONGO_BSON_ADD_ID;
}
}
- phongo_bson_append(bson, flags & ~PHONGO_BSON_ADD_ID, ZSTR_VAL(key), ZSTR_LEN(key), Z_TYPE_P(value), value TSRMLS_CC);
+ phongo_bson_append(bson, flags & ~PHONGO_BSON_ADD_ID, ZSTR_VAL(key), ZSTR_LEN(key), value TSRMLS_CC);
}
} else {
char numbuf[32];
const char *skey;
unsigned int skey_len = 0;
skey_len = bson_uint32_to_string(num_key, (const char **)&skey, numbuf, sizeof(numbuf));
- phongo_bson_append(bson, flags & ~PHONGO_BSON_ADD_ID, skey, skey_len, Z_TYPE_P(value), value TSRMLS_CC);
+ phongo_bson_append(bson, flags & ~PHONGO_BSON_ADD_ID, skey, skey_len, value TSRMLS_CC);
}
} ZEND_HASH_FOREACH_END();
}
#else
zend_hash_internal_pointer_reset_ex(ht_data, &pos);
for (;; zend_hash_move_forward_ex(ht_data, &pos)) {
unsigned int key_len = 0;
uint64_t index = 0;
char numbuf[32];
char *key = NULL;
zval **entry;
int hash_type = HASH_KEY_NON_EXISTENT;
hash_type = zend_hash_get_current_key_ex(ht_data, &key, &key_len, &index, 0, &pos);
if (hash_type == HASH_KEY_NON_EXISTENT) {
break;
}
if (zend_hash_get_current_data_ex(ht_data, (void **) &entry, &pos) == FAILURE) {
break;
}
if (hash_type == HASH_KEY_IS_STRING) {
if (ht_data_from_properties) {
const char *class_name;
zend_unmangle_property_name(key, key_len-1, &class_name, (const char **)&key);
key_len = strlen(key);
/* Ignore non-public properties */
if (!is_public_property(Z_OBJCE_P(data), key, key_len TSRMLS_CC)) {
continue;
}
} else {
/* Chop off the \0 from string lengths */
key_len -= 1;
}
if (flags & PHONGO_BSON_ADD_ID) {
if (!strncmp(key, "_id", sizeof("_id")-1)) {
flags &= ~PHONGO_BSON_ADD_ID;
}
}
} else {
key_len = bson_uint32_to_string(index, (const char **)&key, numbuf, sizeof(numbuf));
}
- phongo_bson_append(bson, flags & ~PHONGO_BSON_ADD_ID, key, key_len, Z_TYPE_PP(entry), *entry TSRMLS_CC);
+ phongo_bson_append(bson, flags & ~PHONGO_BSON_ADD_ID, key, key_len, *entry TSRMLS_CC);
}
#endif
if (flags & PHONGO_BSON_ADD_ID) {
bson_oid_t oid;
bson_oid_init(&oid, NULL);
bson_append_oid(bson, "_id", strlen("_id"), &oid);
mongoc_log(MONGOC_LOG_LEVEL_TRACE, MONGOC_LOG_DOMAIN, "Added new _id");
if (flags & PHONGO_BSON_RETURN_ID) {
if (bson_out) {
*bson_out = bson_new();
bson_append_oid(*bson_out, "_id", strlen("_id"), &oid);
}
}
}
#if PHP_VERSION_ID >= 70000
if (Z_TYPE_P(data) == IS_OBJECT && instanceof_function(Z_OBJCE_P(data), php_phongo_serializable_ce TSRMLS_CC)) {
#endif
if (!Z_ISUNDEF(obj_data)) {
zval_ptr_dtor(&obj_data);
}
#if PHP_VERSION_ID >= 70000
}
#endif
}
/* }}} */
#if PHP_VERSION_ID >= 70000
-int bson_to_zval(const unsigned char *data, int data_len, zval *zv)
+PHONGO_API int phongo_bson_to_zval(const unsigned char *data, int data_len, zval *zv)
#else
-int bson_to_zval(const unsigned char *data, int data_len, zval **zv)
+PHONGO_API int phongo_bson_to_zval(const unsigned char *data, int data_len, zval **zv)
#endif
{
int retval = 0;
php_phongo_bson_state state = PHONGO_BSON_STATE_INITIALIZER;
- retval = bson_to_zval_ex(data, data_len, &state);
+ retval = phongo_bson_to_zval_ex(data, data_len, &state);
#if PHP_VERSION_ID >= 70000
ZVAL_ZVAL(zv, &state.zchild, 1, 1);
#else
*zv = state.zchild;
#endif
return retval;
}
-int bson_to_zval_ex(const unsigned char *data, int data_len, php_phongo_bson_state *state)
+
+PHONGO_API int phongo_bson_to_zval_ex(const unsigned char *data, int data_len, php_phongo_bson_state *state)
{
bson_reader_t *reader;
bson_iter_t iter;
const bson_t *b;
bool eof = false;
TSRMLS_FETCH();
#if PHP_VERSION_ID < 70000
MAKE_STD_ZVAL(state->zchild);
/* Ensure that state->zchild has a type, since the calling code may want to
* zval_ptr_dtor() it if we throw an exception. */
ZVAL_NULL(state->zchild);
#endif
reader = bson_reader_new_from_data(data, data_len);
if (!(b = bson_reader_read(reader, NULL))) {
phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "Could not read document from BSON reader");
bson_reader_destroy(reader);
return 0;
}
if (!bson_iter_init(&iter, b)) {
phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "Could not initialize BSON iterator");
bson_reader_destroy(reader);
return 0;
}
/* We initialize an array because it will either be returned as-is (native
* array in type map), passed to bsonUnserialize() (ODM class), or used to
* initialize a stdClass object (native object in type map). */
#if PHP_VERSION_ID >= 70000
array_init(&state->zchild);
#else
array_init(state->zchild);
#endif
bson_iter_visit_all(&iter, &php_bson_visitors, state);
/* If php_phongo_bson_visit_binary() finds an ODM class, it should supersede
* a default type map and named root class. */
if (state->odm && state->map.root_type == PHONGO_TYPEMAP_NONE) {
state->map.root_type = PHONGO_TYPEMAP_CLASS;
}
switch (state->map.root_type) {
case PHONGO_TYPEMAP_NATIVE_ARRAY:
/* Nothing to do here */
break;
case PHONGO_TYPEMAP_CLASS: {
#if PHP_VERSION_ID >= 70000
zval obj;
object_init_ex(&obj, state->odm ? state->odm : state->map.root);
zend_call_method_with_1_params(&obj, NULL, NULL, BSON_UNSERIALIZE_FUNC_NAME, NULL, &state->zchild);
zval_ptr_dtor(&state->zchild);
ZVAL_COPY_VALUE(&state->zchild, &obj);
#else
zval *obj = NULL;
MAKE_STD_ZVAL(obj);
object_init_ex(obj, state->odm ? state->odm : state->map.root);
zend_call_method_with_1_params(&obj, NULL, NULL, BSON_UNSERIALIZE_FUNC_NAME, NULL, state->zchild);
zval_ptr_dtor(&state->zchild);
state->zchild = obj;
#endif
break;
}
case PHONGO_TYPEMAP_NATIVE_OBJECT:
default:
#if PHP_VERSION_ID >= 70000
object_and_properties_init(&state->zchild, zend_standard_class_def, Z_ARRVAL(state->zchild));
#else
object_and_properties_init(state->zchild, zend_standard_class_def, Z_ARRVAL_P(state->zchild));
#endif
}
if (bson_reader_read(reader, &eof) || !eof) {
phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "Reading document did not exhaust input buffer");
bson_reader_destroy(reader);
return 0;
}
bson_reader_destroy(reader);
return 1;
}
/* {{{ proto string BSON\fromPHP(array|object $value)
Returns the BSON representation of a PHP value */
PHP_FUNCTION(fromPHP)
{
zval *data;
bson_t *bson;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(this_ptr) SUPPRESS_UNUSED_WARNING(return_value_used) /* We don't use these */
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "A", &data) == FAILURE) {
return;
}
bson = bson_new();
- zval_to_bson(data, PHONGO_BSON_ADD_ODS|PHONGO_BSON_ADD_CHILD_ODS, bson, NULL TSRMLS_CC);
+ phongo_zval_to_bson(data, PHONGO_BSON_ADD_ODS|PHONGO_BSON_ADD_CHILD_ODS, bson, NULL TSRMLS_CC);
PHONGO_RETVAL_STRINGL((const char *) bson_get_data(bson), bson->len);
bson_destroy(bson);
}
/* }}} */
static void apply_classname_to_state(const char *classname, int classname_len, php_phongo_bson_typemap_types *type, zend_class_entry **type_ce TSRMLS_DC)
{
if (!strcasecmp(classname, "array")) {
*type = PHONGO_TYPEMAP_NATIVE_ARRAY;
*type_ce = NULL;
} else if (!strcasecmp(classname, "stdclass") || !strcasecmp(classname, "object")) {
*type = PHONGO_TYPEMAP_NATIVE_OBJECT;
*type_ce = NULL;
} else {
#if PHP_VERSION_ID >= 70000
zend_string* zs_classname = zend_string_init(classname, classname_len, 0);
zend_class_entry *found_ce = zend_fetch_class(zs_classname, ZEND_FETCH_CLASS_AUTO|ZEND_FETCH_CLASS_SILENT TSRMLS_CC);
zend_string_free(zs_classname);
#else
zend_class_entry *found_ce = zend_fetch_class(classname, classname_len, ZEND_FETCH_CLASS_AUTO|ZEND_FETCH_CLASS_SILENT TSRMLS_CC);
#endif
if (!found_ce) {
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Class %s does not exist", classname);
} else if (!PHONGO_IS_CLASS_INSTANTIATABLE(found_ce)) {
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Class %s is not instantiatable", classname);
} else if (!instanceof_function(found_ce, php_phongo_unserializable_ce TSRMLS_CC)) {
phongo_throw_exception(PHONGO_ERROR_INVALID_ARGUMENT TSRMLS_CC, "Class %s does not implement %s\\Unserializable", classname, BSON_NAMESPACE);
} else {
*type = PHONGO_TYPEMAP_CLASS;
*type_ce = found_ce;
}
}
}
-void php_phongo_bson_typemap_to_state(zval *typemap, php_phongo_bson_typemap *map TSRMLS_DC)
+PHONGO_API void phongo_bson_typemap_to_state(zval *typemap, php_phongo_bson_typemap *map TSRMLS_DC)
{
if (typemap) {
char *classname;
int classname_len;
zend_bool classname_free = 0;
classname = php_array_fetchl_string(typemap, "array", sizeof("array")-1, &classname_len, &classname_free);
if (classname_len) {
apply_classname_to_state(classname, classname_len, &map->array_type, &map->array TSRMLS_CC);
}
if (classname_free) {
str_efree(classname);
}
classname = php_array_fetchl_string(typemap, "document", sizeof("document")-1, &classname_len, &classname_free);
if (classname_len) {
apply_classname_to_state(classname, classname_len, &map->document_type, &map->document TSRMLS_CC);
}
if (classname_free) {
str_efree(classname);
}
classname = php_array_fetchl_string(typemap, "root", sizeof("root")-1, &classname_len, &classname_free);
if (classname_len) {
apply_classname_to_state(classname, classname_len, &map->root_type, &map->root TSRMLS_CC);
}
if (classname_free) {
str_efree(classname);
}
}
}
/* {{{ proto array|object BSON\toPHP(string $bson [, array $typemap = array()])
Returns the PHP representation of a BSON value, optionally converting it into a custom class */
PHP_FUNCTION(toPHP)
{
char *data;
phongo_zpp_char_len data_len;
zval *typemap = NULL;
php_phongo_bson_state state = PHONGO_BSON_STATE_INITIALIZER;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(this_ptr) SUPPRESS_UNUSED_WARNING(return_value_used) /* We don't use these */
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|a!", &data, &data_len, &typemap) == FAILURE) {
return;
}
- php_phongo_bson_typemap_to_state(typemap, &state.map TSRMLS_CC);
+ phongo_bson_typemap_to_state(typemap, &state.map TSRMLS_CC);
- if (!bson_to_zval_ex((const unsigned char *)data, data_len, &state)) {
+ if (!phongo_bson_to_zval_ex((const unsigned char *)data, data_len, &state)) {
zval_ptr_dtor(&state.zchild);
RETURN_NULL();
}
#if PHP_VERSION_ID >= 70000
RETURN_ZVAL(&state.zchild, 0, 1);
#else
RETURN_ZVAL(state.zchild, 0, 1);
#endif
}
/* }}} */
/* {{{ proto string BSON\toJSON(string $bson)
Returns the JSON representation of a BSON value */
PHP_FUNCTION(toJSON)
{
char *data;
phongo_zpp_char_len data_len;
const bson_t *b;
bool eof = false;
bson_reader_t *reader;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(this_ptr) SUPPRESS_UNUSED_WARNING(return_value_used) /* We don't use these */
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &data, &data_len) == FAILURE) {
return;
}
reader = bson_reader_new_from_data((const unsigned char *)data, data_len);
b = bson_reader_read(reader, NULL);
if (b) {
char *str;
size_t str_len;
str = bson_as_json(b, &str_len);
PHONGO_RETVAL_STRINGL(str, str_len);
bson_free(str);
} else {
phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "Could not read document from BSON reader");
}
if (bson_reader_read(reader, &eof) || !eof) {
phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "Reading document did not exhaust input buffer");
}
bson_reader_destroy(reader);
}
/* }}} */
/* {{{ proto string BSON\fromJSON(string $json)
Returns the BSON representation of a JSON value */
PHP_FUNCTION(fromJSON)
{
char *data;
phongo_zpp_char_len data_len;
bson_t b = BSON_INITIALIZER;
bson_error_t error;
SUPPRESS_UNUSED_WARNING(return_value_ptr) SUPPRESS_UNUSED_WARNING(this_ptr) SUPPRESS_UNUSED_WARNING(return_value_used) /* We don't use these */
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &data, &data_len) == FAILURE) {
return;
}
if (bson_init_from_json(&b, (const char *)data, data_len, &error)) {
PHONGO_RETVAL_STRINGL((const char *) bson_get_data(&b), b.len);
bson_destroy(&b);
} else {
phongo_throw_exception(PHONGO_ERROR_UNEXPECTED_VALUE TSRMLS_CC, "%s", error.message ? error.message : "Error parsing JSON");
}
}
/* }}} */
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/
diff --git a/mongodb-1.1.1/src/contrib/php-ssl.c b/mongodb-1.1.2/src/contrib/php-ssl.c
similarity index 100%
rename from mongodb-1.1.1/src/contrib/php-ssl.c
rename to mongodb-1.1.2/src/contrib/php-ssl.c
diff --git a/mongodb-1.1.1/src/contrib/php-ssl.h b/mongodb-1.1.2/src/contrib/php-ssl.h
similarity index 100%
rename from mongodb-1.1.1/src/contrib/php-ssl.h
rename to mongodb-1.1.2/src/contrib/php-ssl.h
diff --git a/mongodb-1.1.1/src/contrib/php_array_api.h b/mongodb-1.1.2/src/contrib/php_array_api.h
similarity index 100%
rename from mongodb-1.1.1/src/contrib/php_array_api.h
rename to mongodb-1.1.2/src/contrib/php_array_api.h
diff --git a/mongodb-1.1.1/src/libbson/VERSION_CURRENT b/mongodb-1.1.2/src/libbson/VERSION_CURRENT
similarity index 100%
rename from mongodb-1.1.1/src/libbson/VERSION_CURRENT
rename to mongodb-1.1.2/src/libbson/VERSION_CURRENT
diff --git a/mongodb-1.1.1/src/libbson/VERSION_RELEASED b/mongodb-1.1.2/src/libbson/VERSION_RELEASED
similarity index 100%
rename from mongodb-1.1.1/src/libbson/VERSION_RELEASED
rename to mongodb-1.1.2/src/libbson/VERSION_RELEASED
diff --git a/mongodb-1.1.1/src/libbson/build/autotools/AutoHarden.m4 b/mongodb-1.1.2/src/libbson/build/autotools/AutoHarden.m4
similarity index 100%
rename from mongodb-1.1.1/src/libbson/build/autotools/AutoHarden.m4
rename to mongodb-1.1.2/src/libbson/build/autotools/AutoHarden.m4
diff --git a/mongodb-1.1.1/src/libbson/build/autotools/CheckAtomics.m4 b/mongodb-1.1.2/src/libbson/build/autotools/CheckAtomics.m4
similarity index 100%
rename from mongodb-1.1.1/src/libbson/build/autotools/CheckAtomics.m4
rename to mongodb-1.1.2/src/libbson/build/autotools/CheckAtomics.m4
diff --git a/mongodb-1.1.1/src/libbson/build/autotools/CheckCompiler.m4 b/mongodb-1.1.2/src/libbson/build/autotools/CheckCompiler.m4
similarity index 100%
rename from mongodb-1.1.1/src/libbson/build/autotools/CheckCompiler.m4
rename to mongodb-1.1.2/src/libbson/build/autotools/CheckCompiler.m4
diff --git a/mongodb-1.1.1/src/libbson/build/autotools/CheckHeaders.m4 b/mongodb-1.1.2/src/libbson/build/autotools/CheckHeaders.m4
similarity index 100%
rename from mongodb-1.1.1/src/libbson/build/autotools/CheckHeaders.m4
rename to mongodb-1.1.2/src/libbson/build/autotools/CheckHeaders.m4
diff --git a/mongodb-1.1.1/src/libbson/build/autotools/CheckHost.m4 b/mongodb-1.1.2/src/libbson/build/autotools/CheckHost.m4
similarity index 100%
rename from mongodb-1.1.1/src/libbson/build/autotools/CheckHost.m4
rename to mongodb-1.1.2/src/libbson/build/autotools/CheckHost.m4
diff --git a/mongodb-1.1.1/src/libbson/build/autotools/CheckProgs.m4 b/mongodb-1.1.2/src/libbson/build/autotools/CheckProgs.m4
similarity index 100%
rename from mongodb-1.1.1/src/libbson/build/autotools/CheckProgs.m4
rename to mongodb-1.1.2/src/libbson/build/autotools/CheckProgs.m4
diff --git a/mongodb-1.1.1/src/libbson/build/autotools/CheckTarget.m4 b/mongodb-1.1.2/src/libbson/build/autotools/CheckTarget.m4
similarity index 100%
rename from mongodb-1.1.1/src/libbson/build/autotools/CheckTarget.m4
rename to mongodb-1.1.2/src/libbson/build/autotools/CheckTarget.m4
diff --git a/mongodb-1.1.1/src/libbson/build/autotools/Coverage.m4 b/mongodb-1.1.2/src/libbson/build/autotools/Coverage.m4
similarity index 100%
rename from mongodb-1.1.1/src/libbson/build/autotools/Coverage.m4
rename to mongodb-1.1.2/src/libbson/build/autotools/Coverage.m4
diff --git a/mongodb-1.1.1/src/libbson/build/autotools/Endian.m4 b/mongodb-1.1.2/src/libbson/build/autotools/Endian.m4
similarity index 100%
rename from mongodb-1.1.1/src/libbson/build/autotools/Endian.m4
rename to mongodb-1.1.2/src/libbson/build/autotools/Endian.m4
diff --git a/mongodb-1.1.1/src/libbson/build/autotools/FindDependencies.m4 b/mongodb-1.1.2/src/libbson/build/autotools/FindDependencies.m4
similarity index 100%
rename from mongodb-1.1.1/src/libbson/build/autotools/FindDependencies.m4
rename to mongodb-1.1.2/src/libbson/build/autotools/FindDependencies.m4
diff --git a/mongodb-1.1.1/src/libbson/build/autotools/LDVersionScript.m4 b/mongodb-1.1.2/src/libbson/build/autotools/LDVersionScript.m4
similarity index 100%
rename from mongodb-1.1.1/src/libbson/build/autotools/LDVersionScript.m4
rename to mongodb-1.1.2/src/libbson/build/autotools/LDVersionScript.m4
diff --git a/mongodb-1.1.1/src/libbson/build/autotools/MaintainerFlags.m4 b/mongodb-1.1.2/src/libbson/build/autotools/MaintainerFlags.m4
similarity index 100%
rename from mongodb-1.1.1/src/libbson/build/autotools/MaintainerFlags.m4
rename to mongodb-1.1.2/src/libbson/build/autotools/MaintainerFlags.m4
diff --git a/mongodb-1.1.1/src/libbson/build/autotools/Optimizations.m4 b/mongodb-1.1.2/src/libbson/build/autotools/Optimizations.m4
similarity index 100%
rename from mongodb-1.1.1/src/libbson/build/autotools/Optimizations.m4
rename to mongodb-1.1.2/src/libbson/build/autotools/Optimizations.m4
diff --git a/mongodb-1.1.1/src/libbson/build/autotools/PrintBuildConfiguration.m4 b/mongodb-1.1.2/src/libbson/build/autotools/PrintBuildConfiguration.m4
similarity index 100%
rename from mongodb-1.1.1/src/libbson/build/autotools/PrintBuildConfiguration.m4
rename to mongodb-1.1.2/src/libbson/build/autotools/PrintBuildConfiguration.m4
diff --git a/mongodb-1.1.1/src/libbson/build/autotools/ReadCommandLineArguments.m4 b/mongodb-1.1.2/src/libbson/build/autotools/ReadCommandLineArguments.m4
similarity index 100%
rename from mongodb-1.1.1/src/libbson/build/autotools/ReadCommandLineArguments.m4
rename to mongodb-1.1.2/src/libbson/build/autotools/ReadCommandLineArguments.m4
diff --git a/mongodb-1.1.1/src/libbson/build/autotools/SetupAutomake.m4 b/mongodb-1.1.2/src/libbson/build/autotools/SetupAutomake.m4
similarity index 100%
rename from mongodb-1.1.1/src/libbson/build/autotools/SetupAutomake.m4
rename to mongodb-1.1.2/src/libbson/build/autotools/SetupAutomake.m4
diff --git a/mongodb-1.1.1/src/libbson/build/autotools/SetupLibtool.m4 b/mongodb-1.1.2/src/libbson/build/autotools/SetupLibtool.m4
similarity index 100%
rename from mongodb-1.1.1/src/libbson/build/autotools/SetupLibtool.m4
rename to mongodb-1.1.2/src/libbson/build/autotools/SetupLibtool.m4
diff --git a/mongodb-1.1.1/src/libbson/build/autotools/Versions.m4 b/mongodb-1.1.2/src/libbson/build/autotools/Versions.m4
similarity index 100%
rename from mongodb-1.1.1/src/libbson/build/autotools/Versions.m4
rename to mongodb-1.1.2/src/libbson/build/autotools/Versions.m4
diff --git a/mongodb-1.1.1/src/libbson/build/autotools/m4/ac_check_typedef.m4 b/mongodb-1.1.2/src/libbson/build/autotools/m4/ac_check_typedef.m4
similarity index 100%
rename from mongodb-1.1.1/src/libbson/build/autotools/m4/ac_check_typedef.m4
rename to mongodb-1.1.2/src/libbson/build/autotools/m4/ac_check_typedef.m4
diff --git a/mongodb-1.1.1/src/libbson/build/autotools/m4/ac_compile_check_sizeof.m4 b/mongodb-1.1.2/src/libbson/build/autotools/m4/ac_compile_check_sizeof.m4
similarity index 100%
rename from mongodb-1.1.1/src/libbson/build/autotools/m4/ac_compile_check_sizeof.m4
rename to mongodb-1.1.2/src/libbson/build/autotools/m4/ac_compile_check_sizeof.m4
diff --git a/mongodb-1.1.1/src/libbson/build/autotools/m4/ac_create_stdint_h.m4 b/mongodb-1.1.2/src/libbson/build/autotools/m4/ac_create_stdint_h.m4
similarity index 100%
rename from mongodb-1.1.1/src/libbson/build/autotools/m4/ac_create_stdint_h.m4
rename to mongodb-1.1.2/src/libbson/build/autotools/m4/ac_create_stdint_h.m4
diff --git a/mongodb-1.1.1/src/libbson/build/autotools/m4/as-compiler-flag.m4 b/mongodb-1.1.2/src/libbson/build/autotools/m4/as-compiler-flag.m4
similarity index 100%
rename from mongodb-1.1.1/src/libbson/build/autotools/m4/as-compiler-flag.m4
rename to mongodb-1.1.2/src/libbson/build/autotools/m4/as-compiler-flag.m4
diff --git a/mongodb-1.1.1/src/libbson/build/autotools/m4/ax_check_compile_flag.m4 b/mongodb-1.1.2/src/libbson/build/autotools/m4/ax_check_compile_flag.m4
similarity index 100%
rename from mongodb-1.1.1/src/libbson/build/autotools/m4/ax_check_compile_flag.m4
rename to mongodb-1.1.2/src/libbson/build/autotools/m4/ax_check_compile_flag.m4
diff --git a/mongodb-1.1.1/src/libbson/build/autotools/m4/ax_check_link_flag.m4 b/mongodb-1.1.2/src/libbson/build/autotools/m4/ax_check_link_flag.m4
similarity index 100%
rename from mongodb-1.1.1/src/libbson/build/autotools/m4/ax_check_link_flag.m4
rename to mongodb-1.1.2/src/libbson/build/autotools/m4/ax_check_link_flag.m4
diff --git a/mongodb-1.1.1/src/libbson/build/autotools/m4/ax_pthread.m4 b/mongodb-1.1.2/src/libbson/build/autotools/m4/ax_pthread.m4
similarity index 100%
rename from mongodb-1.1.1/src/libbson/build/autotools/m4/ax_pthread.m4
rename to mongodb-1.1.2/src/libbson/build/autotools/m4/ax_pthread.m4
diff --git a/mongodb-1.1.1/src/libbson/build/autotools/m4/pkg.m4 b/mongodb-1.1.2/src/libbson/build/autotools/m4/pkg.m4
similarity index 100%
rename from mongodb-1.1.1/src/libbson/build/autotools/m4/pkg.m4
rename to mongodb-1.1.2/src/libbson/build/autotools/m4/pkg.m4
diff --git a/mongodb-1.1.1/src/libbson/build/autotools/m4/silent.m4 b/mongodb-1.1.2/src/libbson/build/autotools/m4/silent.m4
similarity index 100%
rename from mongodb-1.1.1/src/libbson/build/autotools/m4/silent.m4
rename to mongodb-1.1.2/src/libbson/build/autotools/m4/silent.m4
diff --git a/mongodb-1.1.1/src/libbson/src/bson/b64_ntop.h b/mongodb-1.1.2/src/libbson/src/bson/b64_ntop.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/b64_ntop.h
rename to mongodb-1.1.2/src/libbson/src/bson/b64_ntop.h
diff --git a/mongodb-1.1.1/src/libbson/src/bson/b64_pton.h b/mongodb-1.1.2/src/libbson/src/bson/b64_pton.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/b64_pton.h
rename to mongodb-1.1.2/src/libbson/src/bson/b64_pton.h
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bcon.c b/mongodb-1.1.2/src/libbson/src/bson/bcon.c
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bcon.c
rename to mongodb-1.1.2/src/libbson/src/bson/bcon.c
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bcon.h b/mongodb-1.1.2/src/libbson/src/bson/bcon.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bcon.h
rename to mongodb-1.1.2/src/libbson/src/bson/bcon.h
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-atomic.c b/mongodb-1.1.2/src/libbson/src/bson/bson-atomic.c
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-atomic.c
rename to mongodb-1.1.2/src/libbson/src/bson/bson-atomic.c
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-atomic.h b/mongodb-1.1.2/src/libbson/src/bson/bson-atomic.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-atomic.h
rename to mongodb-1.1.2/src/libbson/src/bson/bson-atomic.h
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-clock.c b/mongodb-1.1.2/src/libbson/src/bson/bson-clock.c
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-clock.c
rename to mongodb-1.1.2/src/libbson/src/bson/bson-clock.c
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-clock.h b/mongodb-1.1.2/src/libbson/src/bson/bson-clock.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-clock.h
rename to mongodb-1.1.2/src/libbson/src/bson/bson-clock.h
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-compat.h b/mongodb-1.1.2/src/libbson/src/bson/bson-compat.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-compat.h
rename to mongodb-1.1.2/src/libbson/src/bson/bson-compat.h
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-config.h b/mongodb-1.1.2/src/libbson/src/bson/bson-config.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-config.h
rename to mongodb-1.1.2/src/libbson/src/bson/bson-config.h
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-config.h.in b/mongodb-1.1.2/src/libbson/src/bson/bson-config.h.in
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-config.h.in
rename to mongodb-1.1.2/src/libbson/src/bson/bson-config.h.in
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-context-private.h b/mongodb-1.1.2/src/libbson/src/bson/bson-context-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-context-private.h
rename to mongodb-1.1.2/src/libbson/src/bson/bson-context-private.h
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-context.c b/mongodb-1.1.2/src/libbson/src/bson/bson-context.c
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-context.c
rename to mongodb-1.1.2/src/libbson/src/bson/bson-context.c
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-context.h b/mongodb-1.1.2/src/libbson/src/bson/bson-context.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-context.h
rename to mongodb-1.1.2/src/libbson/src/bson/bson-context.h
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-endian.h b/mongodb-1.1.2/src/libbson/src/bson/bson-endian.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-endian.h
rename to mongodb-1.1.2/src/libbson/src/bson/bson-endian.h
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-error.c b/mongodb-1.1.2/src/libbson/src/bson/bson-error.c
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-error.c
rename to mongodb-1.1.2/src/libbson/src/bson/bson-error.c
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-error.h b/mongodb-1.1.2/src/libbson/src/bson/bson-error.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-error.h
rename to mongodb-1.1.2/src/libbson/src/bson/bson-error.h
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-iso8601-private.h b/mongodb-1.1.2/src/libbson/src/bson/bson-iso8601-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-iso8601-private.h
rename to mongodb-1.1.2/src/libbson/src/bson/bson-iso8601-private.h
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-iso8601.c b/mongodb-1.1.2/src/libbson/src/bson/bson-iso8601.c
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-iso8601.c
rename to mongodb-1.1.2/src/libbson/src/bson/bson-iso8601.c
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-iter.c b/mongodb-1.1.2/src/libbson/src/bson/bson-iter.c
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-iter.c
rename to mongodb-1.1.2/src/libbson/src/bson/bson-iter.c
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-iter.h b/mongodb-1.1.2/src/libbson/src/bson/bson-iter.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-iter.h
rename to mongodb-1.1.2/src/libbson/src/bson/bson-iter.h
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-json.c b/mongodb-1.1.2/src/libbson/src/bson/bson-json.c
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-json.c
rename to mongodb-1.1.2/src/libbson/src/bson/bson-json.c
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-json.h b/mongodb-1.1.2/src/libbson/src/bson/bson-json.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-json.h
rename to mongodb-1.1.2/src/libbson/src/bson/bson-json.h
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-keys.c b/mongodb-1.1.2/src/libbson/src/bson/bson-keys.c
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-keys.c
rename to mongodb-1.1.2/src/libbson/src/bson/bson-keys.c
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-keys.h b/mongodb-1.1.2/src/libbson/src/bson/bson-keys.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-keys.h
rename to mongodb-1.1.2/src/libbson/src/bson/bson-keys.h
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-macros.h b/mongodb-1.1.2/src/libbson/src/bson/bson-macros.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-macros.h
rename to mongodb-1.1.2/src/libbson/src/bson/bson-macros.h
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-md5.c b/mongodb-1.1.2/src/libbson/src/bson/bson-md5.c
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-md5.c
rename to mongodb-1.1.2/src/libbson/src/bson/bson-md5.c
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-md5.h b/mongodb-1.1.2/src/libbson/src/bson/bson-md5.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-md5.h
rename to mongodb-1.1.2/src/libbson/src/bson/bson-md5.h
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-memory.c b/mongodb-1.1.2/src/libbson/src/bson/bson-memory.c
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-memory.c
rename to mongodb-1.1.2/src/libbson/src/bson/bson-memory.c
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-memory.h b/mongodb-1.1.2/src/libbson/src/bson/bson-memory.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-memory.h
rename to mongodb-1.1.2/src/libbson/src/bson/bson-memory.h
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-oid.c b/mongodb-1.1.2/src/libbson/src/bson/bson-oid.c
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-oid.c
rename to mongodb-1.1.2/src/libbson/src/bson/bson-oid.c
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-oid.h b/mongodb-1.1.2/src/libbson/src/bson/bson-oid.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-oid.h
rename to mongodb-1.1.2/src/libbson/src/bson/bson-oid.h
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-private.h b/mongodb-1.1.2/src/libbson/src/bson/bson-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-private.h
rename to mongodb-1.1.2/src/libbson/src/bson/bson-private.h
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-reader.c b/mongodb-1.1.2/src/libbson/src/bson/bson-reader.c
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-reader.c
rename to mongodb-1.1.2/src/libbson/src/bson/bson-reader.c
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-reader.h b/mongodb-1.1.2/src/libbson/src/bson/bson-reader.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-reader.h
rename to mongodb-1.1.2/src/libbson/src/bson/bson-reader.h
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-stdint-win32.h b/mongodb-1.1.2/src/libbson/src/bson/bson-stdint-win32.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-stdint-win32.h
rename to mongodb-1.1.2/src/libbson/src/bson/bson-stdint-win32.h
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-stdint.h b/mongodb-1.1.2/src/libbson/src/bson/bson-stdint.h
similarity index 50%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-stdint.h
rename to mongodb-1.1.2/src/libbson/src/bson/bson-stdint.h
index 38716962..00747ffb 100644
--- a/mongodb-1.1.1/src/libbson/src/bson/bson-stdint.h
+++ b/mongodb-1.1.2/src/libbson/src/bson/bson-stdint.h
@@ -1,17 +1,17 @@
#ifndef ___SRC_LIBBSON_SRC_BSON_BSON_STDINT_H
#define ___SRC_LIBBSON_SRC_BSON_BSON_STDINT_H 1
#ifndef _GENERATED_STDINT_H
#define _GENERATED_STDINT_H " "
-/* generated using a gnu compiler version cc (Ubuntu 4.9.2-10ubuntu13) 4.9.2 Copyright (C) 2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */
+/* generated using a gnu compiler version cc (Ubuntu 5.2.1-22ubuntu2) 5.2.1 20151010 Copyright (C) 2015 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */
#include <stdint.h>
/* system headers have good uint64_t */
#ifndef _HAVE_UINT64_T
#define _HAVE_UINT64_T
#endif
/* once */
#endif
#endif
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-string.c b/mongodb-1.1.2/src/libbson/src/bson/bson-string.c
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-string.c
rename to mongodb-1.1.2/src/libbson/src/bson/bson-string.c
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-string.h b/mongodb-1.1.2/src/libbson/src/bson/bson-string.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-string.h
rename to mongodb-1.1.2/src/libbson/src/bson/bson-string.h
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-thread-private.h b/mongodb-1.1.2/src/libbson/src/bson/bson-thread-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-thread-private.h
rename to mongodb-1.1.2/src/libbson/src/bson/bson-thread-private.h
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-timegm-private.h b/mongodb-1.1.2/src/libbson/src/bson/bson-timegm-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-timegm-private.h
rename to mongodb-1.1.2/src/libbson/src/bson/bson-timegm-private.h
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-timegm.c b/mongodb-1.1.2/src/libbson/src/bson/bson-timegm.c
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-timegm.c
rename to mongodb-1.1.2/src/libbson/src/bson/bson-timegm.c
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-types.h b/mongodb-1.1.2/src/libbson/src/bson/bson-types.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-types.h
rename to mongodb-1.1.2/src/libbson/src/bson/bson-types.h
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-utf8.c b/mongodb-1.1.2/src/libbson/src/bson/bson-utf8.c
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-utf8.c
rename to mongodb-1.1.2/src/libbson/src/bson/bson-utf8.c
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-utf8.h b/mongodb-1.1.2/src/libbson/src/bson/bson-utf8.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-utf8.h
rename to mongodb-1.1.2/src/libbson/src/bson/bson-utf8.h
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-value.c b/mongodb-1.1.2/src/libbson/src/bson/bson-value.c
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-value.c
rename to mongodb-1.1.2/src/libbson/src/bson/bson-value.c
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-value.h b/mongodb-1.1.2/src/libbson/src/bson/bson-value.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-value.h
rename to mongodb-1.1.2/src/libbson/src/bson/bson-value.h
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-version-functions.c b/mongodb-1.1.2/src/libbson/src/bson/bson-version-functions.c
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-version-functions.c
rename to mongodb-1.1.2/src/libbson/src/bson/bson-version-functions.c
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-version-functions.h b/mongodb-1.1.2/src/libbson/src/bson/bson-version-functions.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-version-functions.h
rename to mongodb-1.1.2/src/libbson/src/bson/bson-version-functions.h
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-version.h b/mongodb-1.1.2/src/libbson/src/bson/bson-version.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-version.h
rename to mongodb-1.1.2/src/libbson/src/bson/bson-version.h
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-version.h.in b/mongodb-1.1.2/src/libbson/src/bson/bson-version.h.in
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-version.h.in
rename to mongodb-1.1.2/src/libbson/src/bson/bson-version.h.in
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-writer.c b/mongodb-1.1.2/src/libbson/src/bson/bson-writer.c
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-writer.c
rename to mongodb-1.1.2/src/libbson/src/bson/bson-writer.c
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson-writer.h b/mongodb-1.1.2/src/libbson/src/bson/bson-writer.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson-writer.h
rename to mongodb-1.1.2/src/libbson/src/bson/bson-writer.h
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson.c b/mongodb-1.1.2/src/libbson/src/bson/bson.c
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson.c
rename to mongodb-1.1.2/src/libbson/src/bson/bson.c
diff --git a/mongodb-1.1.1/src/libbson/src/bson/bson.h b/mongodb-1.1.2/src/libbson/src/bson/bson.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/bson/bson.h
rename to mongodb-1.1.2/src/libbson/src/bson/bson.h
diff --git a/mongodb-1.1.1/src/libbson/src/yajl/yajl.c b/mongodb-1.1.2/src/libbson/src/yajl/yajl.c
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/yajl/yajl.c
rename to mongodb-1.1.2/src/libbson/src/yajl/yajl.c
diff --git a/mongodb-1.1.1/src/libbson/src/yajl/yajl_alloc.c b/mongodb-1.1.2/src/libbson/src/yajl/yajl_alloc.c
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/yajl/yajl_alloc.c
rename to mongodb-1.1.2/src/libbson/src/yajl/yajl_alloc.c
diff --git a/mongodb-1.1.1/src/libbson/src/yajl/yajl_alloc.h b/mongodb-1.1.2/src/libbson/src/yajl/yajl_alloc.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/yajl/yajl_alloc.h
rename to mongodb-1.1.2/src/libbson/src/yajl/yajl_alloc.h
diff --git a/mongodb-1.1.1/src/libbson/src/yajl/yajl_buf.c b/mongodb-1.1.2/src/libbson/src/yajl/yajl_buf.c
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/yajl/yajl_buf.c
rename to mongodb-1.1.2/src/libbson/src/yajl/yajl_buf.c
diff --git a/mongodb-1.1.1/src/libbson/src/yajl/yajl_buf.h b/mongodb-1.1.2/src/libbson/src/yajl/yajl_buf.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/yajl/yajl_buf.h
rename to mongodb-1.1.2/src/libbson/src/yajl/yajl_buf.h
diff --git a/mongodb-1.1.1/src/libbson/src/yajl/yajl_bytestack.h b/mongodb-1.1.2/src/libbson/src/yajl/yajl_bytestack.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/yajl/yajl_bytestack.h
rename to mongodb-1.1.2/src/libbson/src/yajl/yajl_bytestack.h
diff --git a/mongodb-1.1.1/src/libbson/src/yajl/yajl_common.h b/mongodb-1.1.2/src/libbson/src/yajl/yajl_common.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/yajl/yajl_common.h
rename to mongodb-1.1.2/src/libbson/src/yajl/yajl_common.h
diff --git a/mongodb-1.1.1/src/libbson/src/yajl/yajl_encode.c b/mongodb-1.1.2/src/libbson/src/yajl/yajl_encode.c
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/yajl/yajl_encode.c
rename to mongodb-1.1.2/src/libbson/src/yajl/yajl_encode.c
diff --git a/mongodb-1.1.1/src/libbson/src/yajl/yajl_encode.h b/mongodb-1.1.2/src/libbson/src/yajl/yajl_encode.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/yajl/yajl_encode.h
rename to mongodb-1.1.2/src/libbson/src/yajl/yajl_encode.h
diff --git a/mongodb-1.1.1/src/libbson/src/yajl/yajl_gen.c b/mongodb-1.1.2/src/libbson/src/yajl/yajl_gen.c
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/yajl/yajl_gen.c
rename to mongodb-1.1.2/src/libbson/src/yajl/yajl_gen.c
diff --git a/mongodb-1.1.1/src/libbson/src/yajl/yajl_gen.h b/mongodb-1.1.2/src/libbson/src/yajl/yajl_gen.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/yajl/yajl_gen.h
rename to mongodb-1.1.2/src/libbson/src/yajl/yajl_gen.h
diff --git a/mongodb-1.1.1/src/libbson/src/yajl/yajl_lex.c b/mongodb-1.1.2/src/libbson/src/yajl/yajl_lex.c
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/yajl/yajl_lex.c
rename to mongodb-1.1.2/src/libbson/src/yajl/yajl_lex.c
diff --git a/mongodb-1.1.1/src/libbson/src/yajl/yajl_lex.h b/mongodb-1.1.2/src/libbson/src/yajl/yajl_lex.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/yajl/yajl_lex.h
rename to mongodb-1.1.2/src/libbson/src/yajl/yajl_lex.h
diff --git a/mongodb-1.1.1/src/libbson/src/yajl/yajl_parse.h b/mongodb-1.1.2/src/libbson/src/yajl/yajl_parse.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/yajl/yajl_parse.h
rename to mongodb-1.1.2/src/libbson/src/yajl/yajl_parse.h
diff --git a/mongodb-1.1.1/src/libbson/src/yajl/yajl_parser.c b/mongodb-1.1.2/src/libbson/src/yajl/yajl_parser.c
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/yajl/yajl_parser.c
rename to mongodb-1.1.2/src/libbson/src/yajl/yajl_parser.c
diff --git a/mongodb-1.1.1/src/libbson/src/yajl/yajl_parser.h b/mongodb-1.1.2/src/libbson/src/yajl/yajl_parser.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/yajl/yajl_parser.h
rename to mongodb-1.1.2/src/libbson/src/yajl/yajl_parser.h
diff --git a/mongodb-1.1.1/src/libbson/src/yajl/yajl_tree.c b/mongodb-1.1.2/src/libbson/src/yajl/yajl_tree.c
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/yajl/yajl_tree.c
rename to mongodb-1.1.2/src/libbson/src/yajl/yajl_tree.c
diff --git a/mongodb-1.1.1/src/libbson/src/yajl/yajl_tree.h b/mongodb-1.1.2/src/libbson/src/yajl/yajl_tree.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/yajl/yajl_tree.h
rename to mongodb-1.1.2/src/libbson/src/yajl/yajl_tree.h
diff --git a/mongodb-1.1.1/src/libbson/src/yajl/yajl_version.c b/mongodb-1.1.2/src/libbson/src/yajl/yajl_version.c
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/yajl/yajl_version.c
rename to mongodb-1.1.2/src/libbson/src/yajl/yajl_version.c
diff --git a/mongodb-1.1.1/src/libbson/src/yajl/yajl_version.h b/mongodb-1.1.2/src/libbson/src/yajl/yajl_version.h
similarity index 100%
rename from mongodb-1.1.1/src/libbson/src/yajl/yajl_version.h
rename to mongodb-1.1.2/src/libbson/src/yajl/yajl_version.h
diff --git a/mongodb-1.1.1/src/libmongoc/VERSION_CURRENT b/mongodb-1.1.2/src/libmongoc/VERSION_CURRENT
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/VERSION_CURRENT
rename to mongodb-1.1.2/src/libmongoc/VERSION_CURRENT
diff --git a/mongodb-1.1.1/src/libmongoc/VERSION_RELEASED b/mongodb-1.1.2/src/libmongoc/VERSION_RELEASED
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/VERSION_RELEASED
rename to mongodb-1.1.2/src/libmongoc/VERSION_RELEASED
diff --git a/mongodb-1.1.1/src/libmongoc/build/autotools/AutoHarden.m4 b/mongodb-1.1.2/src/libmongoc/build/autotools/AutoHarden.m4
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/build/autotools/AutoHarden.m4
rename to mongodb-1.1.2/src/libmongoc/build/autotools/AutoHarden.m4
diff --git a/mongodb-1.1.1/src/libmongoc/build/autotools/CheckCompiler.m4 b/mongodb-1.1.2/src/libmongoc/build/autotools/CheckCompiler.m4
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/build/autotools/CheckCompiler.m4
rename to mongodb-1.1.2/src/libmongoc/build/autotools/CheckCompiler.m4
diff --git a/mongodb-1.1.1/src/libmongoc/build/autotools/CheckHost.m4 b/mongodb-1.1.2/src/libmongoc/build/autotools/CheckHost.m4
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/build/autotools/CheckHost.m4
rename to mongodb-1.1.2/src/libmongoc/build/autotools/CheckHost.m4
diff --git a/mongodb-1.1.1/src/libmongoc/build/autotools/CheckProgs.m4 b/mongodb-1.1.2/src/libmongoc/build/autotools/CheckProgs.m4
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/build/autotools/CheckProgs.m4
rename to mongodb-1.1.2/src/libmongoc/build/autotools/CheckProgs.m4
diff --git a/mongodb-1.1.1/src/libmongoc/build/autotools/CheckSSL.m4 b/mongodb-1.1.2/src/libmongoc/build/autotools/CheckSSL.m4
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/build/autotools/CheckSSL.m4
rename to mongodb-1.1.2/src/libmongoc/build/autotools/CheckSSL.m4
diff --git a/mongodb-1.1.1/src/libmongoc/build/autotools/CheckSasl.m4 b/mongodb-1.1.2/src/libmongoc/build/autotools/CheckSasl.m4
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/build/autotools/CheckSasl.m4
rename to mongodb-1.1.2/src/libmongoc/build/autotools/CheckSasl.m4
diff --git a/mongodb-1.1.1/src/libmongoc/build/autotools/CheckTarget.m4 b/mongodb-1.1.2/src/libmongoc/build/autotools/CheckTarget.m4
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/build/autotools/CheckTarget.m4
rename to mongodb-1.1.2/src/libmongoc/build/autotools/CheckTarget.m4
diff --git a/mongodb-1.1.1/src/libmongoc/build/autotools/Coverage.m4 b/mongodb-1.1.2/src/libmongoc/build/autotools/Coverage.m4
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/build/autotools/Coverage.m4
rename to mongodb-1.1.2/src/libmongoc/build/autotools/Coverage.m4
diff --git a/mongodb-1.1.1/src/libmongoc/build/autotools/FindDependencies.m4 b/mongodb-1.1.2/src/libmongoc/build/autotools/FindDependencies.m4
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/build/autotools/FindDependencies.m4
rename to mongodb-1.1.2/src/libmongoc/build/autotools/FindDependencies.m4
diff --git a/mongodb-1.1.1/src/libmongoc/build/autotools/LDVersionScript.m4 b/mongodb-1.1.2/src/libmongoc/build/autotools/LDVersionScript.m4
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/build/autotools/LDVersionScript.m4
rename to mongodb-1.1.2/src/libmongoc/build/autotools/LDVersionScript.m4
diff --git a/mongodb-1.1.1/src/libmongoc/build/autotools/Libbson.m4 b/mongodb-1.1.2/src/libmongoc/build/autotools/Libbson.m4
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/build/autotools/Libbson.m4
rename to mongodb-1.1.2/src/libmongoc/build/autotools/Libbson.m4
diff --git a/mongodb-1.1.1/src/libmongoc/build/autotools/MaintainerFlags.m4 b/mongodb-1.1.2/src/libmongoc/build/autotools/MaintainerFlags.m4
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/build/autotools/MaintainerFlags.m4
rename to mongodb-1.1.2/src/libmongoc/build/autotools/MaintainerFlags.m4
diff --git a/mongodb-1.1.1/src/libmongoc/build/autotools/Optimizations.m4 b/mongodb-1.1.2/src/libmongoc/build/autotools/Optimizations.m4
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/build/autotools/Optimizations.m4
rename to mongodb-1.1.2/src/libmongoc/build/autotools/Optimizations.m4
diff --git a/mongodb-1.1.1/src/libmongoc/build/autotools/PlatformFlags.m4 b/mongodb-1.1.2/src/libmongoc/build/autotools/PlatformFlags.m4
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/build/autotools/PlatformFlags.m4
rename to mongodb-1.1.2/src/libmongoc/build/autotools/PlatformFlags.m4
diff --git a/mongodb-1.1.1/src/libmongoc/build/autotools/PrintBuildConfiguration.m4 b/mongodb-1.1.2/src/libmongoc/build/autotools/PrintBuildConfiguration.m4
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/build/autotools/PrintBuildConfiguration.m4
rename to mongodb-1.1.2/src/libmongoc/build/autotools/PrintBuildConfiguration.m4
diff --git a/mongodb-1.1.1/src/libmongoc/build/autotools/ReadCommandLineArguments.m4 b/mongodb-1.1.2/src/libmongoc/build/autotools/ReadCommandLineArguments.m4
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/build/autotools/ReadCommandLineArguments.m4
rename to mongodb-1.1.2/src/libmongoc/build/autotools/ReadCommandLineArguments.m4
diff --git a/mongodb-1.1.1/src/libmongoc/build/autotools/SetupAutomake.m4 b/mongodb-1.1.2/src/libmongoc/build/autotools/SetupAutomake.m4
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/build/autotools/SetupAutomake.m4
rename to mongodb-1.1.2/src/libmongoc/build/autotools/SetupAutomake.m4
diff --git a/mongodb-1.1.1/src/libmongoc/build/autotools/SetupLibtool.m4 b/mongodb-1.1.2/src/libmongoc/build/autotools/SetupLibtool.m4
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/build/autotools/SetupLibtool.m4
rename to mongodb-1.1.2/src/libmongoc/build/autotools/SetupLibtool.m4
diff --git a/mongodb-1.1.1/src/libmongoc/build/autotools/Versions.m4 b/mongodb-1.1.2/src/libmongoc/build/autotools/Versions.m4
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/build/autotools/Versions.m4
rename to mongodb-1.1.2/src/libmongoc/build/autotools/Versions.m4
diff --git a/mongodb-1.1.1/src/libmongoc/build/autotools/WeakSymbols.m4 b/mongodb-1.1.2/src/libmongoc/build/autotools/WeakSymbols.m4
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/build/autotools/WeakSymbols.m4
rename to mongodb-1.1.2/src/libmongoc/build/autotools/WeakSymbols.m4
diff --git a/mongodb-1.1.1/src/libmongoc/build/autotools/m4/ac_check_typedef.m4 b/mongodb-1.1.2/src/libmongoc/build/autotools/m4/ac_check_typedef.m4
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/build/autotools/m4/ac_check_typedef.m4
rename to mongodb-1.1.2/src/libmongoc/build/autotools/m4/ac_check_typedef.m4
diff --git a/mongodb-1.1.1/src/libmongoc/build/autotools/m4/ac_compile_check_sizeof.m4 b/mongodb-1.1.2/src/libmongoc/build/autotools/m4/ac_compile_check_sizeof.m4
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/build/autotools/m4/ac_compile_check_sizeof.m4
rename to mongodb-1.1.2/src/libmongoc/build/autotools/m4/ac_compile_check_sizeof.m4
diff --git a/mongodb-1.1.1/src/libmongoc/build/autotools/m4/ac_create_stdint_h.m4 b/mongodb-1.1.2/src/libmongoc/build/autotools/m4/ac_create_stdint_h.m4
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/build/autotools/m4/ac_create_stdint_h.m4
rename to mongodb-1.1.2/src/libmongoc/build/autotools/m4/ac_create_stdint_h.m4
diff --git a/mongodb-1.1.1/src/libmongoc/build/autotools/m4/as-compiler-flag.m4 b/mongodb-1.1.2/src/libmongoc/build/autotools/m4/as-compiler-flag.m4
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/build/autotools/m4/as-compiler-flag.m4
rename to mongodb-1.1.2/src/libmongoc/build/autotools/m4/as-compiler-flag.m4
diff --git a/mongodb-1.1.1/src/libmongoc/build/autotools/m4/ax_check_compile_flag.m4 b/mongodb-1.1.2/src/libmongoc/build/autotools/m4/ax_check_compile_flag.m4
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/build/autotools/m4/ax_check_compile_flag.m4
rename to mongodb-1.1.2/src/libmongoc/build/autotools/m4/ax_check_compile_flag.m4
diff --git a/mongodb-1.1.1/src/libmongoc/build/autotools/m4/ax_check_link_flag.m4 b/mongodb-1.1.2/src/libmongoc/build/autotools/m4/ax_check_link_flag.m4
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/build/autotools/m4/ax_check_link_flag.m4
rename to mongodb-1.1.2/src/libmongoc/build/autotools/m4/ax_check_link_flag.m4
diff --git a/mongodb-1.1.1/src/libmongoc/build/autotools/m4/ax_pthread.m4 b/mongodb-1.1.2/src/libmongoc/build/autotools/m4/ax_pthread.m4
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/build/autotools/m4/ax_pthread.m4
rename to mongodb-1.1.2/src/libmongoc/build/autotools/m4/ax_pthread.m4
diff --git a/mongodb-1.1.1/src/libmongoc/build/autotools/m4/pkg.m4 b/mongodb-1.1.2/src/libmongoc/build/autotools/m4/pkg.m4
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/build/autotools/m4/pkg.m4
rename to mongodb-1.1.2/src/libmongoc/build/autotools/m4/pkg.m4
diff --git a/mongodb-1.1.1/src/libmongoc/build/autotools/m4/silent.m4 b/mongodb-1.1.2/src/libmongoc/build/autotools/m4/silent.m4
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/build/autotools/m4/silent.m4
rename to mongodb-1.1.2/src/libmongoc/build/autotools/m4/silent.m4
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-array-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-array-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-array-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-array-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-array.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-array.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-array.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-array.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-async-cmd-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-async-cmd-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-async-cmd-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-async-cmd-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-async-cmd.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-async-cmd.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-async-cmd.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-async-cmd.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-async-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-async-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-async-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-async-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-async.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-async.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-async.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-async.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-b64-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-b64-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-b64-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-b64-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-b64.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-b64.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-b64.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-b64.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-buffer-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-buffer-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-buffer-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-buffer-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-buffer.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-buffer.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-buffer.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-buffer.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-bulk-operation-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-bulk-operation-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-bulk-operation-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-bulk-operation-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-bulk-operation.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-bulk-operation.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-bulk-operation.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-bulk-operation.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-bulk-operation.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-bulk-operation.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-bulk-operation.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-bulk-operation.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-client-pool-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-client-pool-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-client-pool-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-client-pool-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-client-pool.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-client-pool.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-client-pool.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-client-pool.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-client-pool.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-client-pool.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-client-pool.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-client-pool.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-client-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-client-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-client-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-client-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-client.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-client.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-client.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-client.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-client.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-client.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-client.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-client.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-cluster-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-cluster-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-cluster-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-cluster-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-cluster.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-cluster.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-cluster.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-cluster.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-collection-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-collection-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-collection-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-collection-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-collection.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-collection.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-collection.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-collection.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-collection.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-collection.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-collection.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-collection.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-config.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-config.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-config.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-config.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-config.h.in b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-config.h.in
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-config.h.in
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-config.h.in
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-counters-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-counters-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-counters-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-counters-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-counters.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-counters.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-counters.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-counters.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-counters.defs b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-counters.defs
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-counters.defs
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-counters.defs
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-cursor-array-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-cursor-array-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-cursor-array-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-cursor-array-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-cursor-array.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-cursor-array.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-cursor-array.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-cursor-array.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-cursor-cursorid-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-cursor-cursorid-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-cursor-cursorid-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-cursor-cursorid-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-cursor-cursorid.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-cursor-cursorid.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-cursor-cursorid.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-cursor-cursorid.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-cursor-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-cursor-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-cursor-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-cursor-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-cursor-transform-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-cursor-transform-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-cursor-transform-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-cursor-transform-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-cursor-transform.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-cursor-transform.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-cursor-transform.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-cursor-transform.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-cursor.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-cursor.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-cursor.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-cursor.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-cursor.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-cursor.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-cursor.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-cursor.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-database-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-database-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-database-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-database-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-database.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-database.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-database.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-database.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-database.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-database.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-database.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-database.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-errno-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-errno-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-errno-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-errno-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-error.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-error.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-error.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-error.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-find-and-modify-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-find-and-modify-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-find-and-modify-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-find-and-modify-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-find-and-modify.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-find-and-modify.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-find-and-modify.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-find-and-modify.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-find-and-modify.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-find-and-modify.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-find-and-modify.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-find-and-modify.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-flags.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-flags.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-flags.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-flags.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-gridfs-file-list-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-gridfs-file-list-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-gridfs-file-list-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-gridfs-file-list-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-gridfs-file-list.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-gridfs-file-list.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-gridfs-file-list.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-gridfs-file-list.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-gridfs-file-list.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-gridfs-file-list.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-gridfs-file-list.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-gridfs-file-list.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-gridfs-file-page-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-gridfs-file-page-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-gridfs-file-page-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-gridfs-file-page-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-gridfs-file-page.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-gridfs-file-page.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-gridfs-file-page.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-gridfs-file-page.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-gridfs-file-page.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-gridfs-file-page.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-gridfs-file-page.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-gridfs-file-page.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-gridfs-file-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-gridfs-file-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-gridfs-file-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-gridfs-file-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-gridfs-file.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-gridfs-file.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-gridfs-file.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-gridfs-file.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-gridfs-file.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-gridfs-file.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-gridfs-file.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-gridfs-file.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-gridfs-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-gridfs-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-gridfs-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-gridfs-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-gridfs.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-gridfs.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-gridfs.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-gridfs.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-gridfs.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-gridfs.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-gridfs.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-gridfs.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-host-list-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-host-list-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-host-list-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-host-list-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-host-list.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-host-list.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-host-list.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-host-list.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-host-list.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-host-list.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-host-list.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-host-list.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-index.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-index.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-index.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-index.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-index.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-index.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-index.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-index.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-init.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-init.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-init.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-init.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-init.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-init.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-init.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-init.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-iovec.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-iovec.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-iovec.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-iovec.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-list-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-list-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-list-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-list-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-list.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-list.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-list.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-list.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-log-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-log-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-log-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-log-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-log.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-log.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-log.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-log.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-log.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-log.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-log.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-log.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-matcher-op-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-matcher-op-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-matcher-op-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-matcher-op-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-matcher-op.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-matcher-op.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-matcher-op.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-matcher-op.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-matcher-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-matcher-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-matcher-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-matcher-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-matcher.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-matcher.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-matcher.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-matcher.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-matcher.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-matcher.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-matcher.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-matcher.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-memcmp-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-memcmp-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-memcmp-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-memcmp-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-memcmp.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-memcmp.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-memcmp.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-memcmp.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-opcode-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-opcode-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-opcode-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-opcode-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-opcode.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-opcode.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-opcode.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-opcode.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-opcode.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-opcode.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-opcode.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-opcode.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-queue-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-queue-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-queue-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-queue-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-queue.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-queue.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-queue.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-queue.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-rand-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-rand-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-rand-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-rand-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-rand.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-rand.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-rand.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-rand.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-rand.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-rand.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-rand.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-rand.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-read-concern-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-read-concern-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-read-concern-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-read-concern-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-read-concern.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-read-concern.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-read-concern.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-read-concern.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-read-concern.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-read-concern.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-read-concern.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-read-concern.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-read-prefs-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-read-prefs-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-read-prefs-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-read-prefs-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-read-prefs.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-read-prefs.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-read-prefs.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-read-prefs.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-read-prefs.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-read-prefs.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-read-prefs.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-read-prefs.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-rpc-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-rpc-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-rpc-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-rpc-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-rpc.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-rpc.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-rpc.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-rpc.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-sasl-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-sasl-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-sasl-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-sasl-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-sasl.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-sasl.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-sasl.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-sasl.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-scram-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-scram-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-scram-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-scram-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-scram.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-scram.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-scram.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-scram.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-server-description-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-server-description-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-server-description-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-server-description-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-server-description.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-server-description.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-server-description.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-server-description.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-server-description.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-server-description.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-server-description.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-server-description.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-server-stream-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-server-stream-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-server-stream-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-server-stream-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-server-stream.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-server-stream.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-server-stream.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-server-stream.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-set-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-set-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-set-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-set-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-set.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-set.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-set.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-set.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-socket-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-socket-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-socket-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-socket-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-socket.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-socket.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-socket.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-socket.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-socket.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-socket.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-socket.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-socket.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-ssl-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-ssl-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-ssl-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-ssl-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-ssl.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-ssl.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-ssl.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-ssl.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-ssl.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-ssl.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-ssl.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-ssl.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-stream-buffered.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-stream-buffered.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-stream-buffered.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-stream-buffered.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-stream-buffered.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-stream-buffered.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-stream-buffered.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-stream-buffered.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-stream-file.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-stream-file.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-stream-file.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-stream-file.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-stream-file.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-stream-file.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-stream-file.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-stream-file.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-stream-gridfs.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-stream-gridfs.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-stream-gridfs.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-stream-gridfs.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-stream-gridfs.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-stream-gridfs.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-stream-gridfs.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-stream-gridfs.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-stream-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-stream-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-stream-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-stream-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-stream-socket.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-stream-socket.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-stream-socket.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-stream-socket.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-stream-socket.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-stream-socket.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-stream-socket.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-stream-socket.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-stream-tls.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-stream-tls.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-stream-tls.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-stream-tls.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-stream-tls.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-stream-tls.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-stream-tls.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-stream-tls.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-stream.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-stream.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-stream.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-stream.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-stream.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-stream.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-stream.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-stream.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-thread-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-thread-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-thread-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-thread-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-topology-description-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-topology-description-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-topology-description-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-topology-description-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-topology-description.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-topology-description.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-topology-description.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-topology-description.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-topology-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-topology-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-topology-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-topology-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-topology-scanner-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-topology-scanner-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-topology-scanner-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-topology-scanner-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-topology-scanner.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-topology-scanner.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-topology-scanner.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-topology-scanner.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-topology.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-topology.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-topology.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-topology.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-trace.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-trace.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-trace.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-trace.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-uri-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-uri-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-uri-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-uri-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-uri.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-uri.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-uri.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-uri.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-uri.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-uri.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-uri.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-uri.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-util-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-util-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-util-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-util-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-util.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-util.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-util.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-util.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-version-functions.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-version-functions.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-version-functions.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-version-functions.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-version-functions.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-version-functions.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-version-functions.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-version-functions.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-version.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-version.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-version.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-version.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-version.h.in b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-version.h.in
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-version.h.in
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-version.h.in
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-write-command-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-write-command-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-write-command-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-write-command-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-write-command.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-write-command.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-write-command.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-write-command.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-write-concern-private.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-write-concern-private.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-write-concern-private.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-write-concern-private.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-write-concern.c b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-write-concern.c
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-write-concern.c
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-write-concern.c
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-write-concern.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-write-concern.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc-write-concern.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc-write-concern.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/mongoc.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/mongoc.h
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/op-delete.def b/mongodb-1.1.2/src/libmongoc/src/mongoc/op-delete.def
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/op-delete.def
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/op-delete.def
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/op-get-more.def b/mongodb-1.1.2/src/libmongoc/src/mongoc/op-get-more.def
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/op-get-more.def
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/op-get-more.def
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/op-header.def b/mongodb-1.1.2/src/libmongoc/src/mongoc/op-header.def
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/op-header.def
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/op-header.def
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/op-insert.def b/mongodb-1.1.2/src/libmongoc/src/mongoc/op-insert.def
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/op-insert.def
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/op-insert.def
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/op-kill-cursors.def b/mongodb-1.1.2/src/libmongoc/src/mongoc/op-kill-cursors.def
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/op-kill-cursors.def
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/op-kill-cursors.def
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/op-msg.def b/mongodb-1.1.2/src/libmongoc/src/mongoc/op-msg.def
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/op-msg.def
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/op-msg.def
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/op-query.def b/mongodb-1.1.2/src/libmongoc/src/mongoc/op-query.def
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/op-query.def
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/op-query.def
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/op-reply.def b/mongodb-1.1.2/src/libmongoc/src/mongoc/op-reply.def
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/op-reply.def
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/op-reply.def
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/op-update.def b/mongodb-1.1.2/src/libmongoc/src/mongoc/op-update.def
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/op-update.def
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/op-update.def
diff --git a/mongodb-1.1.1/src/libmongoc/src/mongoc/utlist.h b/mongodb-1.1.2/src/libmongoc/src/mongoc/utlist.h
similarity index 100%
rename from mongodb-1.1.1/src/libmongoc/src/mongoc/utlist.h
rename to mongodb-1.1.2/src/libmongoc/src/mongoc/utlist.h
diff --git a/mongodb-1.1.1/tests/bson/bson-binary-001.phpt b/mongodb-1.1.2/tests/bson/bson-binary-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-binary-001.phpt
rename to mongodb-1.1.2/tests/bson/bson-binary-001.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-binary_error-001.phpt b/mongodb-1.1.2/tests/bson/bson-binary_error-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-binary_error-001.phpt
rename to mongodb-1.1.2/tests/bson/bson-binary_error-001.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-binary_error-002.phpt b/mongodb-1.1.2/tests/bson/bson-binary_error-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-binary_error-002.phpt
rename to mongodb-1.1.2/tests/bson/bson-binary_error-002.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-binary_error-003.phpt b/mongodb-1.1.2/tests/bson/bson-binary_error-003.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-binary_error-003.phpt
rename to mongodb-1.1.2/tests/bson/bson-binary_error-003.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-decode-001.phpt b/mongodb-1.1.2/tests/bson/bson-decode-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-decode-001.phpt
rename to mongodb-1.1.2/tests/bson/bson-decode-001.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-decode-002.phpt b/mongodb-1.1.2/tests/bson/bson-decode-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-decode-002.phpt
rename to mongodb-1.1.2/tests/bson/bson-decode-002.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-encode-001.phpt b/mongodb-1.1.2/tests/bson/bson-encode-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-encode-001.phpt
rename to mongodb-1.1.2/tests/bson/bson-encode-001.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-encode-002.phpt b/mongodb-1.1.2/tests/bson/bson-encode-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-encode-002.phpt
rename to mongodb-1.1.2/tests/bson/bson-encode-002.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-encode-003.phpt b/mongodb-1.1.2/tests/bson/bson-encode-003.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-encode-003.phpt
rename to mongodb-1.1.2/tests/bson/bson-encode-003.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-encode-004.phpt b/mongodb-1.1.2/tests/bson/bson-encode-004.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-encode-004.phpt
rename to mongodb-1.1.2/tests/bson/bson-encode-004.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-encode-005.phpt b/mongodb-1.1.2/tests/bson/bson-encode-005.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-encode-005.phpt
rename to mongodb-1.1.2/tests/bson/bson-encode-005.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-fromJSON-001.phpt b/mongodb-1.1.2/tests/bson/bson-fromJSON-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-fromJSON-001.phpt
rename to mongodb-1.1.2/tests/bson/bson-fromJSON-001.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-fromJSON-002.phpt b/mongodb-1.1.2/tests/bson/bson-fromJSON-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-fromJSON-002.phpt
rename to mongodb-1.1.2/tests/bson/bson-fromJSON-002.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-fromJSON_error-001.phpt b/mongodb-1.1.2/tests/bson/bson-fromJSON_error-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-fromJSON_error-001.phpt
rename to mongodb-1.1.2/tests/bson/bson-fromJSON_error-001.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-fromPHP-001.phpt b/mongodb-1.1.2/tests/bson/bson-fromPHP-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-fromPHP-001.phpt
rename to mongodb-1.1.2/tests/bson/bson-fromPHP-001.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-fromPHP-002.phpt b/mongodb-1.1.2/tests/bson/bson-fromPHP-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-fromPHP-002.phpt
rename to mongodb-1.1.2/tests/bson/bson-fromPHP-002.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-fromPHP-003.phpt b/mongodb-1.1.2/tests/bson/bson-fromPHP-003.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-fromPHP-003.phpt
rename to mongodb-1.1.2/tests/bson/bson-fromPHP-003.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-fromPHP_error-001.phpt b/mongodb-1.1.2/tests/bson/bson-fromPHP_error-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-fromPHP_error-001.phpt
rename to mongodb-1.1.2/tests/bson/bson-fromPHP_error-001.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-fromPHP_error-002.phpt b/mongodb-1.1.2/tests/bson/bson-fromPHP_error-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-fromPHP_error-002.phpt
rename to mongodb-1.1.2/tests/bson/bson-fromPHP_error-002.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-fromPHP_error-003.phpt b/mongodb-1.1.2/tests/bson/bson-fromPHP_error-003.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-fromPHP_error-003.phpt
rename to mongodb-1.1.2/tests/bson/bson-fromPHP_error-003.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-generate-document-id.phpt b/mongodb-1.1.2/tests/bson/bson-generate-document-id.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-generate-document-id.phpt
rename to mongodb-1.1.2/tests/bson/bson-generate-document-id.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-javascript-001.phpt b/mongodb-1.1.2/tests/bson/bson-javascript-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-javascript-001.phpt
rename to mongodb-1.1.2/tests/bson/bson-javascript-001.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-javascript-002.phpt b/mongodb-1.1.2/tests/bson/bson-javascript-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-javascript-002.phpt
rename to mongodb-1.1.2/tests/bson/bson-javascript-002.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-javascript_error-001.phpt b/mongodb-1.1.2/tests/bson/bson-javascript_error-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-javascript_error-001.phpt
rename to mongodb-1.1.2/tests/bson/bson-javascript_error-001.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-javascript_error-002.phpt b/mongodb-1.1.2/tests/bson/bson-javascript_error-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-javascript_error-002.phpt
rename to mongodb-1.1.2/tests/bson/bson-javascript_error-002.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-javascript_error-003.phpt b/mongodb-1.1.2/tests/bson/bson-javascript_error-003.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-javascript_error-003.phpt
rename to mongodb-1.1.2/tests/bson/bson-javascript_error-003.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-maxkey-001.phpt b/mongodb-1.1.2/tests/bson/bson-maxkey-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-maxkey-001.phpt
rename to mongodb-1.1.2/tests/bson/bson-maxkey-001.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-maxkey_error-001.phpt b/mongodb-1.1.2/tests/bson/bson-maxkey_error-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-maxkey_error-001.phpt
rename to mongodb-1.1.2/tests/bson/bson-maxkey_error-001.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-maxkey_error-002.phpt b/mongodb-1.1.2/tests/bson/bson-maxkey_error-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-maxkey_error-002.phpt
rename to mongodb-1.1.2/tests/bson/bson-maxkey_error-002.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-minkey-001.phpt b/mongodb-1.1.2/tests/bson/bson-minkey-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-minkey-001.phpt
rename to mongodb-1.1.2/tests/bson/bson-minkey-001.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-minkey_error-001.phpt b/mongodb-1.1.2/tests/bson/bson-minkey_error-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-minkey_error-001.phpt
rename to mongodb-1.1.2/tests/bson/bson-minkey_error-001.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-minkey_error-002.phpt b/mongodb-1.1.2/tests/bson/bson-minkey_error-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-minkey_error-002.phpt
rename to mongodb-1.1.2/tests/bson/bson-minkey_error-002.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-objectid-001.phpt b/mongodb-1.1.2/tests/bson/bson-objectid-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-objectid-001.phpt
rename to mongodb-1.1.2/tests/bson/bson-objectid-001.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-objectid_error-001.phpt b/mongodb-1.1.2/tests/bson/bson-objectid_error-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-objectid_error-001.phpt
rename to mongodb-1.1.2/tests/bson/bson-objectid_error-001.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-objectid_error-002.phpt b/mongodb-1.1.2/tests/bson/bson-objectid_error-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-objectid_error-002.phpt
rename to mongodb-1.1.2/tests/bson/bson-objectid_error-002.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-objectid_error-003.phpt b/mongodb-1.1.2/tests/bson/bson-objectid_error-003.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-objectid_error-003.phpt
rename to mongodb-1.1.2/tests/bson/bson-objectid_error-003.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-ods-001.phpt b/mongodb-1.1.2/tests/bson/bson-ods-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-ods-001.phpt
rename to mongodb-1.1.2/tests/bson/bson-ods-001.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-ods-002.phpt b/mongodb-1.1.2/tests/bson/bson-ods-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-ods-002.phpt
rename to mongodb-1.1.2/tests/bson/bson-ods-002.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-regex-001.phpt b/mongodb-1.1.2/tests/bson/bson-regex-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-regex-001.phpt
rename to mongodb-1.1.2/tests/bson/bson-regex-001.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-regex-002.phpt b/mongodb-1.1.2/tests/bson/bson-regex-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-regex-002.phpt
rename to mongodb-1.1.2/tests/bson/bson-regex-002.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-regex_error-001.phpt b/mongodb-1.1.2/tests/bson/bson-regex_error-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-regex_error-001.phpt
rename to mongodb-1.1.2/tests/bson/bson-regex_error-001.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-regex_error-002.phpt b/mongodb-1.1.2/tests/bson/bson-regex_error-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-regex_error-002.phpt
rename to mongodb-1.1.2/tests/bson/bson-regex_error-002.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-regex_error-003.phpt b/mongodb-1.1.2/tests/bson/bson-regex_error-003.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-regex_error-003.phpt
rename to mongodb-1.1.2/tests/bson/bson-regex_error-003.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-timestamp-001.phpt b/mongodb-1.1.2/tests/bson/bson-timestamp-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-timestamp-001.phpt
rename to mongodb-1.1.2/tests/bson/bson-timestamp-001.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-timestamp-002.phpt b/mongodb-1.1.2/tests/bson/bson-timestamp-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-timestamp-002.phpt
rename to mongodb-1.1.2/tests/bson/bson-timestamp-002.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-timestamp_error-001.phpt b/mongodb-1.1.2/tests/bson/bson-timestamp_error-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-timestamp_error-001.phpt
rename to mongodb-1.1.2/tests/bson/bson-timestamp_error-001.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-timestamp_error-002.phpt b/mongodb-1.1.2/tests/bson/bson-timestamp_error-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-timestamp_error-002.phpt
rename to mongodb-1.1.2/tests/bson/bson-timestamp_error-002.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-timestamp_error-003.phpt b/mongodb-1.1.2/tests/bson/bson-timestamp_error-003.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-timestamp_error-003.phpt
rename to mongodb-1.1.2/tests/bson/bson-timestamp_error-003.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-toJSON-001.phpt b/mongodb-1.1.2/tests/bson/bson-toJSON-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-toJSON-001.phpt
rename to mongodb-1.1.2/tests/bson/bson-toJSON-001.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-toJSON-002.phpt b/mongodb-1.1.2/tests/bson/bson-toJSON-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-toJSON-002.phpt
rename to mongodb-1.1.2/tests/bson/bson-toJSON-002.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-toJSON_error-001.phpt b/mongodb-1.1.2/tests/bson/bson-toJSON_error-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-toJSON_error-001.phpt
rename to mongodb-1.1.2/tests/bson/bson-toJSON_error-001.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-toPHP-001.phpt b/mongodb-1.1.2/tests/bson/bson-toPHP-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-toPHP-001.phpt
rename to mongodb-1.1.2/tests/bson/bson-toPHP-001.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-toPHP-002.phpt b/mongodb-1.1.2/tests/bson/bson-toPHP-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-toPHP-002.phpt
rename to mongodb-1.1.2/tests/bson/bson-toPHP-002.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-toPHP-003.phpt b/mongodb-1.1.2/tests/bson/bson-toPHP-003.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-toPHP-003.phpt
rename to mongodb-1.1.2/tests/bson/bson-toPHP-003.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-toPHP_error-001.phpt b/mongodb-1.1.2/tests/bson/bson-toPHP_error-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-toPHP_error-001.phpt
rename to mongodb-1.1.2/tests/bson/bson-toPHP_error-001.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-toPHP_error-002.phpt b/mongodb-1.1.2/tests/bson/bson-toPHP_error-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-toPHP_error-002.phpt
rename to mongodb-1.1.2/tests/bson/bson-toPHP_error-002.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-unknown-001.phpt b/mongodb-1.1.2/tests/bson/bson-unknown-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-unknown-001.phpt
rename to mongodb-1.1.2/tests/bson/bson-unknown-001.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-utcdatetime-001.phpt b/mongodb-1.1.2/tests/bson/bson-utcdatetime-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-utcdatetime-001.phpt
rename to mongodb-1.1.2/tests/bson/bson-utcdatetime-001.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-utcdatetime-002.phpt b/mongodb-1.1.2/tests/bson/bson-utcdatetime-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-utcdatetime-002.phpt
rename to mongodb-1.1.2/tests/bson/bson-utcdatetime-002.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-utcdatetime-003.phpt b/mongodb-1.1.2/tests/bson/bson-utcdatetime-003.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-utcdatetime-003.phpt
rename to mongodb-1.1.2/tests/bson/bson-utcdatetime-003.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-utcdatetime-todatetime-001.phpt b/mongodb-1.1.2/tests/bson/bson-utcdatetime-todatetime-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-utcdatetime-todatetime-001.phpt
rename to mongodb-1.1.2/tests/bson/bson-utcdatetime-todatetime-001.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-utcdatetime-tostring-001.phpt b/mongodb-1.1.2/tests/bson/bson-utcdatetime-tostring-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-utcdatetime-tostring-001.phpt
rename to mongodb-1.1.2/tests/bson/bson-utcdatetime-tostring-001.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-utcdatetime_error-001.phpt b/mongodb-1.1.2/tests/bson/bson-utcdatetime_error-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-utcdatetime_error-001.phpt
rename to mongodb-1.1.2/tests/bson/bson-utcdatetime_error-001.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-utcdatetime_error-002.phpt b/mongodb-1.1.2/tests/bson/bson-utcdatetime_error-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-utcdatetime_error-002.phpt
rename to mongodb-1.1.2/tests/bson/bson-utcdatetime_error-002.phpt
diff --git a/mongodb-1.1.1/tests/bson/bson-utcdatetime_error-003.phpt b/mongodb-1.1.2/tests/bson/bson-utcdatetime_error-003.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bson-utcdatetime_error-003.phpt
rename to mongodb-1.1.2/tests/bson/bson-utcdatetime_error-003.phpt
diff --git a/mongodb-1.1.1/tests/bson/bug0274.phpt b/mongodb-1.1.2/tests/bson/bug0274.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bug0274.phpt
rename to mongodb-1.1.2/tests/bson/bug0274.phpt
diff --git a/mongodb-1.1.1/tests/bson/bug0325.phpt b/mongodb-1.1.2/tests/bson/bug0325.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bug0325.phpt
rename to mongodb-1.1.2/tests/bson/bug0325.phpt
diff --git a/mongodb-1.1.1/tests/bson/bug0334-001.phpt b/mongodb-1.1.2/tests/bson/bug0334-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bug0334-001.phpt
rename to mongodb-1.1.2/tests/bson/bug0334-001.phpt
diff --git a/mongodb-1.1.1/tests/bson/bug0334-002.phpt b/mongodb-1.1.2/tests/bson/bug0334-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bug0334-002.phpt
rename to mongodb-1.1.2/tests/bson/bug0334-002.phpt
diff --git a/mongodb-1.1.1/tests/bson/bug0341.phpt b/mongodb-1.1.2/tests/bson/bug0341.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bug0341.phpt
rename to mongodb-1.1.2/tests/bson/bug0341.phpt
diff --git a/mongodb-1.1.1/tests/bson/bug0347.phpt b/mongodb-1.1.2/tests/bson/bug0347.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/bug0347.phpt
rename to mongodb-1.1.2/tests/bson/bug0347.phpt
diff --git a/mongodb-1.1.2/tests/bson/bug0528.phpt b/mongodb-1.1.2/tests/bson/bug0528.phpt
new file mode 100644
index 00000000..e4ed2944
--- /dev/null
+++ b/mongodb-1.1.2/tests/bson/bug0528.phpt
@@ -0,0 +1,20 @@
+--TEST--
+PHPC-528: Cannot append reference to BSON
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+$embedded = ['foo'];
+$data = ['embedded' => &$embedded];
+
+$bson = fromPHP($data);
+echo toJson(fromPHP($data)), "\n";
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECT--
+{ "embedded" : [ "foo" ] }
+===DONE===
diff --git a/mongodb-1.1.1/tests/writeConcern/writeconcern-constants.phpt b/mongodb-1.1.2/tests/bson/bug0531.phpt
similarity index 58%
copy from mongodb-1.1.1/tests/writeConcern/writeconcern-constants.phpt
copy to mongodb-1.1.2/tests/bson/bug0531.phpt
index 40318982..2eb28599 100644
--- a/mongodb-1.1.1/tests/writeConcern/writeconcern-constants.phpt
+++ b/mongodb-1.1.2/tests/bson/bug0531.phpt
@@ -1,16 +1,18 @@
--TEST--
-MongoDB\Driver\WriteConcern constants
+PHPC-531: Segfault on invalid BSON
--SKIPIF--
<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";
-var_dump(MongoDB\Driver\WriteConcern::MAJORITY);
+$src = fromPHP(["hello" => "world"]);
+$src[4] = 1;
+$arr = MongoDB\BSON\toPHP($src);
?>
===DONE===
<?php exit(0); ?>
---EXPECTF--
-string(8) "majority"
+--EXPECT--
+
===DONE===
diff --git a/mongodb-1.1.1/tests/bson/typemap-001.phpt b/mongodb-1.1.2/tests/bson/typemap-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/typemap-001.phpt
rename to mongodb-1.1.2/tests/bson/typemap-001.phpt
diff --git a/mongodb-1.1.1/tests/bson/typemap-002.phpt b/mongodb-1.1.2/tests/bson/typemap-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bson/typemap-002.phpt
rename to mongodb-1.1.2/tests/bson/typemap-002.phpt
diff --git a/mongodb-1.1.1/tests/bulk/write-0001.phpt b/mongodb-1.1.2/tests/bulk/write-0001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bulk/write-0001.phpt
rename to mongodb-1.1.2/tests/bulk/write-0001.phpt
diff --git a/mongodb-1.1.1/tests/bulk/write-0002.phpt b/mongodb-1.1.2/tests/bulk/write-0002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/bulk/write-0002.phpt
rename to mongodb-1.1.2/tests/bulk/write-0002.phpt
diff --git a/mongodb-1.1.1/tests/connect/replicaset-seedlist-001.phpt b/mongodb-1.1.2/tests/connect/replicaset-seedlist-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/connect/replicaset-seedlist-001.phpt
rename to mongodb-1.1.2/tests/connect/replicaset-seedlist-001.phpt
diff --git a/mongodb-1.1.1/tests/connect/replicaset-seedlist-002.phpt b/mongodb-1.1.2/tests/connect/replicaset-seedlist-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/connect/replicaset-seedlist-002.phpt
rename to mongodb-1.1.2/tests/connect/replicaset-seedlist-002.phpt
diff --git a/mongodb-1.1.1/tests/connect/standalone-auth-0001.phpt b/mongodb-1.1.2/tests/connect/standalone-auth-0001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/connect/standalone-auth-0001.phpt
rename to mongodb-1.1.2/tests/connect/standalone-auth-0001.phpt
diff --git a/mongodb-1.1.1/tests/connect/standalone-auth-0002.phpt b/mongodb-1.1.2/tests/connect/standalone-auth-0002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/connect/standalone-auth-0002.phpt
rename to mongodb-1.1.2/tests/connect/standalone-auth-0002.phpt
diff --git a/mongodb-1.1.1/tests/connect/standalone-plain-0001.phpt b/mongodb-1.1.2/tests/connect/standalone-plain-0001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/connect/standalone-plain-0001.phpt
rename to mongodb-1.1.2/tests/connect/standalone-plain-0001.phpt
diff --git a/mongodb-1.1.1/tests/connect/standalone-plain-0002.phpt b/mongodb-1.1.2/tests/connect/standalone-plain-0002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/connect/standalone-plain-0002.phpt
rename to mongodb-1.1.2/tests/connect/standalone-plain-0002.phpt
diff --git a/mongodb-1.1.1/tests/connect/standalone-ssl-0001.phpt b/mongodb-1.1.2/tests/connect/standalone-ssl-0001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/connect/standalone-ssl-0001.phpt
rename to mongodb-1.1.2/tests/connect/standalone-ssl-0001.phpt
diff --git a/mongodb-1.1.1/tests/connect/standalone-ssl-0002.phpt b/mongodb-1.1.2/tests/connect/standalone-ssl-0002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/connect/standalone-ssl-0002.phpt
rename to mongodb-1.1.2/tests/connect/standalone-ssl-0002.phpt
diff --git a/mongodb-1.1.1/tests/connect/standalone-ssl-0003.phpt b/mongodb-1.1.2/tests/connect/standalone-ssl-0003.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/connect/standalone-ssl-0003.phpt
rename to mongodb-1.1.2/tests/connect/standalone-ssl-0003.phpt
diff --git a/mongodb-1.1.1/tests/connect/standalone-ssl-0004.phpt b/mongodb-1.1.2/tests/connect/standalone-ssl-0004.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/connect/standalone-ssl-0004.phpt
rename to mongodb-1.1.2/tests/connect/standalone-ssl-0004.phpt
diff --git a/mongodb-1.1.1/tests/connect/standalone-ssl-0005.phpt b/mongodb-1.1.2/tests/connect/standalone-ssl-0005.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/connect/standalone-ssl-0005.phpt
rename to mongodb-1.1.2/tests/connect/standalone-ssl-0005.phpt
diff --git a/mongodb-1.1.1/tests/connect/standalone-ssl-0006.phpt b/mongodb-1.1.2/tests/connect/standalone-ssl-0006.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/connect/standalone-ssl-0006.phpt
rename to mongodb-1.1.2/tests/connect/standalone-ssl-0006.phpt
diff --git a/mongodb-1.1.1/tests/connect/standalone-x509-0001.phpt b/mongodb-1.1.2/tests/connect/standalone-x509-0001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/connect/standalone-x509-0001.phpt
rename to mongodb-1.1.2/tests/connect/standalone-x509-0001.phpt
diff --git a/mongodb-1.1.1/tests/connect/standalone-x509-0002.phpt b/mongodb-1.1.2/tests/connect/standalone-x509-0002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/connect/standalone-x509-0002.phpt
rename to mongodb-1.1.2/tests/connect/standalone-x509-0002.phpt
diff --git a/mongodb-1.1.1/tests/connect/standalone-x509-0003.phpt b/mongodb-1.1.2/tests/connect/standalone-x509-0003.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/connect/standalone-x509-0003.phpt
rename to mongodb-1.1.2/tests/connect/standalone-x509-0003.phpt
diff --git a/mongodb-1.1.1/tests/connect/standalone-x509-0004.phpt b/mongodb-1.1.2/tests/connect/standalone-x509-0004.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/connect/standalone-x509-0004.phpt
rename to mongodb-1.1.2/tests/connect/standalone-x509-0004.phpt
diff --git a/mongodb-1.1.1/tests/connect/standalone-x509-error-0001.phpt b/mongodb-1.1.2/tests/connect/standalone-x509-error-0001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/connect/standalone-x509-error-0001.phpt
rename to mongodb-1.1.2/tests/connect/standalone-x509-error-0001.phpt
diff --git a/mongodb-1.1.1/tests/functional/cursor-001.phpt b/mongodb-1.1.2/tests/functional/cursor-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/functional/cursor-001.phpt
rename to mongodb-1.1.2/tests/functional/cursor-001.phpt
diff --git a/mongodb-1.1.1/tests/functional/cursorid-001.phpt b/mongodb-1.1.2/tests/functional/cursorid-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/functional/cursorid-001.phpt
rename to mongodb-1.1.2/tests/functional/cursorid-001.phpt
diff --git a/mongodb-1.1.1/tests/functional/phpinfo-1.phpt b/mongodb-1.1.2/tests/functional/phpinfo-1.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/functional/phpinfo-1.phpt
rename to mongodb-1.1.2/tests/functional/phpinfo-1.phpt
diff --git a/mongodb-1.1.1/tests/functional/phpinfo-2.phpt b/mongodb-1.1.2/tests/functional/phpinfo-2.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/functional/phpinfo-2.phpt
rename to mongodb-1.1.2/tests/functional/phpinfo-2.phpt
diff --git a/mongodb-1.1.1/tests/functional/query-sort-001.phpt b/mongodb-1.1.2/tests/functional/query-sort-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/functional/query-sort-001.phpt
rename to mongodb-1.1.2/tests/functional/query-sort-001.phpt
diff --git a/mongodb-1.1.1/tests/functional/query-sort-002.phpt b/mongodb-1.1.2/tests/functional/query-sort-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/functional/query-sort-002.phpt
rename to mongodb-1.1.2/tests/functional/query-sort-002.phpt
diff --git a/mongodb-1.1.1/tests/functional/query-sort-003.phpt b/mongodb-1.1.2/tests/functional/query-sort-003.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/functional/query-sort-003.phpt
rename to mongodb-1.1.2/tests/functional/query-sort-003.phpt
diff --git a/mongodb-1.1.1/tests/functional/query-sort-004.phpt b/mongodb-1.1.2/tests/functional/query-sort-004.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/functional/query-sort-004.phpt
rename to mongodb-1.1.2/tests/functional/query-sort-004.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-ctor-001.phpt b/mongodb-1.1.2/tests/manager/manager-ctor-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-ctor-001.phpt
rename to mongodb-1.1.2/tests/manager/manager-ctor-001.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-ctor-002.phpt b/mongodb-1.1.2/tests/manager/manager-ctor-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-ctor-002.phpt
rename to mongodb-1.1.2/tests/manager/manager-ctor-002.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-ctor_error-001.phpt b/mongodb-1.1.2/tests/manager/manager-ctor_error-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-ctor_error-001.phpt
rename to mongodb-1.1.2/tests/manager/manager-ctor_error-001.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-ctor_error-002.phpt b/mongodb-1.1.2/tests/manager/manager-ctor_error-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-ctor_error-002.phpt
rename to mongodb-1.1.2/tests/manager/manager-ctor_error-002.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-ctor_error-003.phpt b/mongodb-1.1.2/tests/manager/manager-ctor_error-003.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-ctor_error-003.phpt
rename to mongodb-1.1.2/tests/manager/manager-ctor_error-003.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-ctor_error-004.phpt b/mongodb-1.1.2/tests/manager/manager-ctor_error-004.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-ctor_error-004.phpt
rename to mongodb-1.1.2/tests/manager/manager-ctor_error-004.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-debug-001.phpt b/mongodb-1.1.2/tests/manager/manager-debug-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-debug-001.phpt
rename to mongodb-1.1.2/tests/manager/manager-debug-001.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-debug-002.phpt b/mongodb-1.1.2/tests/manager/manager-debug-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-debug-002.phpt
rename to mongodb-1.1.2/tests/manager/manager-debug-002.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-debug-003.phpt b/mongodb-1.1.2/tests/manager/manager-debug-003.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-debug-003.phpt
rename to mongodb-1.1.2/tests/manager/manager-debug-003.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-destruct-001.phpt b/mongodb-1.1.2/tests/manager/manager-destruct-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-destruct-001.phpt
rename to mongodb-1.1.2/tests/manager/manager-destruct-001.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-executeBulkWrite-001.phpt b/mongodb-1.1.2/tests/manager/manager-executeBulkWrite-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-executeBulkWrite-001.phpt
rename to mongodb-1.1.2/tests/manager/manager-executeBulkWrite-001.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-executeBulkWrite-002.phpt b/mongodb-1.1.2/tests/manager/manager-executeBulkWrite-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-executeBulkWrite-002.phpt
rename to mongodb-1.1.2/tests/manager/manager-executeBulkWrite-002.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-executeBulkWrite-003.phpt b/mongodb-1.1.2/tests/manager/manager-executeBulkWrite-003.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-executeBulkWrite-003.phpt
rename to mongodb-1.1.2/tests/manager/manager-executeBulkWrite-003.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-executeBulkWrite-004.phpt b/mongodb-1.1.2/tests/manager/manager-executeBulkWrite-004.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-executeBulkWrite-004.phpt
rename to mongodb-1.1.2/tests/manager/manager-executeBulkWrite-004.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-executeBulkWrite-005.phpt b/mongodb-1.1.2/tests/manager/manager-executeBulkWrite-005.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-executeBulkWrite-005.phpt
rename to mongodb-1.1.2/tests/manager/manager-executeBulkWrite-005.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-executeBulkWrite-006.phpt b/mongodb-1.1.2/tests/manager/manager-executeBulkWrite-006.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-executeBulkWrite-006.phpt
rename to mongodb-1.1.2/tests/manager/manager-executeBulkWrite-006.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-executeBulkWrite-007.phpt b/mongodb-1.1.2/tests/manager/manager-executeBulkWrite-007.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-executeBulkWrite-007.phpt
rename to mongodb-1.1.2/tests/manager/manager-executeBulkWrite-007.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-executeBulkWrite-008.phpt b/mongodb-1.1.2/tests/manager/manager-executeBulkWrite-008.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-executeBulkWrite-008.phpt
rename to mongodb-1.1.2/tests/manager/manager-executeBulkWrite-008.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-executeBulkWrite-009.phpt b/mongodb-1.1.2/tests/manager/manager-executeBulkWrite-009.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-executeBulkWrite-009.phpt
rename to mongodb-1.1.2/tests/manager/manager-executeBulkWrite-009.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-executeBulkWrite-010.phpt b/mongodb-1.1.2/tests/manager/manager-executeBulkWrite-010.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-executeBulkWrite-010.phpt
rename to mongodb-1.1.2/tests/manager/manager-executeBulkWrite-010.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-executeBulkWrite-011.phpt b/mongodb-1.1.2/tests/manager/manager-executeBulkWrite-011.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-executeBulkWrite-011.phpt
rename to mongodb-1.1.2/tests/manager/manager-executeBulkWrite-011.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-executeBulkWrite_error-001.phpt b/mongodb-1.1.2/tests/manager/manager-executeBulkWrite_error-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-executeBulkWrite_error-001.phpt
rename to mongodb-1.1.2/tests/manager/manager-executeBulkWrite_error-001.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-executeBulkWrite_error-002.phpt b/mongodb-1.1.2/tests/manager/manager-executeBulkWrite_error-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-executeBulkWrite_error-002.phpt
rename to mongodb-1.1.2/tests/manager/manager-executeBulkWrite_error-002.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-executeBulkWrite_error-003.phpt b/mongodb-1.1.2/tests/manager/manager-executeBulkWrite_error-003.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-executeBulkWrite_error-003.phpt
rename to mongodb-1.1.2/tests/manager/manager-executeBulkWrite_error-003.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-executeBulkWrite_error-004.phpt b/mongodb-1.1.2/tests/manager/manager-executeBulkWrite_error-004.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-executeBulkWrite_error-004.phpt
rename to mongodb-1.1.2/tests/manager/manager-executeBulkWrite_error-004.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-executeBulkWrite_error-005.phpt b/mongodb-1.1.2/tests/manager/manager-executeBulkWrite_error-005.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-executeBulkWrite_error-005.phpt
rename to mongodb-1.1.2/tests/manager/manager-executeBulkWrite_error-005.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-executeBulkWrite_error-006.phpt b/mongodb-1.1.2/tests/manager/manager-executeBulkWrite_error-006.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-executeBulkWrite_error-006.phpt
rename to mongodb-1.1.2/tests/manager/manager-executeBulkWrite_error-006.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-executeCommand-001.phpt b/mongodb-1.1.2/tests/manager/manager-executeCommand-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-executeCommand-001.phpt
rename to mongodb-1.1.2/tests/manager/manager-executeCommand-001.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-executeQuery-001.phpt b/mongodb-1.1.2/tests/manager/manager-executeQuery-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-executeQuery-001.phpt
rename to mongodb-1.1.2/tests/manager/manager-executeQuery-001.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-executeQuery-002.phpt b/mongodb-1.1.2/tests/manager/manager-executeQuery-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-executeQuery-002.phpt
rename to mongodb-1.1.2/tests/manager/manager-executeQuery-002.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-executeQuery-005.phpt b/mongodb-1.1.2/tests/manager/manager-executeQuery-005.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-executeQuery-005.phpt
rename to mongodb-1.1.2/tests/manager/manager-executeQuery-005.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-executequery-without-assignment.phpt b/mongodb-1.1.2/tests/manager/manager-executequery-without-assignment.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-executequery-without-assignment.phpt
rename to mongodb-1.1.2/tests/manager/manager-executequery-without-assignment.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-getreadconcern-001.phpt b/mongodb-1.1.2/tests/manager/manager-getreadconcern-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-getreadconcern-001.phpt
rename to mongodb-1.1.2/tests/manager/manager-getreadconcern-001.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-getreadpreference-001.phpt b/mongodb-1.1.2/tests/manager/manager-getreadpreference-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-getreadpreference-001.phpt
rename to mongodb-1.1.2/tests/manager/manager-getreadpreference-001.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-getservers-001.phpt b/mongodb-1.1.2/tests/manager/manager-getservers-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-getservers-001.phpt
rename to mongodb-1.1.2/tests/manager/manager-getservers-001.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-getservers-002.phpt b/mongodb-1.1.2/tests/manager/manager-getservers-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-getservers-002.phpt
rename to mongodb-1.1.2/tests/manager/manager-getservers-002.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-getwriteconcern-001.phpt b/mongodb-1.1.2/tests/manager/manager-getwriteconcern-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-getwriteconcern-001.phpt
rename to mongodb-1.1.2/tests/manager/manager-getwriteconcern-001.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-invalidnamespace.phpt b/mongodb-1.1.2/tests/manager/manager-invalidnamespace.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-invalidnamespace.phpt
rename to mongodb-1.1.2/tests/manager/manager-invalidnamespace.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-selectserver-001.phpt b/mongodb-1.1.2/tests/manager/manager-selectserver-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-selectserver-001.phpt
rename to mongodb-1.1.2/tests/manager/manager-selectserver-001.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-set-uri-options-001.phpt b/mongodb-1.1.2/tests/manager/manager-set-uri-options-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-set-uri-options-001.phpt
rename to mongodb-1.1.2/tests/manager/manager-set-uri-options-001.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-set-uri-options-002.phpt b/mongodb-1.1.2/tests/manager/manager-set-uri-options-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-set-uri-options-002.phpt
rename to mongodb-1.1.2/tests/manager/manager-set-uri-options-002.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-var-dump-001.phpt b/mongodb-1.1.2/tests/manager/manager-var-dump-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-var-dump-001.phpt
rename to mongodb-1.1.2/tests/manager/manager-var-dump-001.phpt
diff --git a/mongodb-1.1.1/tests/manager/manager-wakeup.phpt b/mongodb-1.1.2/tests/manager/manager-wakeup.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/manager/manager-wakeup.phpt
rename to mongodb-1.1.2/tests/manager/manager-wakeup.phpt
diff --git a/mongodb-1.1.1/tests/readPreference/bug0146-001.phpt b/mongodb-1.1.2/tests/readPreference/bug0146-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/readPreference/bug0146-001.phpt
rename to mongodb-1.1.2/tests/readPreference/bug0146-001.phpt
diff --git a/mongodb-1.1.1/tests/readPreference/bug0146-002.phpt b/mongodb-1.1.2/tests/readPreference/bug0146-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/readPreference/bug0146-002.phpt
rename to mongodb-1.1.2/tests/readPreference/bug0146-002.phpt
diff --git a/mongodb-1.1.1/tests/readPreference/readpreference-ctor-001.phpt b/mongodb-1.1.2/tests/readPreference/readpreference-ctor-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/readPreference/readpreference-ctor-001.phpt
rename to mongodb-1.1.2/tests/readPreference/readpreference-ctor-001.phpt
diff --git a/mongodb-1.1.1/tests/readPreference/readpreference-ctor_error-001.phpt b/mongodb-1.1.2/tests/readPreference/readpreference-ctor_error-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/readPreference/readpreference-ctor_error-001.phpt
rename to mongodb-1.1.2/tests/readPreference/readpreference-ctor_error-001.phpt
diff --git a/mongodb-1.1.1/tests/readPreference/readpreference-getMode-001.phpt b/mongodb-1.1.2/tests/readPreference/readpreference-getMode-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/readPreference/readpreference-getMode-001.phpt
rename to mongodb-1.1.2/tests/readPreference/readpreference-getMode-001.phpt
diff --git a/mongodb-1.1.1/tests/readPreference/readpreference-getTagSets-001.phpt b/mongodb-1.1.2/tests/readPreference/readpreference-getTagSets-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/readPreference/readpreference-getTagSets-001.phpt
rename to mongodb-1.1.2/tests/readPreference/readpreference-getTagSets-001.phpt
diff --git a/mongodb-1.1.1/tests/server/server-constants.phpt b/mongodb-1.1.2/tests/server/server-constants.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/server/server-constants.phpt
rename to mongodb-1.1.2/tests/server/server-constants.phpt
diff --git a/mongodb-1.1.1/tests/server/server-construct-001.phpt b/mongodb-1.1.2/tests/server/server-construct-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/server/server-construct-001.phpt
rename to mongodb-1.1.2/tests/server/server-construct-001.phpt
diff --git a/mongodb-1.1.1/tests/server/server-debug.phpt b/mongodb-1.1.2/tests/server/server-debug.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/server/server-debug.phpt
rename to mongodb-1.1.2/tests/server/server-debug.phpt
diff --git a/mongodb-1.1.1/tests/server/server-errors.phpt b/mongodb-1.1.2/tests/server/server-errors.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/server/server-errors.phpt
rename to mongodb-1.1.2/tests/server/server-errors.phpt
diff --git a/mongodb-1.1.1/tests/server/server-executeBulkWrite-001.phpt b/mongodb-1.1.2/tests/server/server-executeBulkWrite-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/server/server-executeBulkWrite-001.phpt
rename to mongodb-1.1.2/tests/server/server-executeBulkWrite-001.phpt
diff --git a/mongodb-1.1.1/tests/server/server-executeBulkWrite-002.phpt b/mongodb-1.1.2/tests/server/server-executeBulkWrite-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/server/server-executeBulkWrite-002.phpt
rename to mongodb-1.1.2/tests/server/server-executeBulkWrite-002.phpt
diff --git a/mongodb-1.1.1/tests/server/server-executeBulkWrite-003.phpt b/mongodb-1.1.2/tests/server/server-executeBulkWrite-003.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/server/server-executeBulkWrite-003.phpt
rename to mongodb-1.1.2/tests/server/server-executeBulkWrite-003.phpt
diff --git a/mongodb-1.1.1/tests/server/server-executeBulkWrite-004.phpt b/mongodb-1.1.2/tests/server/server-executeBulkWrite-004.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/server/server-executeBulkWrite-004.phpt
rename to mongodb-1.1.2/tests/server/server-executeBulkWrite-004.phpt
diff --git a/mongodb-1.1.1/tests/server/server-executeBulkWrite-005.phpt b/mongodb-1.1.2/tests/server/server-executeBulkWrite-005.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/server/server-executeBulkWrite-005.phpt
rename to mongodb-1.1.2/tests/server/server-executeBulkWrite-005.phpt
diff --git a/mongodb-1.1.1/tests/server/server-executeCommand-001.phpt b/mongodb-1.1.2/tests/server/server-executeCommand-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/server/server-executeCommand-001.phpt
rename to mongodb-1.1.2/tests/server/server-executeCommand-001.phpt
diff --git a/mongodb-1.1.1/tests/server/server-executeCommand-002.phpt b/mongodb-1.1.2/tests/server/server-executeCommand-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/server/server-executeCommand-002.phpt
rename to mongodb-1.1.2/tests/server/server-executeCommand-002.phpt
diff --git a/mongodb-1.1.1/tests/server/server-executeCommand_error-001.phpt b/mongodb-1.1.2/tests/server/server-executeCommand_error-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/server/server-executeCommand_error-001.phpt
rename to mongodb-1.1.2/tests/server/server-executeCommand_error-001.phpt
diff --git a/mongodb-1.1.1/tests/server/server-executeQuery-001.phpt b/mongodb-1.1.2/tests/server/server-executeQuery-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/server/server-executeQuery-001.phpt
rename to mongodb-1.1.2/tests/server/server-executeQuery-001.phpt
diff --git a/mongodb-1.1.1/tests/server/server-executeQuery-002.phpt b/mongodb-1.1.2/tests/server/server-executeQuery-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/server/server-executeQuery-002.phpt
rename to mongodb-1.1.2/tests/server/server-executeQuery-002.phpt
diff --git a/mongodb-1.1.1/tests/server/server-executeQuery-003.phpt b/mongodb-1.1.2/tests/server/server-executeQuery-003.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/server/server-executeQuery-003.phpt
rename to mongodb-1.1.2/tests/server/server-executeQuery-003.phpt
diff --git a/mongodb-1.1.1/tests/server/server-executeQuery-004.phpt b/mongodb-1.1.2/tests/server/server-executeQuery-004.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/server/server-executeQuery-004.phpt
rename to mongodb-1.1.2/tests/server/server-executeQuery-004.phpt
diff --git a/mongodb-1.1.1/tests/server/server-executeQuery-005.phpt b/mongodb-1.1.2/tests/server/server-executeQuery-005.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/server/server-executeQuery-005.phpt
rename to mongodb-1.1.2/tests/server/server-executeQuery-005.phpt
diff --git a/mongodb-1.1.1/tests/server/server-executeQuery-006.phpt b/mongodb-1.1.2/tests/server/server-executeQuery-006.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/server/server-executeQuery-006.phpt
rename to mongodb-1.1.2/tests/server/server-executeQuery-006.phpt
diff --git a/mongodb-1.1.1/tests/server/server-executeQuery_error-001.phpt b/mongodb-1.1.2/tests/server/server-executeQuery_error-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/server/server-executeQuery_error-001.phpt
rename to mongodb-1.1.2/tests/server/server-executeQuery_error-001.phpt
diff --git a/mongodb-1.1.1/tests/standalone/bug0159.phpt b/mongodb-1.1.2/tests/standalone/bug0159.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/standalone/bug0159.phpt
rename to mongodb-1.1.2/tests/standalone/bug0159.phpt
diff --git a/mongodb-1.1.1/tests/standalone/bug0166.phpt b/mongodb-1.1.2/tests/standalone/bug0166.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/standalone/bug0166.phpt
rename to mongodb-1.1.2/tests/standalone/bug0166.phpt
diff --git a/mongodb-1.1.1/tests/standalone/bug0231.phpt b/mongodb-1.1.2/tests/standalone/bug0231.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/standalone/bug0231.phpt
rename to mongodb-1.1.2/tests/standalone/bug0231.phpt
diff --git a/mongodb-1.1.1/tests/standalone/bug0357.phpt b/mongodb-1.1.2/tests/standalone/bug0357.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/standalone/bug0357.phpt
rename to mongodb-1.1.2/tests/standalone/bug0357.phpt
diff --git a/mongodb-1.1.1/tests/standalone/bug0487-001.phpt b/mongodb-1.1.2/tests/standalone/bug0487-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/standalone/bug0487-001.phpt
rename to mongodb-1.1.2/tests/standalone/bug0487-001.phpt
diff --git a/mongodb-1.1.1/tests/standalone/bug0487-002.phpt b/mongodb-1.1.2/tests/standalone/bug0487-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/standalone/bug0487-002.phpt
rename to mongodb-1.1.2/tests/standalone/bug0487-002.phpt
diff --git a/mongodb-1.1.1/tests/standalone/connectiontimeoutexception-001.phpt b/mongodb-1.1.2/tests/standalone/connectiontimeoutexception-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/standalone/connectiontimeoutexception-001.phpt
rename to mongodb-1.1.2/tests/standalone/connectiontimeoutexception-001.phpt
diff --git a/mongodb-1.1.1/tests/standalone/executiontimeoutexception-001.phpt b/mongodb-1.1.2/tests/standalone/executiontimeoutexception-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/standalone/executiontimeoutexception-001.phpt
rename to mongodb-1.1.2/tests/standalone/executiontimeoutexception-001.phpt
diff --git a/mongodb-1.1.1/tests/standalone/executiontimeoutexception-002.phpt b/mongodb-1.1.2/tests/standalone/executiontimeoutexception-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/standalone/executiontimeoutexception-002.phpt
rename to mongodb-1.1.2/tests/standalone/executiontimeoutexception-002.phpt
diff --git a/mongodb-1.1.1/tests/standalone/manager-as-singleton.phpt b/mongodb-1.1.2/tests/standalone/manager-as-singleton.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/standalone/manager-as-singleton.phpt
rename to mongodb-1.1.2/tests/standalone/manager-as-singleton.phpt
diff --git a/mongodb-1.1.1/tests/standalone/query-errors.phpt b/mongodb-1.1.2/tests/standalone/query-errors.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/standalone/query-errors.phpt
rename to mongodb-1.1.2/tests/standalone/query-errors.phpt
diff --git a/mongodb-1.1.1/tests/standalone/update-multi-001.phpt b/mongodb-1.1.2/tests/standalone/update-multi-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/standalone/update-multi-001.phpt
rename to mongodb-1.1.2/tests/standalone/update-multi-001.phpt
diff --git a/mongodb-1.1.1/tests/standalone/write-error-001.phpt b/mongodb-1.1.2/tests/standalone/write-error-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/standalone/write-error-001.phpt
rename to mongodb-1.1.2/tests/standalone/write-error-001.phpt
diff --git a/mongodb-1.1.1/tests/standalone/writeresult-isacknowledged-001.phpt b/mongodb-1.1.2/tests/standalone/writeresult-isacknowledged-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/standalone/writeresult-isacknowledged-001.phpt
rename to mongodb-1.1.2/tests/standalone/writeresult-isacknowledged-001.phpt
diff --git a/mongodb-1.1.1/tests/standalone/writeresult-isacknowledged-002.phpt b/mongodb-1.1.2/tests/standalone/writeresult-isacknowledged-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/standalone/writeresult-isacknowledged-002.phpt
rename to mongodb-1.1.2/tests/standalone/writeresult-isacknowledged-002.phpt
diff --git a/mongodb-1.1.1/tests/standalone/writeresult-isacknowledged-003.phpt b/mongodb-1.1.2/tests/standalone/writeresult-isacknowledged-003.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/standalone/writeresult-isacknowledged-003.phpt
rename to mongodb-1.1.2/tests/standalone/writeresult-isacknowledged-003.phpt
diff --git a/mongodb-1.1.1/tests/utils/PHONGO-FIXTURES.json.gz b/mongodb-1.1.2/tests/utils/PHONGO-FIXTURES.json.gz
similarity index 100%
rename from mongodb-1.1.1/tests/utils/PHONGO-FIXTURES.json.gz
rename to mongodb-1.1.2/tests/utils/PHONGO-FIXTURES.json.gz
diff --git a/mongodb-1.1.1/tests/utils/basic-skipif.inc b/mongodb-1.1.2/tests/utils/basic-skipif.inc
similarity index 100%
rename from mongodb-1.1.1/tests/utils/basic-skipif.inc
rename to mongodb-1.1.2/tests/utils/basic-skipif.inc
diff --git a/mongodb-1.1.1/tests/utils/basic.inc b/mongodb-1.1.2/tests/utils/basic.inc
similarity index 100%
rename from mongodb-1.1.1/tests/utils/basic.inc
rename to mongodb-1.1.2/tests/utils/basic.inc
diff --git a/mongodb-1.1.1/tests/utils/classes.inc b/mongodb-1.1.2/tests/utils/classes.inc
similarity index 100%
rename from mongodb-1.1.1/tests/utils/classes.inc
rename to mongodb-1.1.2/tests/utils/classes.inc
diff --git a/mongodb-1.1.1/tests/utils/tools.php b/mongodb-1.1.2/tests/utils/tools.php
similarity index 100%
rename from mongodb-1.1.1/tests/utils/tools.php
rename to mongodb-1.1.2/tests/utils/tools.php
diff --git a/mongodb-1.1.1/tests/writeConcern/writeconcern-constants.phpt b/mongodb-1.1.2/tests/writeConcern/writeconcern-constants.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/writeConcern/writeconcern-constants.phpt
rename to mongodb-1.1.2/tests/writeConcern/writeconcern-constants.phpt
diff --git a/mongodb-1.1.1/tests/writeConcern/writeconcern-ctor-001.phpt b/mongodb-1.1.2/tests/writeConcern/writeconcern-ctor-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/writeConcern/writeconcern-ctor-001.phpt
rename to mongodb-1.1.2/tests/writeConcern/writeconcern-ctor-001.phpt
diff --git a/mongodb-1.1.1/tests/writeConcern/writeconcern-ctor_error-001.phpt b/mongodb-1.1.2/tests/writeConcern/writeconcern-ctor_error-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/writeConcern/writeconcern-ctor_error-001.phpt
rename to mongodb-1.1.2/tests/writeConcern/writeconcern-ctor_error-001.phpt
diff --git a/mongodb-1.1.1/tests/writeConcern/writeconcern-ctor_error-002.phpt b/mongodb-1.1.2/tests/writeConcern/writeconcern-ctor_error-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/writeConcern/writeconcern-ctor_error-002.phpt
rename to mongodb-1.1.2/tests/writeConcern/writeconcern-ctor_error-002.phpt
diff --git a/mongodb-1.1.1/tests/writeConcern/writeconcern-ctor_error-003.phpt b/mongodb-1.1.2/tests/writeConcern/writeconcern-ctor_error-003.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/writeConcern/writeconcern-ctor_error-003.phpt
rename to mongodb-1.1.2/tests/writeConcern/writeconcern-ctor_error-003.phpt
diff --git a/mongodb-1.1.1/tests/writeConcern/writeconcern-ctor_error-004.phpt b/mongodb-1.1.2/tests/writeConcern/writeconcern-ctor_error-004.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/writeConcern/writeconcern-ctor_error-004.phpt
rename to mongodb-1.1.2/tests/writeConcern/writeconcern-ctor_error-004.phpt
diff --git a/mongodb-1.1.1/tests/writeConcern/writeconcern-debug-001.phpt b/mongodb-1.1.2/tests/writeConcern/writeconcern-debug-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/writeConcern/writeconcern-debug-001.phpt
rename to mongodb-1.1.2/tests/writeConcern/writeconcern-debug-001.phpt
diff --git a/mongodb-1.1.1/tests/writeConcern/writeconcern-debug-002.phpt b/mongodb-1.1.2/tests/writeConcern/writeconcern-debug-002.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/writeConcern/writeconcern-debug-002.phpt
rename to mongodb-1.1.2/tests/writeConcern/writeconcern-debug-002.phpt
diff --git a/mongodb-1.1.1/tests/writeConcern/writeconcern-getjournal-001.phpt b/mongodb-1.1.2/tests/writeConcern/writeconcern-getjournal-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/writeConcern/writeconcern-getjournal-001.phpt
rename to mongodb-1.1.2/tests/writeConcern/writeconcern-getjournal-001.phpt
diff --git a/mongodb-1.1.1/tests/writeConcern/writeconcern-getw-001.phpt b/mongodb-1.1.2/tests/writeConcern/writeconcern-getw-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/writeConcern/writeconcern-getw-001.phpt
rename to mongodb-1.1.2/tests/writeConcern/writeconcern-getw-001.phpt
diff --git a/mongodb-1.1.1/tests/writeConcern/writeconcern-getwtimeout-001.phpt b/mongodb-1.1.2/tests/writeConcern/writeconcern-getwtimeout-001.phpt
similarity index 100%
rename from mongodb-1.1.1/tests/writeConcern/writeconcern-getwtimeout-001.phpt
rename to mongodb-1.1.2/tests/writeConcern/writeconcern-getwtimeout-001.phpt
diff --git a/mongodb-1.1.1/win32/bson-config.h b/mongodb-1.1.2/win32/bson-config.h
similarity index 100%
rename from mongodb-1.1.1/win32/bson-config.h
rename to mongodb-1.1.2/win32/bson-config.h
diff --git a/mongodb-1.1.1/win32/bson-version.h b/mongodb-1.1.2/win32/bson-version.h
similarity index 100%
rename from mongodb-1.1.1/win32/bson-version.h
rename to mongodb-1.1.2/win32/bson-version.h
diff --git a/mongodb-1.1.1/win32/mongoc-config.h b/mongodb-1.1.2/win32/mongoc-config.h
similarity index 100%
rename from mongodb-1.1.1/win32/mongoc-config.h
rename to mongodb-1.1.2/win32/mongoc-config.h
diff --git a/mongodb-1.1.1/win32/mongoc-version.h b/mongodb-1.1.2/win32/mongoc-version.h
similarity index 100%
rename from mongodb-1.1.1/win32/mongoc-version.h
rename to mongodb-1.1.2/win32/mongoc-version.h
diff --git a/package.xml b/package.xml
index 128ac7c5..eb65c792 100644
--- a/package.xml
+++ b/package.xml
@@ -1,761 +1,657 @@
<?xml version="1.0" encoding="UTF-8"?>
<package packagerversion="1.10.1" version="2.1" xmlns="http://pear.php.net/dtd/package-2.1" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.1 http://pear.php.net/dtd/package-2.1.xsd">
<name>mongodb</name>
<channel>pecl.php.net</channel>
<summary>MongoDB driver for PHP</summary>
<description>The purpose of this driver is to provide exceptionally thin glue between MongoDB
and PHP, implementing only fundemental and performance-critical components
necessary to build a fully-functional MongoDB driver.</description>
<lead>
<name>Hannes Magnusson</name>
<user>bjori</user>
<email>bjori@php.net</email>
<active>yes</active>
</lead>
<lead>
<name>Jeremy Mikola</name>
<user>jmikola</user>
<email>jmikola@php.net</email>
<active>yes</active>
</lead>
<lead>
<name>Derick Rethans</name>
<user>derick</user>
<email>derick@php.net</email>
<active>yes</active>
</lead>
- <date>2015-12-22</date>
- <time>20:40:24</time>
+ <date>2016-01-07</date>
+ <time>18:56:56</time>
<version>
- <release>1.1.1</release>
- <api>1.1.1</api>
+ <release>1.1.2</release>
+ <api>1.1.2</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://www.apache.org/licenses/LICENSE-2.0">Apache License</license>
<notes>
-* PHPC-285: Allow for PHP 7.x support in package.xml
-* PHPC-285: VC14 needs timezone defined for SSL function
-* PHPC-285: Fix syntax for empty struct initializer
-* PHPC-400: Compare WriteConcern journal arg with IS_TRUE
-* PHPC-405: Additional zval* to zval changes
-* PHPC-397: Additional RETURN_STRING updates
-* PHPC-393: Don&apos;t BSON-encode non-public properties in PHP 7
-* PHPC-390: Fix OnUpdateString calls within OnUpdateDebug
-* PHPC-373: Additional MAKE_STD_ZVAL() cleanup
-* PHPC-374: zend_string updates for OnUpdateDebug
-* PHPC-404: Additional hash API changes
-* PHPC-370: Additionally return_value_ptr and return_value_used suppressions
-* PHPC-369: Additional Z_&lt;CLASSNAME&gt;_OBJ_P() macros
-* PHPC-399: Additional zval_used_for_init cleanup
-* PHPC-431: Add the testcase from the report
-* PHPC-431: Segfault when using Manager through singleton class
-* PHPC-391 &amp; PHPC-389: Stream and SSL API changes
-* PHPC-387: Properly init the iterator, and don&apos;t free it on dtor
-* PHPC-405: zval drop a level; zval*-&gt;zval, zval**-&gt;zval*
-* PHPC-404: off-by-one hash api changes
-* PHPC-390: php.ini updates
-* PHPC-380: Use the compatability macros to get the object
-* PHPC-400: Handle IS_TRUE and IS_FALSE
-* PHPC-373: MAKE_STD_ZVAL() and zval* -&gt; zval upgrades
-* PHPC-397: RETURN_*() should RETURN ! :)
-* PHPC-399: zval_used_for_init is no longer needed (or defined)
-* PHPC-398: zend_parse_parameter &apos;s&apos; expects a char* and size_t now
-* PHPC-373: MAKE_STD_ZVAL() is gone
-* PHPC-397: RETURN_STRING() duplicate argument removed
-* PHPC-387: get_current_data() API changes
-* PHPC-397: dup argument in most string macros removed
-* PHPC-380: Use our bc type for free_object argument
-* PHPC-397: dup argument in most string macros removed
-* PHPC-396: HashTable no longer contains nApplyCount
-* PHPC-394: Fix issue with WriteException and zend_read_property
-* PHPC-380: PHP7 create/free object changes
-* PHPC-380: create/free object handlers for PHP7
-* PHPC-385: Remove leftover braces
-* PHPC-374: php_stream_xport_create() now wants zend_string
-* PHPC-388 - dtor on bson_to_zval() failure
-* PHPC-387: Iterator API changes
-* PHPC-386: Forward port Z_PHPDATE_P() to get php_date_obj
-* PHPC-385: add_assoc_string_ex() doesn&apos;t have a duplicate param in PHP7
-* PHPC-384: php_stream&apos;s no longer have resource ids
-* PHPC-383: Simplify getting the current exception zval*
-* PHPC-376: Cursor var_dump() is weird
-* PHPC-373: Remove MAKE_STD_ZVAL() usage
-* PHPC-374: zend_string* vs char* PHP API changes (1/many)
-* PHPC-375: TSRMLS_FETCH_FROM_CTX() not applicable in PHP7
-* PHPC-372: zend_throw_exception() return value changes
-* PHPC-371: Prep for PHP7 resource changes
-* PHPC-370: Hardcode return_value_used to 1 in PHP7
-* PHPC-370: return_value_ptr and return_value_used removed in PHP7
-* PHPC-369: Use the new Z_&lt;CLASSNAME&gt;_OBJ_P() macros
-* PHPC-369: Split PHP5 and PHP7 style custom object struct declrations
-* PHPC-368: Refactor MongoDB\Driver\Manager ctor
-* PHPC-285: Allow for PHP 7.x support in package.xml
-* PHPC-285: VC14 needs timezone defined for SSL function
-* PHPC-285: Fix syntax for empty struct initializer
-* PHPC-400: Compare WriteConcern journal arg with IS_TRUE
-* PHPC-405: Additional zval* to zval changes
-* PHPC-397: Additional RETURN_STRING updates
-* PHPC-393: Don&apos;t BSON-encode non-public properties in PHP 7
-* PHPC-390: Fix OnUpdateString calls within OnUpdateDebug
-* PHPC-373: Additional MAKE_STD_ZVAL() cleanup
-* PHPC-374: zend_string updates for OnUpdateDebug
-* PHPC-404: Additional hash API changes
-* PHPC-370: Additionally return_value_ptr and return_value_used suppressions
-* PHPC-369: Additional Z_&lt;CLASSNAME&gt;_OBJ_P() macros
-* PHPC-399: Additional zval_used_for_init cleanup
-* PHPC-431: Add the testcase from the report
-* PHPC-431: Segfault when using Manager through singleton class
-* PHPC-391 &amp; PHPC-389: Stream and SSL API changes
-* PHPC-387: Properly init the iterator, and don&apos;t free it on dtor
-* PHPC-405: zval drop a level; zval*-&gt;zval, zval**-&gt;zval*
-* PHPC-404: off-by-one hash api changes
-* PHPC-390: php.ini updates
-* PHPC-380: Use the compatability macros to get the object
-* PHPC-400: Handle IS_TRUE and IS_FALSE
-* PHPC-373: MAKE_STD_ZVAL() and zval* -&gt; zval upgrades
-* PHPC-397: RETURN_*() should RETURN ! :)
-* PHPC-399: zval_used_for_init is no longer needed (or defined)
-* PHPC-398: zend_parse_parameter &apos;s&apos; expects a char* and size_t now
-* PHPC-373: MAKE_STD_ZVAL() is gone
-* PHPC-397: RETURN_STRING() duplicate argument removed
-* PHPC-387: get_current_data() API changes
-* PHPC-397: dup argument in most string macros removed
-* PHPC-380: Use our bc type for free_object argument
-* PHPC-397: dup argument in most string macros removed
-* PHPC-396: HashTable no longer contains nApplyCount
-* PHPC-394: Fix issue with WriteException and zend_read_property
-* PHPC-380: PHP7 create/free object changes
-* PHPC-380: create/free object handlers for PHP7
-* PHPC-385: Remove leftover braces
-* PHPC-374: php_stream_xport_create() now wants zend_string
-* PHPC-388 - dtor on bson_to_zval() failure
-* PHPC-387: Iterator API changes
-* PHPC-386: Forward port Z_PHPDATE_P() to get php_date_obj
-* PHPC-385: add_assoc_string_ex() doesn&apos;t have a duplicate param in PHP7
-* PHPC-384: php_stream&apos;s no longer have resource ids
-* PHPC-383: Simplify getting the current exception zval*
-* PHPC-376: Cursor var_dump() is weird
-* PHPC-373: Remove MAKE_STD_ZVAL() usage
-* PHPC-374: zend_string* vs char* PHP API changes (1/many)
-* PHPC-375: TSRMLS_FETCH_FROM_CTX() not applicable in PHP7
-* PHPC-372: zend_throw_exception() return value changes
-* PHPC-371: Prep for PHP7 resource changes
-* PHPC-370: Hardcode return_value_used to 1 in PHP7
-* PHPC-370: return_value_ptr and return_value_used removed in PHP7
-* PHPC-369: Use the new Z_&lt;CLASSNAME&gt;_OBJ_P() macros
-* PHPC-369: Split PHP5 and PHP7 style custom object struct declrations
-* PHPC-368: Refactor MongoDB\Driver\Manager ctor
+* PHPC-496: Revert &quot;Temporary workaround for warning in mongoc&quot;
+* PHPC-534: Enable configure without SASL and support --with-mongodb-sasl=no
+* PHPC-529: Prefix BSON functions to avoid symbol conflicts
+* PHPC-528: Support zval references when appending BSON
+* PHPC-527: fix call to add_index_stringl
+* PHPC-527: Fix PHP 7 / 32bits build
</notes>
<contents>
<dir name="/">
<file md5sum="b301ead064e031b76fa08488a1055594" name="scripts/centos/ldap/Domain.ldif" role="test" />
<file md5sum="4daa783214593b6d7deb42f35c6e027c" name="scripts/centos/ldap/Users.ldif" role="test" />
<file md5sum="001e9cfe2c64b4afe413c12da3a75103" name="scripts/centos/ldap/basics.ldif" role="test" />
<file md5sum="624db776065d2ce0e76c3dd252c86c27" name="scripts/centos/ldap/install.sh" role="test" />
<file md5sum="3373471c13615482fcb5abd156a99013" name="scripts/centos/ldap/mongod.ldif" role="test" />
<file md5sum="79641e9055dc9a4c810cdc580d420ccf" name="scripts/centos/ldap/pw.ldif" role="test" />
<file md5sum="7069ce3fbf9612eb20df4de56e2915e7" name="scripts/centos/ldap/saslauthd.conf" role="test" />
<file md5sum="c2d1c7b3b12d970c295ebceda4bd429f" name="scripts/centos/ldap/users" role="test" />
<file md5sum="9add0018a9ebebb32e6f9d689d53ce14" name="scripts/centos/essentials.sh" role="test" />
<file md5sum="43a925c212fc965e90d89951d04945c1" name="scripts/freebsd/essentials.sh" role="test" />
<file md5sum="18b03fd810bde00c7493002a94e24865" name="scripts/freebsd/phongo.sh" role="test" />
<file md5sum="0e6d3baeb0ffedee6a4d5500a725331b" name="scripts/presets/replicaset-30.json" role="test" />
<file md5sum="b5c14f08571fcfe2aa5641a7a18d4c3f" name="scripts/presets/replicaset.json" role="test" />
<file md5sum="d850cacbf5527fd7b4a46958e66ed5c9" name="scripts/presets/standalone-24.json" role="test" />
<file md5sum="d9b0cfc2035c3d5c0baae6959a90c36e" name="scripts/presets/standalone-26.json" role="test" />
<file md5sum="60c5e499c429eb07e1f96b37baa42adf" name="scripts/presets/standalone-30.json" role="test" />
<file md5sum="b8cc887e5bccc9bc1f715d041d2d657b" name="scripts/presets/standalone-auth.json" role="test" />
<file md5sum="2bc383470aa5dfc60185ef19a8a80276" name="scripts/presets/standalone-plain.json" role="test" />
<file md5sum="82e65a04030826c41d713787833fb52a" name="scripts/presets/standalone-ssl.json" role="test" />
<file md5sum="c5acd3fbc060927121ff626f3b730cfa" name="scripts/presets/standalone-x509.json" role="test" />
<file md5sum="17927182a5fb8fb9d1ad8c8571c32b29" name="scripts/presets/standalone.json" role="test" />
<file md5sum="06b59105c25447470ca9f7c589b80b46" name="scripts/ssl/ca.pem" role="test" />
<file md5sum="6bdc883fdbe5a1c736518e5ec5f67964" name="scripts/ssl/client.pem" role="test" />
<file md5sum="94a4db9c47b58aa3d00b70b4bd178601" name="scripts/ssl/crl.pem" role="test" />
<file md5sum="bfccd366ca201a01f8f5bea8c900abc9" name="scripts/ssl/server.pem" role="test" />
<file md5sum="cb636b47cf37dace58be73272a74efc3" name="scripts/ubuntu/ldap/install.sh" role="test" />
<file md5sum="c4c1a6c234d983da8fe0382bcb8c1420" name="scripts/ubuntu/ldap/saslauthd.conf" role="test" />
<file md5sum="b199baa1ee52bc252773485de56b10f6" name="scripts/ubuntu/essentials.sh" role="test" />
<file md5sum="b4a9eb39b992590f39b56e4fdbabe757" name="scripts/ubuntu/mongo-orchestration.sh" role="test" />
<file md5sum="903c38a7e9d59fec770c1138de85d7be" name="scripts/ubuntu/phongo.sh" role="test" />
<file md5sum="a51616233fb311f458391b668e0254e9" name="scripts/vmware/kernel.sh" role="test" />
<file md5sum="28868809c797d2b57b0f21bfc66b4862" name="scripts/convert-mo-tests.php" role="test" />
<file md5sum="35671ea9b24b02610710ef676bc539a2" name="scripts/list-servers.php" role="test" />
<file md5sum="43b39f67f12cacf6f21de522b51a2900" name="scripts/start-servers.php" role="test" />
<file md5sum="8ff026c6a4a636d775962eda3699a374" name="src/BSON/Binary.c" role="src" />
- <file md5sum="9fa081b5626ace8239131fcbf7012677" name="src/BSON/Javascript.c" role="src" />
+ <file md5sum="0140cb2b40b5b8fd554760cbcadc9d52" name="src/BSON/Javascript.c" role="src" />
<file md5sum="87396d234c6b471c5d8bbb034e0cf668" name="src/BSON/MaxKey.c" role="src" />
<file md5sum="076f14397d034e439ed228028f5db689" name="src/BSON/MinKey.c" role="src" />
<file md5sum="2578781bc7c9126bb2e41dfd1f2b8e52" name="src/BSON/ObjectID.c" role="src" />
<file md5sum="72126a76a258de87232509920af48ef2" name="src/BSON/Persistable.c" role="src" />
<file md5sum="493286d4db2d74b83203a64e5fa0ccf8" name="src/BSON/Regex.c" role="src" />
<file md5sum="36869e001a518cd8b39d59fd1298fbb2" name="src/BSON/Serializable.c" role="src" />
<file md5sum="9e75f71d957607230b7b40a640f672e1" name="src/BSON/Timestamp.c" role="src" />
<file md5sum="ea65791b65f91f4071101d78e7fef85f" name="src/BSON/Type.c" role="src" />
<file md5sum="36cd81ea0e05bd31a10d4b56ef582aa2" name="src/BSON/UTCDateTime.c" role="src" />
<file md5sum="a1b17e2c935bfef0365ac60f589c37de" name="src/BSON/Unserializable.c" role="src" />
<file md5sum="9a7a8d4b102c1cd2bdfc607dad008aa4" name="src/MongoDB/Exception/AuthenticationException.c" role="src" />
<file md5sum="28d4d1baec7f8f4a94891d50dd7bade5" name="src/MongoDB/Exception/BulkWriteException.c" role="src" />
<file md5sum="e2afdbe9298a14efda81a1233f9fa3b5" name="src/MongoDB/Exception/ConnectionException.c" role="src" />
<file md5sum="ef3336318a3fc6b39eb2d7dfd5eda1ed" name="src/MongoDB/Exception/ConnectionTimeoutException.c" role="src" />
<file md5sum="32a30824a1e1f46d6b9b7f9da12f5d1e" name="src/MongoDB/Exception/Exception.c" role="src" />
<file md5sum="3967ba4e71fe8a106e664f721e877976" name="src/MongoDB/Exception/ExecutionTimeoutException.c" role="src" />
<file md5sum="827569a67aa7015e926af2356cf76b6e" name="src/MongoDB/Exception/InvalidArgumentException.c" role="src" />
<file md5sum="5150d3950d83c607d21adad0bf980262" name="src/MongoDB/Exception/LogicException.c" role="src" />
<file md5sum="5f2ff1f090db57bf79f0eb1d84826d5a" name="src/MongoDB/Exception/RuntimeException.c" role="src" />
<file md5sum="8b79c904c889b96ef3a0643829f5f5bf" name="src/MongoDB/Exception/SSLConnectionException.c" role="src" />
<file md5sum="20d7bbf19981dfe2025d6960d0c3f8a4" name="src/MongoDB/Exception/UnexpectedValueException.c" role="src" />
<file md5sum="d8ce1ab3f5c9567756aff5be8200d463" name="src/MongoDB/Exception/WriteException.c" role="src" />
- <file md5sum="c0ae41b3090b633bfdd80dddc1d40fb0" name="src/MongoDB/BulkWrite.c" role="src" />
- <file md5sum="1ff888a3656694e4ac934655d998e24a" name="src/MongoDB/Command.c" role="src" />
- <file md5sum="dba72f9e233df2a1bd0b56c111c80b47" name="src/MongoDB/Cursor.c" role="src" />
+ <file md5sum="96266058920c9027069dda8bfeb77e18" name="src/MongoDB/BulkWrite.c" role="src" />
+ <file md5sum="e8b0d29fab22a11de748f4bdb9ae640b" name="src/MongoDB/Command.c" role="src" />
+ <file md5sum="54d2d5e52b2b8a65fef238a46a55fe1b" name="src/MongoDB/Cursor.c" role="src" />
<file md5sum="8d1a59882d4ddfee25248850592d55dc" name="src/MongoDB/CursorId.c" role="src" />
- <file md5sum="457b38df21eacc1cbef1878de593981f" name="src/MongoDB/Manager.c" role="src" />
- <file md5sum="fcddf8fef440698c25f1e92f52393433" name="src/MongoDB/Query.c" role="src" />
+ <file md5sum="457f72334b3e669af8c54e94f459055a" name="src/MongoDB/Manager.c" role="src" />
+ <file md5sum="23108d850c272d9cf4f00589c1fe7f7f" name="src/MongoDB/Query.c" role="src" />
<file md5sum="bea72032eab2fb014dd3306ded5485eb" name="src/MongoDB/ReadConcern.c" role="src" />
- <file md5sum="a4132ba5eaa7ead87048bc6f5080214b" name="src/MongoDB/ReadPreference.c" role="src" />
- <file md5sum="a24e50a87aa896ea58b0d88ffcbebd54" name="src/MongoDB/Server.c" role="src" />
+ <file md5sum="f312475cacd0d9e7f61f782dfceb89af" name="src/MongoDB/ReadPreference.c" role="src" />
+ <file md5sum="c2a75545723d7eae9bd6e2ebd06d6af4" name="src/MongoDB/Server.c" role="src" />
<file md5sum="91a25fc1412bc0bc653dc2e42b18d269" name="src/MongoDB/WriteConcern.c" role="src" />
<file md5sum="7957bd6aaafb2d3f28e510d2753ebf59" name="src/MongoDB/WriteConcernError.c" role="src" />
<file md5sum="afabdb7d5cea46776b57f2a7e9c60d54" name="src/MongoDB/WriteError.c" role="src" />
- <file md5sum="16099f2785369e91a8749655bbfaf1f8" name="src/MongoDB/WriteResult.c" role="src" />
+ <file md5sum="2563c2c05263e52d00ceb189fd6213b0" name="src/MongoDB/WriteResult.c" role="src" />
<file md5sum="244fe9a9cf92579e2e7b963773f624a1" name="src/contrib/php-ssl.c" role="src" />
<file md5sum="e2f74b8b4053c218b6b21cda31dcade2" name="src/contrib/php-ssl.h" role="src" />
<file md5sum="3eb4bc184583d52ef59d9909fa96c3ae" name="src/contrib/php_array_api.h" role="src" />
<file md5sum="1066d5c9a05b1b1cb8f4de5a7e291574" name="src/libbson/build/autotools/m4/ac_check_typedef.m4" role="src" />
<file md5sum="e40a5f02f4d82a68b3df43d99dd92ed6" name="src/libbson/build/autotools/m4/ac_compile_check_sizeof.m4" role="src" />
<file md5sum="b96bb8fad4ea5d66c6b3af718186e2e0" name="src/libbson/build/autotools/m4/ac_create_stdint_h.m4" role="src" />
<file md5sum="7b5ee49855c90a9da6a0b1f1f0b8ef8f" name="src/libbson/build/autotools/m4/as-compiler-flag.m4" role="src" />
<file md5sum="8d942f69b5f3c15ecae4b75bb7e80614" name="src/libbson/build/autotools/m4/ax_check_compile_flag.m4" role="src" />
<file md5sum="05bd24609268702a36d50d5edd3661ac" name="src/libbson/build/autotools/m4/ax_check_link_flag.m4" role="src" />
<file md5sum="5535e823ec44002b522873b9c0e2e0bf" name="src/libbson/build/autotools/m4/ax_pthread.m4" role="src" />
<file md5sum="ad8d52d54e0f97c0e4e385376ea73bc0" name="src/libbson/build/autotools/m4/pkg.m4" role="src" />
<file md5sum="ff788a8b5eea35b1cc226bb2686c3537" name="src/libbson/build/autotools/m4/silent.m4" role="src" />
<file md5sum="202a123680d63e9f3caae1d52f7b8686" name="src/libbson/build/autotools/AutoHarden.m4" role="src" />
<file md5sum="c78c5e9b49b67a725e831823492642da" name="src/libbson/build/autotools/CheckAtomics.m4" role="src" />
<file md5sum="33c0e73d71ead46ce5a11eda4ce160b6" name="src/libbson/build/autotools/CheckCompiler.m4" role="src" />
<file md5sum="926469dedde20e75214b528528ba25ae" name="src/libbson/build/autotools/CheckHeaders.m4" role="src" />
<file md5sum="81b2b641c597d18daa4066ed7c37d7b7" name="src/libbson/build/autotools/CheckHost.m4" role="src" />
<file md5sum="5147ee8369f1744715365976b38777fc" name="src/libbson/build/autotools/CheckProgs.m4" role="src" />
<file md5sum="fa4a5cc1c9475999c468488eb19e4ffe" name="src/libbson/build/autotools/CheckTarget.m4" role="src" />
<file md5sum="3154e253512bd82d0dd51898d5cfde90" name="src/libbson/build/autotools/Coverage.m4" role="src" />
<file md5sum="46768d326c5f994af7e1ffbb0db32a4e" name="src/libbson/build/autotools/Endian.m4" role="src" />
<file md5sum="46d6ff4f547824ce9f5869b0f1a91df7" name="src/libbson/build/autotools/FindDependencies.m4" role="src" />
<file md5sum="7cb405e39a2f8c5c5fa2ffa4315df98a" name="src/libbson/build/autotools/LDVersionScript.m4" role="src" />
<file md5sum="71cf2e639791835caf686cafb2e0a131" name="src/libbson/build/autotools/MaintainerFlags.m4" role="src" />
<file md5sum="2bfa5427bd07a9816cca2f3dc60f0201" name="src/libbson/build/autotools/Optimizations.m4" role="src" />
<file md5sum="6132a3601eb0bc5de5ffc63316261abe" name="src/libbson/build/autotools/PrintBuildConfiguration.m4" role="src" />
<file md5sum="01ce2a3d099737ae11530c08ad2455e2" name="src/libbson/build/autotools/ReadCommandLineArguments.m4" role="src" />
<file md5sum="a5cb66d4eb8a5a4ef088e96e213bbfec" name="src/libbson/build/autotools/SetupAutomake.m4" role="src" />
<file md5sum="f229599b4333a2cdf5be29136cc6f2e2" name="src/libbson/build/autotools/SetupLibtool.m4" role="src" />
<file md5sum="2e50f9a74b7624536d967c01897fd22e" name="src/libbson/build/autotools/Versions.m4" role="src" />
<file md5sum="60d5834d66c34c59c0a12a7eecbf84ab" name="src/libbson/src/bson/b64_ntop.h" role="src" />
<file md5sum="70cebe2a7a17de7d489317b7a1db7c73" name="src/libbson/src/bson/b64_pton.h" role="src" />
<file md5sum="bb09a154c8beb0c3a8bb3e33806e86a3" name="src/libbson/src/bson/bcon.c" role="src" />
<file md5sum="3c0add458971f01ef4bbd6f92beacb04" name="src/libbson/src/bson/bcon.h" role="src" />
<file md5sum="390455394d8d976b6b3b472845cdd6c2" name="src/libbson/src/bson/bson-atomic.c" role="src" />
<file md5sum="a2f2ae100db5d6602c323b9993305893" name="src/libbson/src/bson/bson-atomic.h" role="src" />
<file md5sum="e005ee43ff5516ada7a8afb103310f5c" name="src/libbson/src/bson/bson-clock.c" role="src" />
<file md5sum="c0e771385f32369c59ba3de570b854c9" name="src/libbson/src/bson/bson-clock.h" role="src" />
<file md5sum="8f76e2f45df2644215e0969e947d9a87" name="src/libbson/src/bson/bson-compat.h" role="src" />
<file md5sum="4819fcff6b12651ee5c6e30c51a98ac2" name="src/libbson/src/bson/bson-config.h" role="src" />
<file md5sum="810ccc4283632659bf59c2ab7ae927cf" name="src/libbson/src/bson/bson-config.h.in" role="src" />
<file md5sum="11177a64ea0d8136b73312d0e9313dae" name="src/libbson/src/bson/bson-context-private.h" role="src" />
<file md5sum="26bbea92a38eb020f99c31006fe8e1cc" name="src/libbson/src/bson/bson-context.c" role="src" />
<file md5sum="bc4ed2208b0f062619391e27c35b3716" name="src/libbson/src/bson/bson-context.h" role="src" />
<file md5sum="a8d2b6f9a285e267c372ec7e3def2258" name="src/libbson/src/bson/bson-endian.h" role="src" />
<file md5sum="94281be1939683f40c2e4b8eb869a385" name="src/libbson/src/bson/bson-error.c" role="src" />
<file md5sum="c6aac7116527ebd525bd04d2c5675ce4" name="src/libbson/src/bson/bson-error.h" role="src" />
<file md5sum="be7c0192246dad6a30b0f3835380c343" name="src/libbson/src/bson/bson-iso8601-private.h" role="src" />
<file md5sum="bcbaf2a59bc63350978d2be3401118bb" name="src/libbson/src/bson/bson-iso8601.c" role="src" />
<file md5sum="1822df11997a072bac645885340bc3a1" name="src/libbson/src/bson/bson-iter.c" role="src" />
<file md5sum="9820ad956c26006311cb6d3a5ab6bf37" name="src/libbson/src/bson/bson-iter.h" role="src" />
<file md5sum="64a34f827f7c44628fbb506bf1acd5a9" name="src/libbson/src/bson/bson-json.c" role="src" />
<file md5sum="53a9cbbe5c9a58fc4790c1e995e2db29" name="src/libbson/src/bson/bson-json.h" role="src" />
<file md5sum="30bfe359c194f01ffbf1afe053c4f16c" name="src/libbson/src/bson/bson-keys.c" role="src" />
<file md5sum="360489fa7642c546ad50ccacf6fa7b7d" name="src/libbson/src/bson/bson-keys.h" role="src" />
<file md5sum="0751ce4fa7b4eb1fe139c68751f73726" name="src/libbson/src/bson/bson-macros.h" role="src" />
<file md5sum="016da785f4bd6ed2654a1dd6e7e20711" name="src/libbson/src/bson/bson-md5.c" role="src" />
<file md5sum="a25556f4057e5366dd4b9f72705fac46" name="src/libbson/src/bson/bson-md5.h" role="src" />
<file md5sum="b6516065288b9d39daec78b83111601d" name="src/libbson/src/bson/bson-memory.c" role="src" />
<file md5sum="031c3330610a564ac5c95f61c4fe4cd5" name="src/libbson/src/bson/bson-memory.h" role="src" />
<file md5sum="71aadcb44d35f3ff2e7a11f39732d46d" name="src/libbson/src/bson/bson-oid.c" role="src" />
<file md5sum="1717085c9b662b4a351823b1b3687a49" name="src/libbson/src/bson/bson-oid.h" role="src" />
<file md5sum="79fcf67477764ea451076437d4ec717c" name="src/libbson/src/bson/bson-private.h" role="src" />
<file md5sum="4d876db12b4b19f17ffcafc1b6488861" name="src/libbson/src/bson/bson-reader.c" role="src" />
<file md5sum="fa9d0dcbb77842c38f75deba2531b154" name="src/libbson/src/bson/bson-reader.h" role="src" />
<file md5sum="d4277ba8b3bc0f7753931062eb0cd5eb" name="src/libbson/src/bson/bson-stdint-win32.h" role="src" />
- <file md5sum="01dce16965855e4a092a8d5188e40312" name="src/libbson/src/bson/bson-stdint.h" role="src" />
+ <file md5sum="ef0c8f0578bcf2f961d209172ff6e5a0" name="src/libbson/src/bson/bson-stdint.h" role="src" />
<file md5sum="c76f9050cb32614f9ad1f5753cdbbe03" name="src/libbson/src/bson/bson-string.c" role="src" />
<file md5sum="4ecbd4e7bf09ede19374cd87d4155164" name="src/libbson/src/bson/bson-string.h" role="src" />
<file md5sum="2a16019c51864483f27676c83e12b293" name="src/libbson/src/bson/bson-thread-private.h" role="src" />
<file md5sum="bbe5863f79868d0a153f9eb591f09f20" name="src/libbson/src/bson/bson-timegm-private.h" role="src" />
<file md5sum="b27b64de5376b5b4b53721d96bf331e9" name="src/libbson/src/bson/bson-timegm.c" role="src" />
<file md5sum="6ac9daeee445b35fc73363beca0967f9" name="src/libbson/src/bson/bson-types.h" role="src" />
<file md5sum="2569921096086498f3b7e84dd37aea1b" name="src/libbson/src/bson/bson-utf8.c" role="src" />
<file md5sum="82b66ce5a87930b09a0b7ec8bf20e2f1" name="src/libbson/src/bson/bson-utf8.h" role="src" />
<file md5sum="ee95977dddde8a36cf53007dfd221c49" name="src/libbson/src/bson/bson-value.c" role="src" />
<file md5sum="34889442e7c5e4c54c3c60b2e0f77ebd" name="src/libbson/src/bson/bson-value.h" role="src" />
<file md5sum="f80a6f4a82a8c86f63eaccc1c8d147ee" name="src/libbson/src/bson/bson-version-functions.c" role="src" />
<file md5sum="b60ecb89018a8fa6ca6d16fd089ce952" name="src/libbson/src/bson/bson-version-functions.h" role="src" />
<file md5sum="58967ac901844c00c344076cbbb55647" name="src/libbson/src/bson/bson-version.h" role="src" />
<file md5sum="9036341d3488d5aec2b028fae66c8c6f" name="src/libbson/src/bson/bson-version.h.in" role="src" />
<file md5sum="8108f0a5dd05650f53c3c2eca95d587c" name="src/libbson/src/bson/bson-writer.c" role="src" />
<file md5sum="0aea55fb0deab9311812eefc9a0291d5" name="src/libbson/src/bson/bson-writer.h" role="src" />
<file md5sum="a964beb80a921c5a2cfbaf4ce445ec40" name="src/libbson/src/bson/bson.c" role="src" />
<file md5sum="1a1612a74a8628aa1912c400c5948592" name="src/libbson/src/bson/bson.h" role="src" />
<file md5sum="cf5990b5d3ad3eafa329f4e6884582c5" name="src/libbson/src/yajl/yajl.c" role="src" />
<file md5sum="1c55df90c4d949c316e6e6e7498ec15c" name="src/libbson/src/yajl/yajl_alloc.c" role="src" />
<file md5sum="f3f9167846f7260138bd38021f9bb189" name="src/libbson/src/yajl/yajl_alloc.h" role="src" />
<file md5sum="289df9f01dc8865130659219e517a4b4" name="src/libbson/src/yajl/yajl_buf.c" role="src" />
<file md5sum="505cbe3ad7cbbb5579cecc86c8f93087" name="src/libbson/src/yajl/yajl_buf.h" role="src" />
<file md5sum="0963d85f30e3afa40fb4ae813ab046c1" name="src/libbson/src/yajl/yajl_bytestack.h" role="src" />
<file md5sum="d661bd5df38065b1de3e9b75309cb78b" name="src/libbson/src/yajl/yajl_common.h" role="src" />
<file md5sum="b60b45eb35dd40f2b3825233fa9661bc" name="src/libbson/src/yajl/yajl_encode.c" role="src" />
<file md5sum="5644d79572411e06f808ee0c9e76a41b" name="src/libbson/src/yajl/yajl_encode.h" role="src" />
<file md5sum="7b647b5ae0eca31484d0543e969cbaa4" name="src/libbson/src/yajl/yajl_gen.c" role="src" />
<file md5sum="e57e21bda1283a3a6a178845096b5d9c" name="src/libbson/src/yajl/yajl_gen.h" role="src" />
<file md5sum="c1e82830be32f2027d9936244237b3f9" name="src/libbson/src/yajl/yajl_lex.c" role="src" />
<file md5sum="dcada0f60f8121bf68b73d56f32273b6" name="src/libbson/src/yajl/yajl_lex.h" role="src" />
<file md5sum="ebd7e4faccaa0f454945be170f447eef" name="src/libbson/src/yajl/yajl_parse.h" role="src" />
<file md5sum="a975a6d331f72f5c481c828cbf549788" name="src/libbson/src/yajl/yajl_parser.c" role="src" />
<file md5sum="927906b0423c3d1412188b6686821f2e" name="src/libbson/src/yajl/yajl_parser.h" role="src" />
<file md5sum="a0ee19c679c295449de6bbdae05ef82d" name="src/libbson/src/yajl/yajl_tree.c" role="src" />
<file md5sum="69650cd70a46ddf7541401203b22f00d" name="src/libbson/src/yajl/yajl_tree.h" role="src" />
<file md5sum="8d8be470862bf4c55ee6344530e8eb38" name="src/libbson/src/yajl/yajl_version.c" role="src" />
<file md5sum="4194a43380dfaef3ca94cb2ba30da1f2" name="src/libbson/src/yajl/yajl_version.h" role="src" />
<file md5sum="0589f66713bc44029a1a720b9a0d850d" name="src/libbson/VERSION_CURRENT" role="src" />
<file md5sum="0589f66713bc44029a1a720b9a0d850d" name="src/libbson/VERSION_RELEASED" role="src" />
<file md5sum="1066d5c9a05b1b1cb8f4de5a7e291574" name="src/libmongoc/build/autotools/m4/ac_check_typedef.m4" role="src" />
<file md5sum="e40a5f02f4d82a68b3df43d99dd92ed6" name="src/libmongoc/build/autotools/m4/ac_compile_check_sizeof.m4" role="src" />
<file md5sum="b96bb8fad4ea5d66c6b3af718186e2e0" name="src/libmongoc/build/autotools/m4/ac_create_stdint_h.m4" role="src" />
<file md5sum="7b5ee49855c90a9da6a0b1f1f0b8ef8f" name="src/libmongoc/build/autotools/m4/as-compiler-flag.m4" role="src" />
<file md5sum="8d942f69b5f3c15ecae4b75bb7e80614" name="src/libmongoc/build/autotools/m4/ax_check_compile_flag.m4" role="src" />
<file md5sum="05bd24609268702a36d50d5edd3661ac" name="src/libmongoc/build/autotools/m4/ax_check_link_flag.m4" role="src" />
<file md5sum="5535e823ec44002b522873b9c0e2e0bf" name="src/libmongoc/build/autotools/m4/ax_pthread.m4" role="src" />
<file md5sum="ad8d52d54e0f97c0e4e385376ea73bc0" name="src/libmongoc/build/autotools/m4/pkg.m4" role="src" />
<file md5sum="ff788a8b5eea35b1cc226bb2686c3537" name="src/libmongoc/build/autotools/m4/silent.m4" role="src" />
<file md5sum="eed82d92d773f81cdd1e8e72566630ef" name="src/libmongoc/build/autotools/AutoHarden.m4" role="src" />
<file md5sum="33c0e73d71ead46ce5a11eda4ce160b6" name="src/libmongoc/build/autotools/CheckCompiler.m4" role="src" />
<file md5sum="81b2b641c597d18daa4066ed7c37d7b7" name="src/libmongoc/build/autotools/CheckHost.m4" role="src" />
<file md5sum="74f0234144b9b05ecc5d2b512bdce9cc" name="src/libmongoc/build/autotools/CheckProgs.m4" role="src" />
<file md5sum="5311dc948526452f2fd3635c2f214aee" name="src/libmongoc/build/autotools/CheckSSL.m4" role="src" />
<file md5sum="b5f6144096cac452140b12d3dcf94fdb" name="src/libmongoc/build/autotools/CheckSasl.m4" role="src" />
<file md5sum="fa4a5cc1c9475999c468488eb19e4ffe" name="src/libmongoc/build/autotools/CheckTarget.m4" role="src" />
<file md5sum="3154e253512bd82d0dd51898d5cfde90" name="src/libmongoc/build/autotools/Coverage.m4" role="src" />
<file md5sum="e8fb530e79b3212551151dd9fef1e92a" name="src/libmongoc/build/autotools/FindDependencies.m4" role="src" />
<file md5sum="7cb405e39a2f8c5c5fa2ffa4315df98a" name="src/libmongoc/build/autotools/LDVersionScript.m4" role="src" />
<file md5sum="a8977370dbf28d606e4a6628bba94fca" name="src/libmongoc/build/autotools/Libbson.m4" role="src" />
<file md5sum="00d73a290be3d6ad39c986fbe09279b8" name="src/libmongoc/build/autotools/MaintainerFlags.m4" role="src" />
<file md5sum="0a8ff4918426dfc83ea7c741a512029d" name="src/libmongoc/build/autotools/Optimizations.m4" role="src" />
<file md5sum="f3ef6e9a19741a92ccfd23c38c8127b3" name="src/libmongoc/build/autotools/PlatformFlags.m4" role="src" />
<file md5sum="2f36be74b949fc70bb2fc6861f455362" name="src/libmongoc/build/autotools/PrintBuildConfiguration.m4" role="src" />
<file md5sum="b461d5a26ffd5de93a63c5287303675e" name="src/libmongoc/build/autotools/ReadCommandLineArguments.m4" role="src" />
<file md5sum="572566950ac77d916d6bf73fde7b8395" name="src/libmongoc/build/autotools/SetupAutomake.m4" role="src" />
<file md5sum="f229599b4333a2cdf5be29136cc6f2e2" name="src/libmongoc/build/autotools/SetupLibtool.m4" role="src" />
<file md5sum="82639d82b348fc309980a1d14e96b462" name="src/libmongoc/build/autotools/Versions.m4" role="src" />
<file md5sum="76e2c1a2aa19f5fab3661c992ac603fa" name="src/libmongoc/build/autotools/WeakSymbols.m4" role="src" />
<file md5sum="cebe632a500714618bcd504042665d06" name="src/libmongoc/src/mongoc/mongoc-array-private.h" role="src" />
<file md5sum="62bb69dffa4d2756c43bb06276cc6cc9" name="src/libmongoc/src/mongoc/mongoc-array.c" role="src" />
<file md5sum="b90b9c2c441ef50589aa5b4a40322fdb" name="src/libmongoc/src/mongoc/mongoc-async-cmd-private.h" role="src" />
<file md5sum="69a8374d05fda8cf8b698183d80c7cef" name="src/libmongoc/src/mongoc/mongoc-async-cmd.c" role="src" />
<file md5sum="aee92f5c2e025fd3dc8da9637824a072" name="src/libmongoc/src/mongoc/mongoc-async-private.h" role="src" />
<file md5sum="1d94a4dad26b26d3fa18e8012ebaa413" name="src/libmongoc/src/mongoc/mongoc-async.c" role="src" />
<file md5sum="ddce6cc55b0dc69c11da1c8706462e1e" name="src/libmongoc/src/mongoc/mongoc-b64-private.h" role="src" />
<file md5sum="6bcdf787033705c8d56d5ab6d2d5f152" name="src/libmongoc/src/mongoc/mongoc-b64.c" role="src" />
<file md5sum="4671ed096a020fe21ba8342fb16abb0c" name="src/libmongoc/src/mongoc/mongoc-buffer-private.h" role="src" />
<file md5sum="4190e1c4e5c039a33779dfd235c298ce" name="src/libmongoc/src/mongoc/mongoc-buffer.c" role="src" />
<file md5sum="2e2f075cda3b44aec0a44e2985bc6316" name="src/libmongoc/src/mongoc/mongoc-bulk-operation-private.h" role="src" />
<file md5sum="b8da8964136fa61867aba3d0f0def7fc" name="src/libmongoc/src/mongoc/mongoc-bulk-operation.c" role="src" />
<file md5sum="2b0d8dff8b812c86c52dc0601951b952" name="src/libmongoc/src/mongoc/mongoc-bulk-operation.h" role="src" />
<file md5sum="58d77a197aac11accb0b0337ccfaafde" name="src/libmongoc/src/mongoc/mongoc-client-pool-private.h" role="src" />
<file md5sum="027282b68b61199b949dc86c9adab3b3" name="src/libmongoc/src/mongoc/mongoc-client-pool.c" role="src" />
<file md5sum="157c8b070899d5ccb1af77a881c37b49" name="src/libmongoc/src/mongoc/mongoc-client-pool.h" role="src" />
<file md5sum="8a35ae96824e78b9df5d2348f416de53" name="src/libmongoc/src/mongoc/mongoc-client-private.h" role="src" />
<file md5sum="bf2d6b93e346c32cfdc3d3ab7a6b5e47" name="src/libmongoc/src/mongoc/mongoc-client.c" role="src" />
<file md5sum="838f803105ad29caa6951272965ce715" name="src/libmongoc/src/mongoc/mongoc-client.h" role="src" />
<file md5sum="25469cdf4539d0f3b1578e2cd6eda728" name="src/libmongoc/src/mongoc/mongoc-cluster-private.h" role="src" />
<file md5sum="3dbff0848435cbe459e5137bc1de7133" name="src/libmongoc/src/mongoc/mongoc-cluster.c" role="src" />
<file md5sum="15722c59ad5969b1a3cac31ba2e8e005" name="src/libmongoc/src/mongoc/mongoc-collection-private.h" role="src" />
<file md5sum="3b97147244fb6a3371d8d9413be529ab" name="src/libmongoc/src/mongoc/mongoc-collection.c" role="src" />
<file md5sum="ead7a19ab678217ac91ce4fd6aae9469" name="src/libmongoc/src/mongoc/mongoc-collection.h" role="src" />
<file md5sum="b2e49cce9cc87c596c8471ed51f8c598" name="src/libmongoc/src/mongoc/mongoc-config.h" role="src" />
<file md5sum="4f99537fd0006a2ed2ce7077ba4d0c53" name="src/libmongoc/src/mongoc/mongoc-config.h.in" role="src" />
<file md5sum="1f31f3242a56bde2eda583777e9be5d0" name="src/libmongoc/src/mongoc/mongoc-counters-private.h" role="src" />
<file md5sum="0b0f0940265bd265554b09c36f0d5bd8" name="src/libmongoc/src/mongoc/mongoc-counters.c" role="src" />
<file md5sum="4bf259bbc90203a8a52270f2c9c473f7" name="src/libmongoc/src/mongoc/mongoc-counters.defs" role="src" />
<file md5sum="4bcf3556ba089250ac6e1ddb54b1647a" name="src/libmongoc/src/mongoc/mongoc-cursor-array-private.h" role="src" />
<file md5sum="5c433648a02845357a4c292150a305a4" name="src/libmongoc/src/mongoc/mongoc-cursor-array.c" role="src" />
<file md5sum="36f631b67d7867fa047f690e63577f8c" name="src/libmongoc/src/mongoc/mongoc-cursor-cursorid-private.h" role="src" />
<file md5sum="8dc4f6594cf34015033c38b0d72c2fef" name="src/libmongoc/src/mongoc/mongoc-cursor-cursorid.c" role="src" />
<file md5sum="6daaa062ea92e1aca670090312da9c6a" name="src/libmongoc/src/mongoc/mongoc-cursor-private.h" role="src" />
<file md5sum="9cbe4f04279d1d3c6e1c6c3b878c9e11" name="src/libmongoc/src/mongoc/mongoc-cursor-transform-private.h" role="src" />
<file md5sum="2700b1f603ffb52c0e22d04f437f983e" name="src/libmongoc/src/mongoc/mongoc-cursor-transform.c" role="src" />
<file md5sum="da3b36c2193e98d6f06774fc2f4f19a1" name="src/libmongoc/src/mongoc/mongoc-cursor.c" role="src" />
<file md5sum="6616bbe8a95bc5beb53a5207d431a0d5" name="src/libmongoc/src/mongoc/mongoc-cursor.h" role="src" />
<file md5sum="2807a008970f8b2078537c076751e438" name="src/libmongoc/src/mongoc/mongoc-database-private.h" role="src" />
<file md5sum="49437d60fc7251d2d091c53a819be09b" name="src/libmongoc/src/mongoc/mongoc-database.c" role="src" />
<file md5sum="8145f76bd48c642f903d31cfaf24153d" name="src/libmongoc/src/mongoc/mongoc-database.h" role="src" />
<file md5sum="f2f66f58d8c27cd003ef25f7382d7b21" name="src/libmongoc/src/mongoc/mongoc-errno-private.h" role="src" />
<file md5sum="17eca5b9306d109b6eabdc642f5006de" name="src/libmongoc/src/mongoc/mongoc-error.h" role="src" />
<file md5sum="3ea600e636277422052b45817ddb765c" name="src/libmongoc/src/mongoc/mongoc-find-and-modify-private.h" role="src" />
<file md5sum="f1bea46496e521019b9f47b9d18a52a6" name="src/libmongoc/src/mongoc/mongoc-find-and-modify.c" role="src" />
<file md5sum="b2d02e24e69b1ac0ef15a27b3b222402" name="src/libmongoc/src/mongoc/mongoc-find-and-modify.h" role="src" />
<file md5sum="a451f9575924b096df541a3159876a7e" name="src/libmongoc/src/mongoc/mongoc-flags.h" role="src" />
<file md5sum="7221be0c03bcf8197100ee592bcd0421" name="src/libmongoc/src/mongoc/mongoc-gridfs-file-list-private.h" role="src" />
<file md5sum="c381845c1aecd1f0c753c69038204f44" name="src/libmongoc/src/mongoc/mongoc-gridfs-file-list.c" role="src" />
<file md5sum="8d7a1b16810791074fe071d8d75a7374" name="src/libmongoc/src/mongoc/mongoc-gridfs-file-list.h" role="src" />
<file md5sum="3a0401e433cb6691f798497b19a27faf" name="src/libmongoc/src/mongoc/mongoc-gridfs-file-page-private.h" role="src" />
<file md5sum="fff294b867bf83dd3711ee3665e27127" name="src/libmongoc/src/mongoc/mongoc-gridfs-file-page.c" role="src" />
<file md5sum="bd1c523d758a24e137e3ab9073e22664" name="src/libmongoc/src/mongoc/mongoc-gridfs-file-page.h" role="src" />
<file md5sum="8126f403eebf969f10133c91688693a8" name="src/libmongoc/src/mongoc/mongoc-gridfs-file-private.h" role="src" />
<file md5sum="d273b88f79206c1c85a455535d506023" name="src/libmongoc/src/mongoc/mongoc-gridfs-file.c" role="src" />
<file md5sum="00b70108474e3a3cff6ecc11e8b36b85" name="src/libmongoc/src/mongoc/mongoc-gridfs-file.h" role="src" />
<file md5sum="5b58027f4adfe99b4dd02d74845674e6" name="src/libmongoc/src/mongoc/mongoc-gridfs-private.h" role="src" />
<file md5sum="930934eb967184e220acb93ad1c01fff" name="src/libmongoc/src/mongoc/mongoc-gridfs.c" role="src" />
<file md5sum="0411f5526c8bdc64ce67b45037d9c402" name="src/libmongoc/src/mongoc/mongoc-gridfs.h" role="src" />
<file md5sum="e85d3190970eceda6bd30794e19f6320" name="src/libmongoc/src/mongoc/mongoc-host-list-private.h" role="src" />
<file md5sum="5ad5435d0cdb0637089e0825fb41a58c" name="src/libmongoc/src/mongoc/mongoc-host-list.c" role="src" />
<file md5sum="4294099976ce13b16ccd9f1e054ecd4e" name="src/libmongoc/src/mongoc/mongoc-host-list.h" role="src" />
<file md5sum="78c8c87966ee07cde3038e8a6b8ac064" name="src/libmongoc/src/mongoc/mongoc-index.c" role="src" />
<file md5sum="8651a3a3de2b4a3e62e5de7445db05a6" name="src/libmongoc/src/mongoc/mongoc-index.h" role="src" />
<file md5sum="c278a5ff07c3eb8647d0cd1b1248c8ec" name="src/libmongoc/src/mongoc/mongoc-init.c" role="src" />
<file md5sum="2e7f045a0b31e9e7f0b1dcbdcf994dde" name="src/libmongoc/src/mongoc/mongoc-init.h" role="src" />
<file md5sum="952d463b654e44a66123cd8883b59748" name="src/libmongoc/src/mongoc/mongoc-iovec.h" role="src" />
<file md5sum="e5896d28954c789851bdc41a354137e3" name="src/libmongoc/src/mongoc/mongoc-list-private.h" role="src" />
<file md5sum="01f733a69d79f45e7a8b7a01fd9b61e1" name="src/libmongoc/src/mongoc/mongoc-list.c" role="src" />
<file md5sum="f22dd13ca5baf5f077957ad69f1980f7" name="src/libmongoc/src/mongoc/mongoc-log-private.h" role="src" />
<file md5sum="d7a77f863ca9891bdef2df7e56d39ea0" name="src/libmongoc/src/mongoc/mongoc-log.c" role="src" />
<file md5sum="c5cb2612a9de7a5547e346c56f73fce1" name="src/libmongoc/src/mongoc/mongoc-log.h" role="src" />
<file md5sum="e810e7f6c293f7ec50087199489e4d1b" name="src/libmongoc/src/mongoc/mongoc-matcher-op-private.h" role="src" />
<file md5sum="d134ab092926a9e19b4dd14f85122681" name="src/libmongoc/src/mongoc/mongoc-matcher-op.c" role="src" />
<file md5sum="95c2c9fabd8b98d069bf991bd4ab09c2" name="src/libmongoc/src/mongoc/mongoc-matcher-private.h" role="src" />
<file md5sum="34d9b266424c63145eb1b9fa4f8e4d49" name="src/libmongoc/src/mongoc/mongoc-matcher.c" role="src" />
<file md5sum="60b8b16f9f2755afdf9200d03fd8c0e8" name="src/libmongoc/src/mongoc/mongoc-matcher.h" role="src" />
<file md5sum="f8775a67f08ccf3c0a37e78e262bd1db" name="src/libmongoc/src/mongoc/mongoc-memcmp-private.h" role="src" />
<file md5sum="7a2c50776b0cb3d84b1463d5da8f9571" name="src/libmongoc/src/mongoc/mongoc-memcmp.c" role="src" />
<file md5sum="a85087cd67361993a945ecddce1b8ff3" name="src/libmongoc/src/mongoc/mongoc-opcode-private.h" role="src" />
<file md5sum="2fd75713af0b61664ca7947837b00282" name="src/libmongoc/src/mongoc/mongoc-opcode.c" role="src" />
<file md5sum="cb8c7ee22278ab7c4e17223deb233dcf" name="src/libmongoc/src/mongoc/mongoc-opcode.h" role="src" />
<file md5sum="1f331502e7732bf78818f6c091edc0a0" name="src/libmongoc/src/mongoc/mongoc-queue-private.h" role="src" />
<file md5sum="32104ba20ad54be40b325e16b12d9c00" name="src/libmongoc/src/mongoc/mongoc-queue.c" role="src" />
<file md5sum="629eb2e4cb793d3df56eccad22fda408" name="src/libmongoc/src/mongoc/mongoc-rand-private.h" role="src" />
<file md5sum="2aac2e1c9ad4562ac60b1cd9fecc1dd5" name="src/libmongoc/src/mongoc/mongoc-rand.c" role="src" />
<file md5sum="8df03b94f2f9f6579c18df1e638ce104" name="src/libmongoc/src/mongoc/mongoc-rand.h" role="src" />
<file md5sum="7191582d07d7de03dd875008d79afe9d" name="src/libmongoc/src/mongoc/mongoc-read-concern-private.h" role="src" />
<file md5sum="9363321e0fb76f61035f43693b6ce987" name="src/libmongoc/src/mongoc/mongoc-read-concern.c" role="src" />
<file md5sum="2b593492cfde89109dc6c38f8f3d7b06" name="src/libmongoc/src/mongoc/mongoc-read-concern.h" role="src" />
<file md5sum="413e9c5e77049ea6be01d1ec35d3cde3" name="src/libmongoc/src/mongoc/mongoc-read-prefs-private.h" role="src" />
<file md5sum="b14c4532f424c935a9b892f1a9a12bb1" name="src/libmongoc/src/mongoc/mongoc-read-prefs.c" role="src" />
<file md5sum="461ac5979473d51f5f48c13fb44e0a29" name="src/libmongoc/src/mongoc/mongoc-read-prefs.h" role="src" />
<file md5sum="27be0f303ab3112f3cb7c7b8cc6388df" name="src/libmongoc/src/mongoc/mongoc-rpc-private.h" role="src" />
<file md5sum="79e6a14df9771fb802a8d48d1f39ee89" name="src/libmongoc/src/mongoc/mongoc-rpc.c" role="src" />
<file md5sum="d4dce2c0eae43640d837886d6859d731" name="src/libmongoc/src/mongoc/mongoc-sasl-private.h" role="src" />
<file md5sum="b7f4ba6d5da7444f0a1f756580537c5f" name="src/libmongoc/src/mongoc/mongoc-sasl.c" role="src" />
<file md5sum="316a128390a4effb8679c93001d5a81f" name="src/libmongoc/src/mongoc/mongoc-scram-private.h" role="src" />
<file md5sum="faef7ecc6c5aef6af46a5220f6c8af11" name="src/libmongoc/src/mongoc/mongoc-scram.c" role="src" />
<file md5sum="67535ce6208d29b462896a7f11311047" name="src/libmongoc/src/mongoc/mongoc-server-description-private.h" role="src" />
<file md5sum="35f280153974006eedc4eab5acceb347" name="src/libmongoc/src/mongoc/mongoc-server-description.c" role="src" />
<file md5sum="e890f31a55697373a0fe78779d6f6a1b" name="src/libmongoc/src/mongoc/mongoc-server-description.h" role="src" />
<file md5sum="17072d626c8bbbc5e615b21c1894cabb" name="src/libmongoc/src/mongoc/mongoc-server-stream-private.h" role="src" />
<file md5sum="ede84d32df4492a63bf755e2d2c65277" name="src/libmongoc/src/mongoc/mongoc-server-stream.c" role="src" />
<file md5sum="88280d22e22512d18d7f0ef9984e19f3" name="src/libmongoc/src/mongoc/mongoc-set-private.h" role="src" />
<file md5sum="ece9697b7e642474217e6c9206965515" name="src/libmongoc/src/mongoc/mongoc-set.c" role="src" />
<file md5sum="83783d033809df281750fb753a46a19c" name="src/libmongoc/src/mongoc/mongoc-socket-private.h" role="src" />
<file md5sum="f9c50f0171562a5f1ee4839740eba7e8" name="src/libmongoc/src/mongoc/mongoc-socket.c" role="src" />
<file md5sum="fad2ef691dada43693e23258ce38edd1" name="src/libmongoc/src/mongoc/mongoc-socket.h" role="src" />
<file md5sum="f7ef8d9af5b819c487ecea62556c7cb0" name="src/libmongoc/src/mongoc/mongoc-ssl-private.h" role="src" />
<file md5sum="a0f3b695c8cf5b4d78acce2b52b99a54" name="src/libmongoc/src/mongoc/mongoc-ssl.c" role="src" />
<file md5sum="31994e5f8251ec608848ae77c3e4bc0f" name="src/libmongoc/src/mongoc/mongoc-ssl.h" role="src" />
<file md5sum="cec9870de7bcad60452190be1810299c" name="src/libmongoc/src/mongoc/mongoc-stream-buffered.c" role="src" />
<file md5sum="219b98e834e09f07cc30531e23e5196e" name="src/libmongoc/src/mongoc/mongoc-stream-buffered.h" role="src" />
<file md5sum="40728e6d49f64fef38adf55eb005b285" name="src/libmongoc/src/mongoc/mongoc-stream-file.c" role="src" />
<file md5sum="251e3ad92a9e7c848cd969bf11f36224" name="src/libmongoc/src/mongoc/mongoc-stream-file.h" role="src" />
<file md5sum="acb34825ac1914c7887459e4bb29bd0b" name="src/libmongoc/src/mongoc/mongoc-stream-gridfs.c" role="src" />
<file md5sum="7466a71b6513a5c2ecc28944a2d7cc07" name="src/libmongoc/src/mongoc/mongoc-stream-gridfs.h" role="src" />
<file md5sum="8a5bd28c3854d5737d2008ac2f431c5e" name="src/libmongoc/src/mongoc/mongoc-stream-private.h" role="src" />
<file md5sum="ca854886b6c2de590271ed84ee375727" name="src/libmongoc/src/mongoc/mongoc-stream-socket.c" role="src" />
<file md5sum="a244649d298edb48b3b7e84693526861" name="src/libmongoc/src/mongoc/mongoc-stream-socket.h" role="src" />
<file md5sum="ecfed477b8d8a69d3710ae5d66710b38" name="src/libmongoc/src/mongoc/mongoc-stream-tls.c" role="src" />
<file md5sum="3eea101670cf42b867d5a61597548f36" name="src/libmongoc/src/mongoc/mongoc-stream-tls.h" role="src" />
<file md5sum="66e46835120b2df99c7b0db2387dd6c3" name="src/libmongoc/src/mongoc/mongoc-stream.c" role="src" />
<file md5sum="40bdf55f52281c74e6c9c1a876e77637" name="src/libmongoc/src/mongoc/mongoc-stream.h" role="src" />
<file md5sum="b7420c8161037d2990282f9599c5c66e" name="src/libmongoc/src/mongoc/mongoc-thread-private.h" role="src" />
<file md5sum="1552518974e45e7e1b75745457701d70" name="src/libmongoc/src/mongoc/mongoc-topology-description-private.h" role="src" />
<file md5sum="cf9d8f42c3723870c3f479c052aaaa27" name="src/libmongoc/src/mongoc/mongoc-topology-description.c" role="src" />
<file md5sum="70c41e9792dc744332b22762ba593d35" name="src/libmongoc/src/mongoc/mongoc-topology-private.h" role="src" />
<file md5sum="fa0c4c686d95e29b97f39db6e88a3c44" name="src/libmongoc/src/mongoc/mongoc-topology-scanner-private.h" role="src" />
<file md5sum="9e451ba52b688873042abca83cbb3200" name="src/libmongoc/src/mongoc/mongoc-topology-scanner.c" role="src" />
<file md5sum="1405db311f8b7712faf08c0b2aff9b40" name="src/libmongoc/src/mongoc/mongoc-topology.c" role="src" />
<file md5sum="f8fe41c378f1b6a9c22e3a0c9195909a" name="src/libmongoc/src/mongoc/mongoc-trace.h" role="src" />
<file md5sum="f2d7142c7e850f3f242154e729ab07eb" name="src/libmongoc/src/mongoc/mongoc-uri-private.h" role="src" />
<file md5sum="51121710e2a197f518b891420a40069a" name="src/libmongoc/src/mongoc/mongoc-uri.c" role="src" />
<file md5sum="453f882020f4d0e2f618ba02a6904599" name="src/libmongoc/src/mongoc/mongoc-uri.h" role="src" />
<file md5sum="9e895e0de623c8d4618e52e6e9fec36c" name="src/libmongoc/src/mongoc/mongoc-util-private.h" role="src" />
<file md5sum="94bd0076ee62643a3f82faff1e2c1f5f" name="src/libmongoc/src/mongoc/mongoc-util.c" role="src" />
<file md5sum="e699d508bdb2d3f5220bbc5bf413bae1" name="src/libmongoc/src/mongoc/mongoc-version-functions.c" role="src" />
<file md5sum="13165cf1b16ef34ec8d72cb980705477" name="src/libmongoc/src/mongoc/mongoc-version-functions.h" role="src" />
<file md5sum="4fabfa37326789603a9b056da1dacc7b" name="src/libmongoc/src/mongoc/mongoc-version.h" role="src" />
<file md5sum="2f63b4b1f86910aab6a6e7423af3f7a8" name="src/libmongoc/src/mongoc/mongoc-version.h.in" role="src" />
<file md5sum="445de5fdc0a96238c91dcb0ed0066aa3" name="src/libmongoc/src/mongoc/mongoc-write-command-private.h" role="src" />
<file md5sum="e49314c311a879b20ccdd02270bd56de" name="src/libmongoc/src/mongoc/mongoc-write-command.c" role="src" />
<file md5sum="a85e113e3ebedb5db35c3d34ab7e7453" name="src/libmongoc/src/mongoc/mongoc-write-concern-private.h" role="src" />
<file md5sum="0c1c7aecc6c11102d7433b98a08f8f6c" name="src/libmongoc/src/mongoc/mongoc-write-concern.c" role="src" />
<file md5sum="f4d70867c1f3ef046a36e8d46a12d693" name="src/libmongoc/src/mongoc/mongoc-write-concern.h" role="src" />
<file md5sum="78ceb5e92fa9f74562553680b32ce907" name="src/libmongoc/src/mongoc/mongoc.h" role="src" />
<file md5sum="ed1890accd7d9a1426fdac121ed42ad4" name="src/libmongoc/src/mongoc/op-delete.def" role="src" />
<file md5sum="9af88adf2ef432761bbe81db2f9bdce7" name="src/libmongoc/src/mongoc/op-get-more.def" role="src" />
<file md5sum="242fff22640f143ae262e363e8552a7e" name="src/libmongoc/src/mongoc/op-header.def" role="src" />
<file md5sum="2efe34631dd0d540d0f1d2fdb2d57813" name="src/libmongoc/src/mongoc/op-insert.def" role="src" />
<file md5sum="79ab986cb49a47e7c9bccdc4005a9697" name="src/libmongoc/src/mongoc/op-kill-cursors.def" role="src" />
<file md5sum="25dd34248b0000465c7e2ac769fc509a" name="src/libmongoc/src/mongoc/op-msg.def" role="src" />
<file md5sum="a986d22cb495d652dc6059d722bb3266" name="src/libmongoc/src/mongoc/op-query.def" role="src" />
<file md5sum="dd22bb15cb70d35fe25192f0f304871b" name="src/libmongoc/src/mongoc/op-reply.def" role="src" />
<file md5sum="03c6179a4fe8b51c606b03a763529d55" name="src/libmongoc/src/mongoc/op-update.def" role="src" />
<file md5sum="94cc18fabf34abc9acbff2ec6c5293f6" name="src/libmongoc/src/mongoc/utlist.h" role="src" />
<file md5sum="89adcc4bbd31489c3f6aab1c2211fc52" name="src/libmongoc/VERSION_CURRENT" role="src" />
<file md5sum="0589f66713bc44029a1a720b9a0d850d" name="src/libmongoc/VERSION_RELEASED" role="src" />
- <file md5sum="d01658b5811259aa162f0c1739e50c2d" name="src/bson.c" role="src" />
+ <file md5sum="6b2b42a746f43226947dff1c364b0442" name="src/bson.c" role="src" />
<file md5sum="bebc35732bfee1cc066e6b69179372f4" name="tests/bson/bson-binary-001.phpt" role="test" />
<file md5sum="23d700ccdf85be88ba90ade89c280e20" name="tests/bson/bson-binary_error-001.phpt" role="test" />
<file md5sum="d8bf50966d4a846980e5bb0c7e2af9ae" name="tests/bson/bson-binary_error-002.phpt" role="test" />
<file md5sum="c6edc1bcdf992161a3cb3858d46eb0e7" name="tests/bson/bson-binary_error-003.phpt" role="test" />
<file md5sum="a24affdc861cf1f852132176382d3f9b" name="tests/bson/bson-decode-001.phpt" role="test" />
<file md5sum="4601ef879a00a3f5d292ce02d397ac83" name="tests/bson/bson-decode-002.phpt" role="test" />
<file md5sum="0464160c1c9d7944eb73d9d9591937c6" name="tests/bson/bson-encode-001.phpt" role="test" />
<file md5sum="809e6edcf382893ee73f8284ebedfb32" name="tests/bson/bson-encode-002.phpt" role="test" />
<file md5sum="3a9e1730a0e95c9b56d87d90cf05370d" name="tests/bson/bson-encode-003.phpt" role="test" />
<file md5sum="cecc8a8e855571287fffe7ed99c9ee43" name="tests/bson/bson-encode-004.phpt" role="test" />
<file md5sum="31e2e2bba761f0b40870344955365015" name="tests/bson/bson-encode-005.phpt" role="test" />
<file md5sum="92afbf6ebf6949ab35ff5d96dc539f8f" name="tests/bson/bson-fromJSON-001.phpt" role="test" />
<file md5sum="eec9171b4f1469e82bd77054a15bcf72" name="tests/bson/bson-fromJSON-002.phpt" role="test" />
<file md5sum="3406e7eb87f87d8d4417c30abc08dcde" name="tests/bson/bson-fromJSON_error-001.phpt" role="test" />
<file md5sum="9f55401972a1fec4e2e3e2fe51a93cda" name="tests/bson/bson-fromPHP-001.phpt" role="test" />
<file md5sum="b2c107d47a52d68f23996e347801a286" name="tests/bson/bson-fromPHP-002.phpt" role="test" />
<file md5sum="65ad004cffe9c745ccad21abaac1cc44" name="tests/bson/bson-fromPHP-003.phpt" role="test" />
<file md5sum="1b5e765a75dd2a3dc9da924ccd14533b" name="tests/bson/bson-fromPHP_error-001.phpt" role="test" />
<file md5sum="e2fc4c4382076d28ff0b73831a76e052" name="tests/bson/bson-fromPHP_error-002.phpt" role="test" />
<file md5sum="19c7f5b78a1cee1a33db608ce9cb023c" name="tests/bson/bson-fromPHP_error-003.phpt" role="test" />
<file md5sum="9bd6b7e322f81c800abd6366d52e0cce" name="tests/bson/bson-generate-document-id.phpt" role="test" />
<file md5sum="786d13fade1d06628539b0d531f7beed" name="tests/bson/bson-javascript-001.phpt" role="test" />
<file md5sum="201a4b0e0502669dd9a2f88fcb79e6d2" name="tests/bson/bson-javascript-002.phpt" role="test" />
<file md5sum="2f035a4f305d3273cc716d26637f4cf1" name="tests/bson/bson-javascript_error-001.phpt" role="test" />
<file md5sum="4f20468db5aa0493fb7f480f53a4e4be" name="tests/bson/bson-javascript_error-002.phpt" role="test" />
<file md5sum="6460ad33cd1263ccd43682a95b2b2fc7" name="tests/bson/bson-javascript_error-003.phpt" role="test" />
<file md5sum="3f90ee154574175d38dc4e5f5ec5d0cf" name="tests/bson/bson-maxkey-001.phpt" role="test" />
<file md5sum="7e7cf76daee27aae60c25fdd35ed9b7d" name="tests/bson/bson-maxkey_error-001.phpt" role="test" />
<file md5sum="ada69643cc053c53b82db805ba1e5c92" name="tests/bson/bson-maxkey_error-002.phpt" role="test" />
<file md5sum="c10d9f780bb8ba4439b034e1340d9d76" name="tests/bson/bson-minkey-001.phpt" role="test" />
<file md5sum="5d3920d3e7844c2431a9bfbb30265858" name="tests/bson/bson-minkey_error-001.phpt" role="test" />
<file md5sum="5415e6d048b5b1bd87081f85629822bb" name="tests/bson/bson-minkey_error-002.phpt" role="test" />
<file md5sum="a950b10013aea4fee6e484dfa4454677" name="tests/bson/bson-objectid-001.phpt" role="test" />
<file md5sum="06e8e2ee8b9b0d7e6c14925a08560eda" name="tests/bson/bson-objectid_error-001.phpt" role="test" />
<file md5sum="12197a7a1f1da8e8d261a1175a24a991" name="tests/bson/bson-objectid_error-002.phpt" role="test" />
<file md5sum="116901311ab5a7d9b9a52af094e4e5be" name="tests/bson/bson-objectid_error-003.phpt" role="test" />
<file md5sum="50446b3a17358b9a892d7282fbd8d6f6" name="tests/bson/bson-ods-001.phpt" role="test" />
<file md5sum="ac78081e3fce779fe356cd4110a5e591" name="tests/bson/bson-ods-002.phpt" role="test" />
<file md5sum="bb2c9e6bff9ae8362b7d150f2d282cc2" name="tests/bson/bson-regex-001.phpt" role="test" />
<file md5sum="e66c17b47715dccfc3a0e2f987ce61da" name="tests/bson/bson-regex-002.phpt" role="test" />
<file md5sum="de4df90c9ee5b40559e9edfed627f9d8" name="tests/bson/bson-regex_error-001.phpt" role="test" />
<file md5sum="6e1ed89e0426347834a2b4e860dd1392" name="tests/bson/bson-regex_error-002.phpt" role="test" />
<file md5sum="650ac63699736efe694d9e62cdb49fbf" name="tests/bson/bson-regex_error-003.phpt" role="test" />
<file md5sum="f6fd1c46cf896f9982b1db26fd536cba" name="tests/bson/bson-timestamp-001.phpt" role="test" />
<file md5sum="8067d16233d25829749ad212b66e2c64" name="tests/bson/bson-timestamp-002.phpt" role="test" />
<file md5sum="69e996eb6cbaaec323c3eda792b7438f" name="tests/bson/bson-timestamp_error-001.phpt" role="test" />
<file md5sum="fabc524c64400904634c839dd6d99ac3" name="tests/bson/bson-timestamp_error-002.phpt" role="test" />
<file md5sum="830b9a8a71a4f43966a9fc436a426e15" name="tests/bson/bson-timestamp_error-003.phpt" role="test" />
<file md5sum="98f6afe81e8b17479334a1395f6ef083" name="tests/bson/bson-toJSON-001.phpt" role="test" />
<file md5sum="6fabfe78cf07809a024fa119d93ec45c" name="tests/bson/bson-toJSON-002.phpt" role="test" />
<file md5sum="d64790fe90b3be1ab7ada8788214e0e6" name="tests/bson/bson-toJSON_error-001.phpt" role="test" />
<file md5sum="77c57776452ba9bbcb5f6abbe360391f" name="tests/bson/bson-toPHP-001.phpt" role="test" />
<file md5sum="4d1e09c1b3458bb26c54b3d8ce8b11da" name="tests/bson/bson-toPHP-002.phpt" role="test" />
<file md5sum="5f9521d0dcfb6c38de8fd349f0e5f0a2" name="tests/bson/bson-toPHP-003.phpt" role="test" />
<file md5sum="5db3929a04f1a0d705dc7fe26deddf64" name="tests/bson/bson-toPHP_error-001.phpt" role="test" />
<file md5sum="6c0f49e220988f9bf9168841df4e4231" name="tests/bson/bson-toPHP_error-002.phpt" role="test" />
<file md5sum="191fed9e085f5ad6b0c99fd2fff0e55d" name="tests/bson/bson-unknown-001.phpt" role="test" />
<file md5sum="99c8c7d06810f625c76f4afb00abcefd" name="tests/bson/bson-utcdatetime-001.phpt" role="test" />
<file md5sum="d4e3f0f5f81f36340ba1bab833dc0d1b" name="tests/bson/bson-utcdatetime-002.phpt" role="test" />
<file md5sum="2b60a43dd5ef6ea63a58c15d305b05cc" name="tests/bson/bson-utcdatetime-003.phpt" role="test" />
<file md5sum="c351628e8162ba357d2c8149b3742765" name="tests/bson/bson-utcdatetime-todatetime-001.phpt" role="test" />
<file md5sum="e1196daddbe4dbb675ccf1662b8f5b79" name="tests/bson/bson-utcdatetime-tostring-001.phpt" role="test" />
<file md5sum="edef347cbb01369c592ef199e7ff00bf" name="tests/bson/bson-utcdatetime_error-001.phpt" role="test" />
<file md5sum="2d1fd5c8766539563d9ed65f6026341b" name="tests/bson/bson-utcdatetime_error-002.phpt" role="test" />
<file md5sum="1cc72ac75008b602572e9f7933e89dab" name="tests/bson/bson-utcdatetime_error-003.phpt" role="test" />
<file md5sum="cf9a63f20ee1f04a2fadb6a01ea698db" name="tests/bson/bug0274.phpt" role="test" />
<file md5sum="3b098061a8551c3f854cffea73f2d05f" name="tests/bson/bug0325.phpt" role="test" />
<file md5sum="5b9d36885e7a3701f1f54ae92fd81ff9" name="tests/bson/bug0334-001.phpt" role="test" />
<file md5sum="c4f2ea95fb457c338e2c53f25c2ef32c" name="tests/bson/bug0334-002.phpt" role="test" />
<file md5sum="53a43be600eea2408ee6a418b50f5374" name="tests/bson/bug0341.phpt" role="test" />
<file md5sum="57242d53c1e3eba449230809e66b861f" name="tests/bson/bug0347.phpt" role="test" />
+ <file md5sum="34f057d3c3d9914d5fb99db8f2e9084c" name="tests/bson/bug0528.phpt" role="test" />
+ <file md5sum="64fd0e7084e056bfa3a44ac44ae3a714" name="tests/bson/bug0531.phpt" role="test" />
<file md5sum="1eea1b95c48b6927aff3e6dfdc3ddb11" name="tests/bson/typemap-001.phpt" role="test" />
<file md5sum="3b3925e0fc24c6be84e30606185bd201" name="tests/bson/typemap-002.phpt" role="test" />
<file md5sum="62b3bc67aa25f05a6f5f357096fb36a1" name="tests/bulk/write-0001.phpt" role="test" />
<file md5sum="61045106e3c9f52ffedbf94c52946da1" name="tests/bulk/write-0002.phpt" role="test" />
<file md5sum="02e74cf0ff0e2240901dfe918d6cbeab" name="tests/connect/replicaset-seedlist-001.phpt" role="test" />
<file md5sum="60392dab08a5778d885aac6984bc4a5a" name="tests/connect/replicaset-seedlist-002.phpt" role="test" />
<file md5sum="5782cb975ced7a0d028d9f8c36cfffc4" name="tests/connect/standalone-auth-0001.phpt" role="test" />
<file md5sum="13b4c81631c4fe5b2826b3943b65d481" name="tests/connect/standalone-auth-0002.phpt" role="test" />
<file md5sum="d31ed516811f559e1f9ecd9a557fd0be" name="tests/connect/standalone-plain-0001.phpt" role="test" />
<file md5sum="e8f9688845ac3a1b8f5da6b3d056f2f1" name="tests/connect/standalone-plain-0002.phpt" role="test" />
<file md5sum="a39ac1f4f670cc6f48cbba0e6caf79bf" name="tests/connect/standalone-ssl-0001.phpt" role="test" />
<file md5sum="348c6609676853409a355b5aa7ff7a87" name="tests/connect/standalone-ssl-0002.phpt" role="test" />
<file md5sum="2235e8264cb413b5ffee7da73c70d181" name="tests/connect/standalone-ssl-0003.phpt" role="test" />
<file md5sum="642d62586a60c60e24959f6581f55f5b" name="tests/connect/standalone-ssl-0004.phpt" role="test" />
<file md5sum="14fd196ca9fd966fa83bd7c6b9971d9d" name="tests/connect/standalone-ssl-0005.phpt" role="test" />
<file md5sum="12a9fc685f801ce67bcc408c127a4dc5" name="tests/connect/standalone-ssl-0006.phpt" role="test" />
<file md5sum="3cfa10a59158131a88a0b39b7a0577c5" name="tests/connect/standalone-x509-0001.phpt" role="test" />
<file md5sum="01e1156966566719e490c119bc878d8d" name="tests/connect/standalone-x509-0002.phpt" role="test" />
<file md5sum="9be2eb34d07c21b3503f94d505ee6721" name="tests/connect/standalone-x509-0003.phpt" role="test" />
<file md5sum="734f08cb6bfb53b294114690ea37c84d" name="tests/connect/standalone-x509-0004.phpt" role="test" />
<file md5sum="32b7b683d5f6ab0aa1c0fad10b8b4c83" name="tests/connect/standalone-x509-error-0001.phpt" role="test" />
<file md5sum="dea3f769b6ea7a7cb6f4ff15ed072059" name="tests/functional/cursor-001.phpt" role="test" />
<file md5sum="47be0591e6e7506e859fac86494d7b29" name="tests/functional/cursorid-001.phpt" role="test" />
<file md5sum="6b4b2c27fb5fd3a59af12b30ad7e875c" name="tests/functional/phpinfo-1.phpt" role="test" />
<file md5sum="b65a28921bbe4a801dc43c8f3d1614f2" name="tests/functional/phpinfo-2.phpt" role="test" />
<file md5sum="2a66545653e7035f281c701a4a5bfa1f" name="tests/functional/query-sort-001.phpt" role="test" />
<file md5sum="ee0ff92d6d48e5c624e7043cc4728a0c" name="tests/functional/query-sort-002.phpt" role="test" />
<file md5sum="2cb40b7ecb263d9838aac260382f649d" name="tests/functional/query-sort-003.phpt" role="test" />
<file md5sum="a3f3c941b1ce04e5a9dce9af9b2f1bd7" name="tests/functional/query-sort-004.phpt" role="test" />
<file md5sum="cd9ebc6251e4ae369a27f1baeeeb20a8" name="tests/manager/manager-ctor-001.phpt" role="test" />
<file md5sum="2739447256d9292f60da18e978a19919" name="tests/manager/manager-ctor-002.phpt" role="test" />
<file md5sum="52e2a1bf042ed7a89a51e19e16a035c8" name="tests/manager/manager-ctor_error-001.phpt" role="test" />
<file md5sum="097406cf2525d804cef1d0b9630c3821" name="tests/manager/manager-ctor_error-002.phpt" role="test" />
<file md5sum="1fc3fc1f16f3845176760797cc34e061" name="tests/manager/manager-ctor_error-003.phpt" role="test" />
<file md5sum="ec2dc47bad99221bbb91caada48545fb" name="tests/manager/manager-ctor_error-004.phpt" role="test" />
<file md5sum="2314fdd5b4bc565ea9e05616994f361f" name="tests/manager/manager-debug-001.phpt" role="test" />
<file md5sum="510484a4463fc51f247a94e1fb872e60" name="tests/manager/manager-debug-002.phpt" role="test" />
<file md5sum="68d4a2e5f42415a1fade5d27e7c5723d" name="tests/manager/manager-debug-003.phpt" role="test" />
<file md5sum="0f8db6f664bc5cd5169365314e029598" name="tests/manager/manager-destruct-001.phpt" role="test" />
<file md5sum="eb865c94e36cb45d30deaa1fef6f6b61" name="tests/manager/manager-executeBulkWrite-001.phpt" role="test" />
<file md5sum="8699029df0d1c55416ff2e9b84f29de7" name="tests/manager/manager-executeBulkWrite-002.phpt" role="test" />
<file md5sum="e026dd6019cc223d720831cc2477f9ad" name="tests/manager/manager-executeBulkWrite-003.phpt" role="test" />
<file md5sum="5573209b66cbce19a2261b154a8965fc" name="tests/manager/manager-executeBulkWrite-004.phpt" role="test" />
<file md5sum="369baa6800666052fcd234bca4d6d212" name="tests/manager/manager-executeBulkWrite-005.phpt" role="test" />
<file md5sum="0ae8e3f91a0281b349ccbbf5a6d38645" name="tests/manager/manager-executeBulkWrite-006.phpt" role="test" />
<file md5sum="27b857c44e4cb8038de7783fefb75dbe" name="tests/manager/manager-executeBulkWrite-007.phpt" role="test" />
<file md5sum="94c563468ea9ca945cccfd489a8a569e" name="tests/manager/manager-executeBulkWrite-008.phpt" role="test" />
<file md5sum="d9b09740e5c0dfc266a730d9a15dfc5b" name="tests/manager/manager-executeBulkWrite-009.phpt" role="test" />
<file md5sum="f110b2740f1e1f63b4d922af824098b7" name="tests/manager/manager-executeBulkWrite-010.phpt" role="test" />
<file md5sum="0a543b513ab67edf8dd8ff8f86d68240" name="tests/manager/manager-executeBulkWrite-011.phpt" role="test" />
<file md5sum="d5db1f1b8860965524f5505c2c8e0053" name="tests/manager/manager-executeBulkWrite_error-001.phpt" role="test" />
<file md5sum="ab0ee084b98f5b4c2b20a725c338829d" name="tests/manager/manager-executeBulkWrite_error-002.phpt" role="test" />
<file md5sum="320dcab2173121ed59c0c3b215e08693" name="tests/manager/manager-executeBulkWrite_error-003.phpt" role="test" />
<file md5sum="28050f83150913f43aca71c41ef8b9af" name="tests/manager/manager-executeBulkWrite_error-004.phpt" role="test" />
<file md5sum="2a0e7d1c9c67dcd53c2d4575687bba0f" name="tests/manager/manager-executeBulkWrite_error-005.phpt" role="test" />
<file md5sum="52b893f83cea7b051ac91fa16621da72" name="tests/manager/manager-executeBulkWrite_error-006.phpt" role="test" />
<file md5sum="a89e534345a596263e6bbfe924a82f90" name="tests/manager/manager-executeCommand-001.phpt" role="test" />
<file md5sum="b91fd7fac176c4f86d557f38e2d5b321" name="tests/manager/manager-executeQuery-001.phpt" role="test" />
<file md5sum="dfcba1862c4bfd21780696531d9ad995" name="tests/manager/manager-executeQuery-002.phpt" role="test" />
<file md5sum="b9fb3a1425e783bada38e4dc1e8357b0" name="tests/manager/manager-executeQuery-005.phpt" role="test" />
<file md5sum="59fc1f8755cee6001ff7e7cf4ec7b545" name="tests/manager/manager-executequery-without-assignment.phpt" role="test" />
<file md5sum="307edfa944ecfee1c143e5417cebb8b0" name="tests/manager/manager-getreadconcern-001.phpt" role="test" />
<file md5sum="311a1b98e6ec0983bdaaa71d1b3ac12a" name="tests/manager/manager-getreadpreference-001.phpt" role="test" />
<file md5sum="984a06de0d8857e1df125babdfac1fef" name="tests/manager/manager-getservers-001.phpt" role="test" />
<file md5sum="99314dc63ca0a4abc49e5a56dc2c6025" name="tests/manager/manager-getservers-002.phpt" role="test" />
<file md5sum="b9f7e97b6e68277a4877995fff51e647" name="tests/manager/manager-getwriteconcern-001.phpt" role="test" />
<file md5sum="f55b83dec74f5c379cf719423abdd703" name="tests/manager/manager-invalidnamespace.phpt" role="test" />
<file md5sum="d6958dfe7978d07cb51fc4d81c86b1e9" name="tests/manager/manager-selectserver-001.phpt" role="test" />
<file md5sum="1b44b8daec032ca66d24b26f3a43f1ee" name="tests/manager/manager-set-uri-options-001.phpt" role="test" />
<file md5sum="31098091db5117a73880a689d1b22a69" name="tests/manager/manager-set-uri-options-002.phpt" role="test" />
<file md5sum="e1bc8c3b5e84c2f8d6333dbbd63a5041" name="tests/manager/manager-var-dump-001.phpt" role="test" />
<file md5sum="34f2067a0a6c77bb0d5d928baf93e639" name="tests/manager/manager-wakeup.phpt" role="test" />
<file md5sum="bf41b7f6435243e4bfef99d526451025" name="tests/readPreference/bug0146-001.phpt" role="test" />
<file md5sum="dae94f754c0d42d839bf97238d8b0910" name="tests/readPreference/bug0146-002.phpt" role="test" />
<file md5sum="a319543f45cd0d04a2aad1eb67000f61" name="tests/readPreference/readpreference-ctor-001.phpt" role="test" />
<file md5sum="e0509842811f6372fb751e61330db4e9" name="tests/readPreference/readpreference-ctor_error-001.phpt" role="test" />
<file md5sum="e8b32dbdd507c31820def47a24a44080" name="tests/readPreference/readpreference-getMode-001.phpt" role="test" />
<file md5sum="4d991b10065eba468053506b77820aeb" name="tests/readPreference/readpreference-getTagSets-001.phpt" role="test" />
<file md5sum="75a4ec8e23ef050d7057e855fff2f5f6" name="tests/server/server-constants.phpt" role="test" />
<file md5sum="4661126e8b4887192c5b4cbb3687021e" name="tests/server/server-construct-001.phpt" role="test" />
<file md5sum="f431e28728e94946f296a489ca4ee5a4" name="tests/server/server-debug.phpt" role="test" />
<file md5sum="d38a111b8fe29155d2e5d25072907dda" name="tests/server/server-errors.phpt" role="test" />
<file md5sum="d394fde992b6bbfd89d732f217806529" name="tests/server/server-executeBulkWrite-001.phpt" role="test" />
<file md5sum="34116ca1ab4ad524bfd7f79838ea8703" name="tests/server/server-executeBulkWrite-002.phpt" role="test" />
<file md5sum="87771b6bfe5910d05c45d5d6152cfbda" name="tests/server/server-executeBulkWrite-003.phpt" role="test" />
<file md5sum="42f4e11675da0b4e7d42c90f95571152" name="tests/server/server-executeBulkWrite-004.phpt" role="test" />
<file md5sum="114b77fc8d26158df96b5c3820142cc5" name="tests/server/server-executeBulkWrite-005.phpt" role="test" />
<file md5sum="570c2f8eee8d401eb38c830a514bcde0" name="tests/server/server-executeCommand-001.phpt" role="test" />
<file md5sum="5fc4aeaa34980a55ddc0ea073061a9e5" name="tests/server/server-executeCommand-002.phpt" role="test" />
<file md5sum="4b9fb5c82943288d5155129327f3299f" name="tests/server/server-executeCommand_error-001.phpt" role="test" />
<file md5sum="f2e023f40ea3af5b1fd4b555948e7143" name="tests/server/server-executeQuery-001.phpt" role="test" />
<file md5sum="4fb14745659a9389c1a483d7edf2b93c" name="tests/server/server-executeQuery-002.phpt" role="test" />
<file md5sum="e5cb7df3413213e2d2cfb2d3e0339d37" name="tests/server/server-executeQuery-003.phpt" role="test" />
<file md5sum="044898026d584ad685adefecf4910147" name="tests/server/server-executeQuery-004.phpt" role="test" />
<file md5sum="fda7a9c2ff6107719b84e4e7e2708367" name="tests/server/server-executeQuery-005.phpt" role="test" />
<file md5sum="986bca1a493fdaa71f346eb168f8266e" name="tests/server/server-executeQuery-006.phpt" role="test" />
<file md5sum="f2e3d061825cd2bbed68de882d4c6bd8" name="tests/server/server-executeQuery_error-001.phpt" role="test" />
<file md5sum="ef31e8b9f59a396d435badf3c9a653c3" name="tests/standalone/bug0159.phpt" role="test" />
<file md5sum="3ff56796c1e87ea6a07ae574ea64aaf4" name="tests/standalone/bug0166.phpt" role="test" />
<file md5sum="87bb7dffe9a182e72322a74ffcbf7cb6" name="tests/standalone/bug0231.phpt" role="test" />
<file md5sum="508f7f23c5b80875cf8893f11fd636b0" name="tests/standalone/bug0357.phpt" role="test" />
<file md5sum="5cac284a2bc03ef77ec8bea7de101bf1" name="tests/standalone/bug0487-001.phpt" role="test" />
<file md5sum="4e577fce830f9c4c09839f04758604ca" name="tests/standalone/bug0487-002.phpt" role="test" />
<file md5sum="727192fdd6f1dc71751a2831b0603583" name="tests/standalone/connectiontimeoutexception-001.phpt" role="test" />
<file md5sum="d1b6e3057856667e03b515c117cc6e01" name="tests/standalone/executiontimeoutexception-001.phpt" role="test" />
<file md5sum="18a8835a80982d575d574ef50c40a383" name="tests/standalone/executiontimeoutexception-002.phpt" role="test" />
<file md5sum="6708621c6c2c09bc2f261dc92c965bf9" name="tests/standalone/manager-as-singleton.phpt" role="test" />
<file md5sum="6bc5f1fba6c3ad151704fd8500d50183" name="tests/standalone/query-errors.phpt" role="test" />
<file md5sum="e199482514ae20307a7bd8125fefbf75" name="tests/standalone/update-multi-001.phpt" role="test" />
<file md5sum="e9a2f6d7aca24415c5f994b71cf670ae" name="tests/standalone/write-error-001.phpt" role="test" />
<file md5sum="18302e344fdb4f636d9d45dacb601337" name="tests/standalone/writeresult-isacknowledged-001.phpt" role="test" />
<file md5sum="95ef690936a92a3bb4df2797516c0198" name="tests/standalone/writeresult-isacknowledged-002.phpt" role="test" />
<file md5sum="f8a5301f0742b61a427521685cd02677" name="tests/standalone/writeresult-isacknowledged-003.phpt" role="test" />
<file md5sum="59adebd29ef983f00c4d55cfc4b2d10d" name="tests/utils/PHONGO-FIXTURES.json.gz" role="test" />
<file md5sum="8eb155fe0ba18304305ec5e7095ac938" name="tests/utils/basic-skipif.inc" role="test" />
<file md5sum="91f09af43e3763fce276c98db4f0378c" name="tests/utils/basic.inc" role="test" />
<file md5sum="e56764b93eec80768bab873e5bfd383a" name="tests/utils/classes.inc" role="test" />
<file md5sum="f2a9dacd7fb16bb525f88444447d5dcc" name="tests/utils/tools.php" role="test" />
<file md5sum="364b6092a91f4bf8761fc554aa8062cb" name="tests/writeConcern/writeconcern-constants.phpt" role="test" />
<file md5sum="defadce8161c38d99237f581358e6d96" name="tests/writeConcern/writeconcern-ctor-001.phpt" role="test" />
<file md5sum="9d8a5d5fbb5180c1e1a73b4885f256fd" name="tests/writeConcern/writeconcern-ctor_error-001.phpt" role="test" />
<file md5sum="46a1f16b20000db3726900b4f80945eb" name="tests/writeConcern/writeconcern-ctor_error-002.phpt" role="test" />
<file md5sum="56e3baaa054aadf32901781a09d330e1" name="tests/writeConcern/writeconcern-ctor_error-003.phpt" role="test" />
<file md5sum="9ca99acf66a4972b548678347236c25f" name="tests/writeConcern/writeconcern-ctor_error-004.phpt" role="test" />
<file md5sum="1d863ece698c49dff7b3cbf254e21a2a" name="tests/writeConcern/writeconcern-debug-001.phpt" role="test" />
<file md5sum="62ae7ce0a7f173df20339fb043ed9ffa" name="tests/writeConcern/writeconcern-debug-002.phpt" role="test" />
<file md5sum="afc708c9f9d830d1c3b7cf60333f1fce" name="tests/writeConcern/writeconcern-getjournal-001.phpt" role="test" />
<file md5sum="d4c305c451a28b591db0160e9f851ee5" name="tests/writeConcern/writeconcern-getw-001.phpt" role="test" />
<file md5sum="ddb88acb62b9b89316f92e3bb6076a48" name="tests/writeConcern/writeconcern-getwtimeout-001.phpt" role="test" />
<file md5sum="e9f9796cf151e0a08d9e7616786e445b" name="win32/bson-config.h" role="src" />
<file md5sum="ea43ce70051fcdebc2c4435ff30d540c" name="win32/bson-version.h" role="src" />
<file md5sum="a48e0f7388bbb65ea5be67c0a4b95d26" name="win32/mongoc-config.h" role="src" />
<file md5sum="da90315b6d70e48f4b940bd80ac63abe" name="win32/mongoc-version.h" role="src" />
- <file md5sum="df1349a47c20ef1884d0b811538abcde" name="ChangeLog" role="doc" />
+ <file md5sum="103f15479b70b388849931e4f5c0b223" name="ChangeLog" role="doc" />
<file md5sum="b1e01b26bacfc2232046c90a330332b3" name="LICENSE" role="doc" />
<file md5sum="50befdabfe1b59ff8c7d8f20d0545c76" name="Makefile.frag" role="src" />
<file md5sum="324f4d69acdeb1132691a570731e58a2" name="README.md" role="doc" />
<file md5sum="f99c580b04875fa6d39a302ad8110ebd" name="RELEASE-0" role="doc" />
<file md5sum="f28b9c1fe3faa9766fe6ee5b270383fe" name="RELEASE-1.0" role="doc" />
- <file md5sum="6898272a23893fd58494719d90695523" name="RELEASE-1.0.1-dev" role="doc" />
- <file md5sum="61ec63237183ba0457839b2192681ec4" name="RELEASE-1.1" role="doc" />
- <file md5sum="ddf91201082e8ec09a0aa021e0552a24" name="RELEASE-1.1.1" role="doc" />
+ <file md5sum="a628c55f432b02316f8c072170227820" name="RELEASE-1.1" role="doc" />
+ <file md5sum="8311e3697051d283277fbb82514c1f16" name="RELEASE-1.1.2" role="doc" />
+ <file md5sum="8e5f0e447a9dfc66db9b93f7bd3c0933" name="RELEASE-1.1.2-dev" role="doc" />
<file md5sum="48106c87af23e2f8315083e03a16c384" name="Vagrantfile" role="test" />
- <file md5sum="d7eccbbe9a7c75e10c71964f0871fe1a" name="config.m4" role="src" />
+ <file md5sum="b662d962f430a64dc01ca1e1814b0b16" name="config.m4" role="src" />
<file md5sum="ab2aa8a04de2170cf9e944a1f06fb72a" name="config.w32" role="src" />
<file md5sum="aeb8c31ab116ae252b090fee87f8cdba" name="phongo_compat.c" role="src" />
- <file md5sum="eca027d5a683b3dcf2e948e1bcae51c1" name="phongo_compat.h" role="src" />
- <file md5sum="5961c5afe5182e00dd23c97d7161bd81" name="php_bson.h" role="src" />
- <file md5sum="bdc5c515b38f1bf0c61add6b6bd338e4" name="php_phongo.c" role="src" />
- <file md5sum="455428e627551d626d9a0fd3cf26d10f" name="php_phongo.h" role="src" />
+ <file md5sum="64df03e52fdc1c52c5b09353edb15188" name="phongo_compat.h" role="src" />
+ <file md5sum="cf942091669e585c1ac682b6c138c445" name="php_bson.h" role="src" />
+ <file md5sum="025c9640adcdc58b2555bfdc17e9e64f" name="php_phongo.c" role="src" />
+ <file md5sum="6cda9b02a6ae6064970812cb6ac015d1" name="php_phongo.h" role="src" />
<file md5sum="e370a81ff5e75e093fa2136cfa14ac96" name="php_phongo_classes.h" role="src" />
<file md5sum="b7c0f71791559192973cb64e507b6b2b" name="php_phongo_structs-5.h" role="src" />
<file md5sum="25066ae7191949994014f7d88bebd7b9" name="php_phongo_structs-7.h" role="src" />
</dir>
</contents>
<dependencies>
<required>
<php>
<min>5.4.0</min>
<max>7.99.99</max>
</php>
<pearinstaller>
<min>1.4.8</min>
</pearinstaller>
</required>
</dependencies>
<providesextension>mongodb</providesextension>
<extsrcrelease />
</package>

File Metadata

Mime Type
text/x-diff
Expires
Sat, May 16, 7:38 AM (18 h, 31 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
64135
Default Alt Text
(686 KB)

Event Timeline