Commit Graph

3944 Commits

Author SHA1 Message Date
Jeremy Mikola
8c83588ac5 Register STANDALONE-3.0 with the test suite 2015-12-08 14:50:08 -05:00
Jeremy Mikola
e16b3cef37 STANDALONE-3.0 port conflicted with STANDALONE-2.4 2015-12-08 14:44:46 -05:00
Derick Rethans
3300215a05 Merged pull request #151 2015-12-08 16:51:54 +00:00
Derick Rethans
fc10fdf01c Bump libmongoc and libbson to 1.3.0 releases 2015-12-08 16:51:42 +00:00
Derick Rethans
206ea284ab This code has changed in 3.2, and make the error message clear 2015-12-08 16:49:54 +00:00
Derick Rethans
18a437b9ac Added 3.2.0rc5 to our Mongo Orchestration suite 2015-12-08 16:49:54 +00:00
Derick Rethans
0742722bbd Added some more phpt test leftovers to .gitignore 2015-12-08 16:49:54 +00:00
Derick Rethans
e8d04d9913 Merge branch 'v1.0' 2015-12-08 11:37:26 +00:00
Remi Collet
e5fa119942 libmongoc 1.3 is not compatible 2015-12-08 07:25:00 +01:00
Jeremy Mikola
8a21ca2451 Revise prep-release.php handling
Allows version argument to contain "-stability" suffix, which we'd like for accurate version checking in userland and PHP extension info.
2015-12-07 12:55:52 -05:00
Jeremy Mikola
cde93ce4b3 Merge branch 'v1.0' 2015-12-07 12:25:25 -05:00
Jeremy Mikola
82c40d501d Back to -dev 2015-12-07 12:23:26 -05:00
Jeremy Mikola
adaea1ce34 Add 1.0.1 release notes 1.0.1 2015-12-07 12:15:26 -05:00
Jeremy Mikola
35a19bd3bc Bump extension version to 1.0.1 2015-12-07 12:14:52 -05:00
Jeremy Mikola
ee00673c09 Revise prep-release.php handling
Allows version argument to contain "-stability" suffix, which we'd like for accurate version checking in userland and PHP extension info.
2015-12-07 12:11:14 -05:00
Derick Rethans
8ec1dbcaf1 Merged pull request #150 2015-12-07 16:21:25 +00:00
Hannes Magnusson
1e335052ee bump mongoc & libbson 2015-12-04 07:47:52 -08:00
Hannes Magnusson
423c4b9284 Generate the mongoc and libbson version files correctly 2015-12-04 07:46:27 -08:00
Hannes Magnusson
30d29a0bf7 Revert "Unblock compile by copying VERSION_CURRENT and VERSION_RELEASED until CDRIVER-1027 is fixed."
This reverts commit aeb55cce75.
2015-12-04 07:34:42 -08:00
Jeremy Mikola
c98fddf6ee Merge pull request #148 2015-12-03 11:37:01 +01:00
Jeremy Mikola
ed5b33b922 Master branch is now 1.1.0-dev 2015-12-03 11:36:36 +01:00
Jeremy Mikola
dedf515687 Add "-dev" to extension version constant
See: cbf0330ba2
2015-12-03 11:34:35 +01:00
Derick Rethans
232146cdff Merged pull request #141 2015-12-02 18:30:39 +00:00
Derick Rethans
bc9ebcc802 Made error message more consistent as per Jeremy's comment 2015-12-02 18:11:46 +00:00
Derick Rethans
adaa74021e Move flag exceptions back into config.m4 2015-12-02 18:11:46 +00:00
Hannes Magnusson
1e5f753117 Edgecase compiler warnings in mongoc are mongoc problem, not phongo 2015-12-02 18:11:46 +00:00
Derick Rethans
8d55a3724d Turn off missing braces to make Travis happy 2015-12-02 18:11:46 +00:00
Derick Rethans
aeb55cce75 Unblock compile by copying VERSION_CURRENT and VERSION_RELEASED until CDRIVER-1027 is fixed. 2015-12-02 18:11:46 +00:00
Derick Rethans
a6d83604d9 Added weak symbols for Windows too
As per 77ec06626e (commitcomment-14531726)
2015-12-02 18:11:46 +00:00
Derick Rethans
53643bf93c Changed error message to make more sense.
As per https://github.com/mongodb/mongo-php-driver/pull/141#commitcomment-14531678
2015-12-02 18:11:46 +00:00
Derick Rethans
79b031c806 Upgrade libbson and libmongoc to latest master release 2015-12-02 18:11:46 +00:00
Derick Rethans
fcaa5b8ddd Fixed memory leak as per Hannes' comment.
https://github.com/mongodb/mongo-php-driver/pull/141#discussion_r46320847
2015-12-02 18:11:46 +00:00
Derick Rethans
36d678794d Only list a file once (crept in due to merge conflicts it seems) 2015-12-02 18:11:46 +00:00
Hannes Magnusson
873122fb78 Temporary workaround for warning in mongoc 2015-12-02 18:11:46 +00:00
Hannes Magnusson
49225e1dc7 PHPC-495: Upgrade bundled libbson and libmongoc to 1.3.0 2015-12-02 18:11:46 +00:00
Hannes Magnusson
2a9981b7e7 PHPC-488: Manager::selectServer() should throw when failing to select a server 2015-12-02 18:11:46 +00:00
Hannes Magnusson
5f20d1641d No need to double-initialize boptions 2015-12-02 18:11:46 +00:00
Derick Rethans
e529d3007b Renamed struct members due to changes in libmongoc 2015-12-02 18:11:46 +00:00
Derick Rethans
74ed943585 mongoc_cursor_cursorid_init takes an extra bson_error 2015-12-02 18:11:46 +00:00
Derick Rethans
392e6f1412 Define weak symbols as per a comment in PHPC-406 2015-12-02 18:11:46 +00:00
Derick Rethans
9ad2cfee9c Add compilation of mongoc_read_concern.c 2015-12-02 18:11:46 +00:00
Derick Rethans
87f7f00d54 Bump libbson and libmongoc to 1.3.0beta0 2015-12-02 18:11:46 +00:00
Derick Rethans
4e912f1e77 mongoc_topology_description_server_by_id now takes an additional bson_error_t (CDRIVER-906) 2015-12-02 18:11:46 +00:00
Derick Rethans
0a47eaa132 Ordered flag has moved into 'flags' struct (CDRIVER-893) 2015-12-02 18:11:46 +00:00
Derick Rethans
636659e73f Initial upgrade to pre-1.3.0rc0 version. 2015-12-02 18:11:46 +00:00
Jeremy Mikola
a77ce75b39 Merge pull request #135 2015-12-02 16:08:24 +01:00
Jeremy Mikola
8dfe8d8221 PHPC-487: Regression tests for check_closed stream handler
bug0487-001.phpt was contributed by @prolic in mongodb/mongo-php-driver#132
2015-12-02 16:02:00 +01:00
Hannes Magnusson
eaeb31e297 PHPC-487: Reverse logic in check_closed stream handler
The return value of the check_closed handler is true if the stream is closed.
2015-11-30 12:28:40 -05:00
Hannes Magnusson
e4471af527 Its a bit creepy seeing my family in bug reports 2015-11-25 22:23:41 -08:00
Derick Rethans
e7ac97dc43 Merged pull request #143 2015-11-25 15:59:08 +00:00