Commit db10f248 authored by Ondrej Sury's avatar Ondrej Sury

Imported Upstream version 1.1.2

parent b928b27f
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
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
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
......
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
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
......@@ -301,7 +301,7 @@ MONGOC_SOURCES_SASL=mongoc-sasl.c
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
......@@ -331,7 +331,7 @@ 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..])
......@@ -370,7 +370,7 @@ PHP_ARG_WITH(libmongoc, Use system libmongoc,
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
......@@ -390,8 +390,8 @@ if test "$PHP_PCRE_DIR" != "no"; then
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)
......@@ -405,31 +405,35 @@ if test "$PHP_MONGODB_SASL" != "no"; then
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)
......
......@@ -99,7 +99,8 @@
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); \
}
......@@ -109,7 +110,8 @@
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); \