Commit: 4427d1dcfdca5e5e4b7e1b1226cf4771cc82389f Author: Stanislav Malyshev <s...@php.net> Mon, 10 Jun 2013 14:02:42 -0700 Parents: 02e4d7a290ae437688b3a3d114621a1d32444560 Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4427d1dcfdca5e5e4b7e1b1226cf4771cc82389f Log: Merge branch 'pull-request/341' * pull-request/341: (23 commits) typofixes Changed paths: M Zend/tests/generators/yield_without_value.phpt M ext/intl/ERROR.CONVENTIONS M ext/opcache/ZendAccelerator.h Diff: diff --git a/Zend/tests/generators/yield_without_value.phpt b/Zend/tests/generators/yield_without_value.phpt index 510c755..52292b7 100644 --- a/Zend/tests/generators/yield_without_value.phpt +++ b/Zend/tests/generators/yield_without_value.phpt @@ -9,13 +9,13 @@ function recv() { } } -$reciever = recv(); -var_dump($reciever->current()); -$reciever->send(1); -var_dump($reciever->current()); -$reciever->send(2); -var_dump($reciever->current()); -$reciever->send(3); +$receiver = recv(); +var_dump($receiver->current()); +$receiver->send(1); +var_dump($receiver->current()); +$receiver->send(2); +var_dump($receiver->current()); +$receiver->send(3); ?> --EXPECT-- diff --git a/ext/intl/ERROR.CONVENTIONS b/ext/intl/ERROR.CONVENTIONS index 6f9079c..41cd14e 100644 --- a/ext/intl/ERROR.CONVENTIONS +++ b/ext/intl/ERROR.CONVENTIONS @@ -18,7 +18,7 @@ message set by the PHP wrapping code, not by ICU. The message should include the name of the function that failed in order to make debugging easier (though if you activate warnings with intl.error_level or exceptions with intl.use_exceptions you get more fine-grained information about where the -error ocurred). +error occurred). The internal PHP code can set the global last error with: void intl_error_set_code(intl_error* err, UErrorCode err_code TSRMLS_DC); diff --git a/ext/opcache/ZendAccelerator.h b/ext/opcache/ZendAccelerator.h index 85f9570..733e544 100644 --- a/ext/opcache/ZendAccelerator.h +++ b/ext/opcache/ZendAccelerator.h @@ -168,7 +168,7 @@ typedef time_t accel_time_t; typedef enum _zend_accel_restart_reason { ACCEL_RESTART_OOM, /* restart because of out of memory */ ACCEL_RESTART_HASH, /* restart because of hash overflow */ - ACCEL_RESTART_USER /* restart sheduled by opcache_reset() */ + ACCEL_RESTART_USER /* restart scheduled by opcache_reset() */ } zend_accel_restart_reason; typedef struct _zend_persistent_script { @@ -268,7 +268,7 @@ typedef struct _zend_accel_shared_globals { unsigned long blacklist_misses; unsigned long oom_restarts; /* number of restarts because of out of memory */ unsigned long hash_restarts; /* number of restarts because of hash overflow */ - unsigned long manual_restarts; /* number of restarts sheduled by opcache_reset() */ + unsigned long manual_restarts; /* number of restarts scheduled by opcache_reset() */ zend_accel_hash hash; /* hash table for cached scripts */ zend_accel_hash include_paths; /* used "include_path" values */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
