summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Jones <sixd@php.net>2018-09-24 17:06:59 +1000
committerChristopher Jones <sixd@php.net>2018-09-24 17:06:59 +1000
commit28b89afca140c86e521395993c3e89ce653714d6 (patch)
tree026649a50f27b8b4c902fca1d0190329665b3ef8
parentd7b060e9958dc4f232367d2570a775aa75b116b2 (diff)
parent57eb25b393366c8650b2cf85ef12ea76d01bdd95 (diff)
downloadphp-git-28b89afca140c86e521395993c3e89ce653714d6.tar.gz
Merge branch 'PHP-7.1' into PHP-7.2
-rw-r--r--ext/oci8/oci8_failover.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/oci8/oci8_failover.c b/ext/oci8/oci8_failover.c
index 106945ece7..ab27997458 100644
--- a/ext/oci8/oci8_failover.c
+++ b/ext/oci8/oci8_failover.c
@@ -71,7 +71,7 @@ sb4 callback_fn(void *svchp, void *envhp, void *fo_ctx, ub4 fo_type, ub4 fo_even
returnValue = (sb4) Z_LVAL(retval);
}
- /* Setting params[0] to null so ressource isn't destroyed on zval_dtor */
+ /* Setting params[0] to null so resource isn't destroyed on zval_dtor */
ZVAL_NULL(&params[0]);
/* Cleanup */