diff options
| author | Anatol Belski <ab@php.net> | 2014-11-20 15:20:18 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-11-20 15:20:18 +0100 |
| commit | 4f3ac2cdbedf7a84d64bfee7405f0c023641a806 (patch) | |
| tree | 5e021f37f7272c93926759b22f6e7823a584f542 /ext/odbc | |
| parent | 14fa5339f86cac3a1b3ecfdf50c4ee0f31ca214e (diff) | |
| parent | 8904fbc6929aaf623d88127f876fa739c9ec627b (diff) | |
| download | php-git-4f3ac2cdbedf7a84d64bfee7405f0c023641a806.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (36 commits)
NEWS
adapt test for error message introduce in fix for #68463
Fix bug #68463 listen.allowed_clients can silently result in no allowed access
run a few request in this test
fix test
fix test
added info about some other macro changes
added note about toolset and phpize
added note about the response files
split msgfmt_format_intlcalendar_variant*.phpt for ICU 54.1
split formatter_format*.phpt for ICP 54.1
split dateformat_timezone_arg_variations*.phpt for ICU 54.1
split dateformat_get_set_timezone_variant*.phpt for ICU 54.1
fix icu version to test
split ext/intl/tests/dateformat_get_set_calendar_variant*.phpt for 54.1
split dateformat_formatObject_datetime_variant*.phpt for ICU 54.1
split dateformat_formatObject_calendar_variant*.phpt for ICU 54.1
split dateformat_create_cal_arg_variant2.phpt for ICU 53.1 and 54.1
clone dateformat_calendars_variant3.phpt for ICU 54.1
split collator_get_sort_key_variant3.phpt for icu 54.1
...
Diffstat (limited to 'ext/odbc')
| -rw-r--r-- | ext/odbc/php_odbc.c | 6 | ||||
| -rw-r--r-- | ext/odbc/tests/bug60616.phpt | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index 6729163996..594a37383e 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -437,7 +437,7 @@ static void _free_odbc_result(zend_resource *rsrc TSRMLS_DC) (SQLUSMALLINT) SQL_COMMIT); #endif rc = SQLFreeStmt(res->stmt,SQL_DROP); - /* We don't want the connection to be closed after the last statment has been closed + /* We don't want the connection to be closed after the last statement has been closed * Connections will be closed on shutdown * zend_list_delete(res->conn_ptr->id); */ @@ -2493,8 +2493,8 @@ int odbc_sqlconnect(odbc_connection **conn, char *db, char *uid, char *pwd, int * * We do have to hash non-persistent connections, and reuse connections. * In the case where two connects were being made, without closing the first - * connect, access violations were occuring. This is because some of the - * "globals" in this module should actualy be per-connection variables. I + * connect, access violations were occurring. This is because some of the + * "globals" in this module should actually be per-connection variables. I * simply fixed things to get them working for now. Shane */ /* {{{ odbc_do_connect */ diff --git a/ext/odbc/tests/bug60616.phpt b/ext/odbc/tests/bug60616.phpt index 937049a9b8..72226f23bb 100644 --- a/ext/odbc/tests/bug60616.phpt +++ b/ext/odbc/tests/bug60616.phpt @@ -12,7 +12,7 @@ $euc_jp = base64_decode($euc_jp_base64); $ascii = 'abcdefghijklmnopqrstuvwxyz;]=#0123456789'; include 'config.inc'; -ini_set("odbc.defaultlrl", 4); // Set artifically low +ini_set("odbc.defaultlrl", 4); // Set artificially low $conn = odbc_connect($dsn, $user, $pass); |