Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

PHPC-629: Bump libbson and libmongoc to 1.4.0-beta1 #362

Merged
merged 5 commits into from Aug 1, 2016

Conversation

Projects
None yet
3 participants

jmikola and others added some commits Jul 29, 2016

PHPC-629: Fix $binary and $type field in extended JSON
The order of these fields was changed by CDRIVER-1340 (in libbson 1.4.0-beta1).
@@ -206,7 +206,6 @@ if test "$MONGODB" != "no"; then
bson-atomic.c \
bson-clock.c \
bson-context.c \
- bson-decimal128.c \
@derickr

derickr Aug 1, 2016

Member

Weren't we going to leave it compiled in? AFAIK, @bjori said there was a feature flag protection in it.

@jmikola

jmikola Aug 1, 2016

Member

He was mistaken. Both this and the client metadata sources in libmongoc are missing an #ifdef wrap.

-string(73) "{ "binary" : { "$type" : "00", "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh" } }"
+Test#0 { "binary" : { "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh", "$type" : "00" } }
+string(73) "{ "binary" : { "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh", "$type" : "00" } }"
+string(73) "{ "binary" : { "$binary" : "cmFuZG9tIGJpbmFyeSBkYXRh", "$type" : "00" } }"
@derickr

derickr Aug 1, 2016

Member

Why are the binary tests changing?

@jmikola

jmikola Aug 1, 2016

Member

See: CDRIVER-1340. I referred ot that in the full commit message for these changes.

Member

derickr commented Aug 1, 2016

LGTM

@jmikola jmikola changed the title from [WIP] PHPC-629: Bump libbson and libmongoc to 1.4.0-beta1 to PHPC-629: Bump libbson and libmongoc to 1.4.0-beta1 Aug 1, 2016

@jmikola jmikola merged commit e545a5d into mongodb:master Aug 1, 2016

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls First build on master at 89.536%
Details

jmikola added a commit that referenced this pull request Aug 1, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment