com php-src: Merge remote-tracking branch 'origin/master' into str_size_and_int64: ext/mbstring/mbstring.c e xt/oci8/php_oci8_int.h
ext/openssl/openssl.c ex t/openssl/xp_ssl.c ext/pgsql/php_pgsql.h ext/standa rd/dns_win32.c sapi/phpdbg/phpdbg_help.c

Commit: f2e817ea6483d3d1af4cbebcf337f0880de98428 Author: Anatol Belski <ab@php.net> Sat, 15 Feb 2014 01:32:33 +0100 Parents: b923de2a8f6d35ee7d9dd675c2fd2456c105cd25 89292d95ad87bbc275cc86d8686f5b6834d845ad Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f2e817ea6483d3d1af4cbebcf337f0880de98428 Log: Merge remote-tracking branch 'origin/master' into str_size_and_int64 Changed paths: MM ext/mbstring/mbstring.c MM ext/oci8/php_oci8_int.h MM ext/openssl/openssl.c MM ext/openssl/xp_ssl.c MM ext/pgsql/php_pgsql.h MM ext/standard/dns_win32.c MM sapi/phpdbg/phpdbg_help.c Diff: diff --cc ext/oci8/php_oci8_int.h index 2327c0b,5da3ea5..c932fcc --- a/ext/oci8/php_oci8_int.h +++ b/ext/oci8/php_oci8_int.h @@@ -242,9 -219,9 +242,9 @@@ typedef struct sb4 errcode; /* last ORA- error number */ OCIError *err; /* private error handle */ OCIStmt *stmt; /* statement handle */ - char *last_query; /* last query issued. also used to determine if this is a statement or a refcursor recieved from Oracle */ + char *last_query; /* last query issued. also used to determine if this is a statement or a refcursor received from Oracle */ char impres_flag; /* PHP_OCI_IMPRES_*_ */ - long last_query_len; /* last query length */ + php_int_t last_query_len; /* last query length */ HashTable *columns; /* hash containing all the result columns */ HashTable *binds; /* binds hash */ HashTable *defines; /* defines hash */