diff options
| author | Anatol Belski <ab@php.net> | 2014-11-20 15:20:18 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-11-20 15:20:18 +0100 |
| commit | 4f3ac2cdbedf7a84d64bfee7405f0c023641a806 (patch) | |
| tree | 5e021f37f7272c93926759b22f6e7823a584f542 /main | |
| parent | 14fa5339f86cac3a1b3ecfdf50c4ee0f31ca214e (diff) | |
| parent | 8904fbc6929aaf623d88127f876fa739c9ec627b (diff) | |
| download | php-git-4f3ac2cdbedf7a84d64bfee7405f0c023641a806.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (36 commits)
NEWS
adapt test for error message introduce in fix for #68463
Fix bug #68463 listen.allowed_clients can silently result in no allowed access
run a few request in this test
fix test
fix test
added info about some other macro changes
added note about toolset and phpize
added note about the response files
split msgfmt_format_intlcalendar_variant*.phpt for ICU 54.1
split formatter_format*.phpt for ICP 54.1
split dateformat_timezone_arg_variations*.phpt for ICU 54.1
split dateformat_get_set_timezone_variant*.phpt for ICU 54.1
fix icu version to test
split ext/intl/tests/dateformat_get_set_calendar_variant*.phpt for 54.1
split dateformat_formatObject_datetime_variant*.phpt for ICU 54.1
split dateformat_formatObject_calendar_variant*.phpt for ICU 54.1
split dateformat_create_cal_arg_variant2.phpt for ICU 53.1 and 54.1
clone dateformat_calendars_variant3.phpt for ICU 54.1
split collator_get_sort_key_variant3.phpt for icu 54.1
...
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.c | 2 | ||||
| -rw-r--r-- | main/snprintf.h | 2 | ||||
| -rw-r--r-- | main/streams/streams.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/main/main.c b/main/main.c index 5b969a930c..41e84a79f7 100644 --- a/main/main.c +++ b/main/main.c @@ -2278,7 +2278,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod /* load and startup extensions compiled as shared objects (aka DLLs) as requested by php.ini entries - theese are loaded after initialization of internal extensions + these are loaded after initialization of internal extensions as extensions *might* rely on things from ext/standard which is always an internal extension and to be initialized ahead of all other internals diff --git a/main/snprintf.h b/main/snprintf.h index 789ab7d41a..115a15aa58 100644 --- a/main/snprintf.h +++ b/main/snprintf.h @@ -31,7 +31,7 @@ sprintf offers the ability to make a lot of failures since it does not know snprintf knows the buffers size and will not write behind it. But you will have to use either a static buffer or allocate a dynamic buffer - before beeing able to call the function. In other words you must + before being able to call the function. In other words you must be sure that you really know the maximum size of the buffer required. A bad thing is having a big maximum while in most cases you would only need a small buffer. If the size of the resulting string is diff --git a/main/streams/streams.c b/main/streams/streams.c index 13af362681..c6420dc0d0 100644 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -1066,7 +1066,7 @@ PHPAPI zend_string *php_stream_get_record(php_stream *stream, size_t maxlen, con * searched for the delimiter. * The left part of the delimiter may still remain in the buffer, * so subtract up to <delim_len - 1> from buffered_len, which is - * the ammount of data we skip on this search as an optimization + * the amount of data we skip on this search as an optimization */ found_delim = _php_stream_search_delim( stream, maxlen, |