Commit Graph

3944 Commits

Author SHA1 Message Date
Derick Rethans
d7df91c42c Merged pull request #406 2016-09-14 18:21:22 +01:00
Derick Rethans
2cbbd69404 PHPC-786: Support appname in URI array options 2016-09-14 18:21:13 +01:00
Jeremy Mikola
6013e6eba5 Merge pull request #407 2016-09-14 13:05:42 -04:00
Jeremy Mikola
912987c37d Use both mongodb and openssl extension paths for CHECK_LIB
The ldap extensions' config.w32 uses PHP_LDAP as its search path, so we'll continue to start with PHP_MONGODB as a rule of thumb. Since we currently declare a dependency on the OpenSSL extension, it makes sense to also include it in our search path in case it was customized at build time.

Based on the openssl extension's config.w32, crypt32.lib is a system library and needs no extra search path.
2016-09-14 12:45:17 -04:00
Jeremy Mikola
a7a361a01b Merge pull request #402 2016-09-14 10:34:19 -04:00
Jeremy Mikola
b694ecc24f Add missing libmongoc sources to config.w32 2016-09-14 10:33:20 -04:00
Jeremy Mikola
5d9327e60a Set MONGOC_ENABLE_SSL_LIBRESSL in mongoc-config.h 2016-09-14 10:33:20 -04:00
Jeremy Mikola
6b366e8f51 Set compiler info in mongoc-config.h for handshake metadata 2016-09-14 10:33:20 -04:00
Jeremy Mikola
d4e9e5782e Allow CHECK_HEADER_ADD_INCLUDE to add defines to CFLAGS_MONGODB 2016-09-14 10:33:20 -04:00
Jeremy Mikola
f1b753c3d9 Link against crypt32.lib in config.w32 2016-09-14 10:33:20 -04:00
Jeremy Mikola
925fa271be Remove trailing commas from config.w32 object decls 2016-09-14 10:33:20 -04:00
Jeremy Mikola
552db91daf Merge pull request #405 2016-09-14 10:31:37 -04:00
Jeremy Mikola
8fbf0fa4db PHPC-605: Remove unused php-ssl.c contrib code 2016-09-14 10:29:36 -04:00
Jeremy Mikola
672f38aa0b Merge pull request #403 2016-09-14 09:51:24 -04:00
Jeremy Mikola
ec9cc32442 PHPC-757: Set compiler name and user CFLAGS/LDFLAGS earlier
libmongoc sets the CFLAG and LDFLAG constants before their own configuration files modify them.
2016-09-13 16:55:56 -04:00
Jeremy Mikola
200257a3f1 List mongoc-linux-distro-scanner.c alphabetically in MONGOC_SOURCES 2016-09-13 16:51:27 -04:00
Derick Rethans
046c1619af Merged pull request #401 2016-09-13 14:07:11 +01:00
Derick Rethans
9fb1e351b9 PHPC-789: Remove __wakeup from BSON/* classes 2016-09-13 14:06:47 +01:00
Derick Rethans
a3b7729d36 Merged pull request #391 2016-09-13 14:06:19 +01:00
Derick Rethans
c5bc3d73eb PHPC-779: Switch MinKey from O to C type serialization 2016-09-13 14:05:56 +01:00
Derick Rethans
43bb5a7b13 PHPC-779: Switch MaxKey from O to C type serialization 2016-09-13 14:05:56 +01:00
Derick Rethans
8050b14ba1 PHPC-779: Switch UTCDateTime from O to C type serialization 2016-09-13 14:05:56 +01:00
Derick Rethans
d6b095a7ce PHPC-779: Switch Timestamp from O to C type serialization 2016-09-13 14:05:56 +01:00
Derick Rethans
41a117569a PHPC-779: Switch Regex from O to C type serialization 2016-09-13 14:05:56 +01:00
Derick Rethans
8ee86a15eb PHPC-779: Switch ObjectID from O to C type serialization 2016-09-13 14:05:56 +01:00
Derick Rethans
9ccbea5a69 PHPC-779: Switch Javascript from O to C type serialization 2016-09-13 14:05:56 +01:00
Derick Rethans
3dc33acfc7 PHPC-779: Switch Decimal128 from O to C type serialization 2016-09-13 14:05:56 +01:00
Derick Rethans
3cc2e10ebb PHPC-779: Switch Binary from O to C type serialization 2016-09-13 14:05:56 +01:00
Jeremy Mikola
5076fb026f Merge pull request #376 2016-09-09 11:18:39 -04:00
Jeremy Mikola
9717d5cac6 PHPC-605: crl_file is not supported by LibreSSL or Secure Transport 2016-09-08 11:10:35 -04:00
Jeremy Mikola
a5667e6c9a PHPC-605: Split exceptions for unsupported ca_dir and capath options 2016-09-08 11:10:34 -04:00
Jeremy Mikola
3036797f41 Use consistent memory allocation for write error messages
These strings were released with efree() in the object destructors and should be allocated with emalloc().
2016-09-08 11:10:34 -04:00
Jeremy Mikola
29e5121cb7 PHPC-433: Persist mongoc_client_t objects in a HashTable
Clients will be hashed by Manager constructor arguments. Since they must persist between requests, the Manager destructor will no longer free the client and we'll need to start using persistent memory allocation for libbson and libmongoc.
2016-09-08 11:10:34 -04:00
Jeremy Mikola
ad0ae247f8 PHPC-605: Remove pem_file from php_phongo_manager_t
This should have been removed in f7e2b09165.
2016-09-07 18:08:19 -04:00
Jeremy Mikola
1060cb8ba4 PHPC-433: Refactor phongo_manager_init() option handling
BSON conversion of uriOptions moves to phongo_manager_init(). Merging of stream context options into driverOptions and removal of the context resource is now done in the Manager constructor.

phongo_manager_init() now has zvals for both uriOptions and driverOptions and will be able to serialize them with the URI string for a client hash.
2016-09-07 18:08:19 -04:00
Jeremy Mikola
e5db9dd2ff PHPC-605: Fix exception logic for unsupported ca_dir option 2016-09-07 18:08:19 -04:00
Jeremy Mikola
5096fcbac3 X509 client cert for testing has no password 2016-09-07 18:08:19 -04:00
Jeremy Mikola
c673e0aee2 PHPC-704: Do not set mongodb.debug from driver options
The mongodb.debug INI option is a global setting and should not be set based on a single Manager's constructor argument.
2016-09-07 18:08:19 -04:00
Derick Rethans
0fa2246072 Merged pull request #395 2016-09-07 17:07:15 +01:00
Derick Rethans
04e10304dd Explicitly set date.timezone to prevent warnings if not set in php.ini 2016-09-07 17:06:49 +01:00
Derick Rethans
d3f1595d42 Merged pull request #389 2016-09-07 17:06:24 +01:00
Derick Rethans
ff00668385 PHPC-731: Parse Timestamp argument as strings to accept large integers 2016-09-07 17:05:44 +01:00
Derick Rethans
26ca213b18 Merged pull request #386 2016-09-07 16:35:45 +01:00
Derick Rethans
d25e565f64 PHPC-726: Allow cross-platform serialization of Timestamp and UTCDateTime 2016-09-07 16:34:35 +01:00
Derick Rethans
560dc81733 Merged pull request #390 2016-09-07 14:54:01 +01:00
Derick Rethans
2e89b1cfb2 PHPC-769: Javascript serialization, export, and dump should always include scope field 2016-09-07 14:53:01 +01:00
Derick Rethans
afe8fc0138 Merged pull request #388 2016-09-07 14:52:03 +01:00
Derick Rethans
213a8f07ca PHPC-742: Regex constructor should default flags arg to empty string 2016-09-07 14:51:30 +01:00
Derick Rethans
d6f75463c6 Merged pull request #385 2016-09-07 11:20:51 +01:00
Derick Rethans
e912db7615 PHPC-552: Implement ObjectID::getTimestamp() method 2016-09-07 11:15:51 +01:00