diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.c | 4 | ||||
| -rw-r--r-- | main/php_version.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/main/main.c b/main/main.c index 90474cd8ee..de794ace99 100644 --- a/main/main.c +++ b/main/main.c @@ -1335,7 +1335,7 @@ PHPAPI int php_stream_open_for_zend_ex(const char *filename, zend_file_handle *h handle->handle.stream.reader = (zend_stream_reader_t)_php_stream_read; handle->handle.stream.fsizer = php_zend_stream_fsizer; handle->handle.stream.isatty = 0; - /* can we mmap immeadiately? */ + /* can we mmap immediately? */ memset(&handle->handle.stream.mmap, 0, sizeof(handle->handle.stream.mmap)); len = php_zend_stream_fsizer(stream TSRMLS_CC); if (len != 0 @@ -2187,7 +2187,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod zend_set_utility_values(&zuv); php_startup_sapi_content_types(TSRMLS_C); - /* startup extensions staticly compiled in */ + /* startup extensions statically compiled in */ if (php_register_internal_extensions_func(TSRMLS_C) == FAILURE) { php_printf("Unable to start builtin modules\n"); return FAILURE; diff --git a/main/php_version.h b/main/php_version.h index d4d4fe05eb..d48bf13c6f 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -1,8 +1,8 @@ /* automatically generated by configure */ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 -#define PHP_MINOR_VERSION 5 -#define PHP_RELEASE_VERSION 1 +#define PHP_MINOR_VERSION 6 +#define PHP_RELEASE_VERSION 0 #define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.5.1-dev" -#define PHP_VERSION_ID 50501 +#define PHP_VERSION "5.6.0-dev" +#define PHP_VERSION_ID 50600 |