diff options
| author | Kalle Sommer Nielsen <kalle@php.net> | 2010-04-26 23:55:03 +0000 |
|---|---|---|
| committer | Kalle Sommer Nielsen <kalle@php.net> | 2010-04-26 23:55:03 +0000 |
| commit | cb3033080017e05ae7843859f993517252e67e31 (patch) | |
| tree | 675f409de0e4180a660cfe03df518c06aa18d847 /ext/mysqlnd/mysqlnd_net.c | |
| parent | 64f372fae2876a197996a1753d3659d8fa9d0bb4 (diff) | |
| download | php-git-cb3033080017e05ae7843859f993517252e67e31.tar.gz | |
Merge safe_mode changes into extensions that are in sync in both branches
Diffstat (limited to 'ext/mysqlnd/mysqlnd_net.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_net.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/mysqlnd/mysqlnd_net.c b/ext/mysqlnd/mysqlnd_net.c index 4ade74b7d5..2859c783ba 100644 --- a/ext/mysqlnd/mysqlnd_net.c +++ b/ext/mysqlnd/mysqlnd_net.c @@ -102,7 +102,11 @@ MYSQLND_METHOD(mysqlnd_net, network_write)(MYSQLND * const conn, const zend_ucha static enum_func_status MYSQLND_METHOD(mysqlnd_net, connect)(MYSQLND_NET * net, const char * const scheme, size_t scheme_len, zend_bool persistent, char **errstr, int * errcode TSRMLS_DC) { +#if PHP_API_VERSION < 20100412 unsigned int streams_options = ENFORCE_SAFE_MODE; +#else + unsigned int streams_options = 0; +#endif unsigned int streams_flags = STREAM_XPORT_CLIENT | STREAM_XPORT_CONNECT; char * hashed_details = NULL; int hashed_details_len = 0; |