archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Bump version to 7.0.0-dev

Browse source
This commit is contained in:
Dmitry Stogov 2014-08-15 11:10:41 +04:00
parent 8b66d64b23
commit d9f3eac12f
6 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Zend/zend.h
View file

@ -22,7 +22,7 @@
#ifndef ZEND_H
#define ZEND_H
#define ZEND_VERSION "2.7.0-dev"
#define ZEND_VERSION "2.8.0-dev"
#define ZEND_ENGINE_2

2
Zend/zend_extensions.h
View file

@ -28,7 +28,7 @@
/* The first number is the engine version and the rest is the date.
* This way engine 2/3 API no. is always greater than engine 1 API no..
*/
#define ZEND_EXTENSION_API_NO 220131227
#define ZEND_EXTENSION_API_NO 220140815
typedef struct _zend_extension_version_info {
int zend_extension_api_no;

2
Zend/zend_modules.h
View file

@ -33,7 +33,7 @@
#define ZEND_MODULE_INFO_FUNC_ARGS zend_module_entry *zend_module TSRMLS_DC
#define ZEND_MODULE_INFO_FUNC_ARGS_PASSTHRU zend_module TSRMLS_CC
#define ZEND_MODULE_API_NO 20131227
#define ZEND_MODULE_API_NO 20140815
#ifdef ZTS
#define USING_ZTS 1
#else

4
configure.in
View file

@ -117,8 +117,8 @@ int zend_sprintf(char *buffer, const char *format, ...);
#undef PTHREADS
])
PHP_MAJOR_VERSION=5
PHP_MINOR_VERSION=7
PHP_MAJOR_VERSION=7
PHP_MINOR_VERSION=0
PHP_RELEASE_VERSION=0
PHP_EXTRA_VERSION="-dev"
PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"

3
ext/mysqli/mysqli_api.c
View file

@ -1689,7 +1689,8 @@ static int mysqli_options_get_option_zval_type(int option)
switch (option) {
#ifdef MYSQLI_USE_MYSQLND
#if PHP_MAJOR_VERSION >= 6
case MYSQLND_OPT_NUMERIC_AND_DATETIME_AS_UNICODE:
/* PHP-7 doesn't supprt unicode yet ??? */
/*case MYSQLND_OPT_NUMERIC_AND_DATETIME_AS_UNICODE:*/
#endif
case MYSQLND_OPT_NET_CMD_BUFFER_SIZE:
case MYSQLND_OPT_NET_READ_BUFFER_SIZE:

8
main/php_version.h
View file

@ -1,8 +1,8 @@
/* automatically generated by configure */
/* edit configure.in to change version number */
#define PHP_MAJOR_VERSION 5
#define PHP_MINOR_VERSION 7
#define PHP_MAJOR_VERSION 7
#define PHP_MINOR_VERSION 0
#define PHP_RELEASE_VERSION 0
#define PHP_EXTRA_VERSION "-dev"
#define PHP_VERSION "5.7.0-dev"
#define PHP_VERSION_ID 50700
#define PHP_VERSION "7.0.0-dev"
#define PHP_VERSION_ID 70000