Merge branch 'PHP-5.5'

* PHP-5.5:
  Typo fix: recieved to received

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 */

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

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;