Ideally the OCI8 bit needs to be merged to 5.3 & 5.4 to keep them in sync.
Chris On 03/07/2013 02:05 PM, David Soria Parra wrote:
Commit: 0c11cab919d84bbd9af0472e99263ce7fbef8c32 Author: Carson McDonald <car...@ioncannon.net> Thu, 7 Mar 2013 08:43:54 -0500 Committer: David Soria Parra <d...@php.net> Thu, 7 Mar 2013 23:05:05 +0100 Parents: e98271f588e60e8dbe29c964357a7022e78db696 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0c11cab919d84bbd9af0472e99263ce7fbef8c32 Log: Typo fix: recieved to received Changed paths: M ext/oci8/php_oci8_int.h M ext/standard/tests/array/uasort_variation9.phpt M main/network.c Diff: diff --git a/ext/oci8/php_oci8_int.h b/ext/oci8/php_oci8_int.h index d8d7d0f..155e57d 100644 --- a/ext/oci8/php_oci8_int.h +++ b/ext/oci8/php_oci8_int.h @@ -191,7 +191,7 @@ typedef struct { /* php_oci_statement {{{ */ sword errcode; /* last errcode*/ 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 */ long last_query_len; /* last query length */ HashTable *columns; /* hash containing all the result columns */ HashTable *binds; /* binds hash */ diff --git a/ext/standard/tests/array/uasort_variation9.phpt b/ext/standard/tests/array/uasort_variation9.phpt index 486042e..85578b0 100644 --- a/ext/standard/tests/array/uasort_variation9.phpt +++ b/ext/standard/tests/array/uasort_variation9.phpt @@ -14,7 +14,7 @@ echo "*** Testing uasort() : 'cmp_function' with reference arguments ***\n"; // comparison function /* Prototype : int cmp(mixed &$value1, mixed &$value2) - * Parameters : $value1 and $value2 - values recieved by reference + * Parameters : $value1 and $value2 - values received by reference * Return value : 0 - if both values are same * 1 - if value1 is greater than value2 * -1 - if value1 is less than value2 diff --git a/main/network.c b/main/network.c index 88e1663..5c0404b 100644 --- a/main/network.c +++ b/main/network.c @@ -872,7 +872,7 @@ skip_bind: efree(local_address); } } - /* free error string recieved during previous iteration (if any) */ + /* free error string received during previous iteration (if any) */ if (error_string && *error_string) { efree(*error_string); *error_string = NULL;
-- christopher.jo...@oracle.com http://twitter.com/ghrd Newly updated, free PHP & Oracle book: http://www.oracle.com/technetwork/topics/php/underground-php-oracle-manual-098250.html -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
