+14
-30
lines changedFilter options
+14
-30
lines changed Original file line number Diff line number Diff line change
@@ -12,6 +12,7 @@ PHP 7.0 INTERNALS UPGRADE NOTES
12 12
k. get_class_entry object handler info
13 13
l. get_class_name object handler info
14 14
m. Other portable macros info
15 +
n. ZEND_ENGINE_2 removal
15 16 16 17
2. Build system changes
17 18
a. Unix build system changes
@@ -121,6 +122,8 @@ PHP 7.0 INTERNALS UPGRADE NOTES
121 122
ZEND_FASTCALL is defined to use __vectorcall convention on VS2013 and above
122 123
ZEND_NORETURN is defined as __declspec(noreturn) on VS
123 124 125 +
n. The ZEND_ENGINE_2 macro has been removed. A ZEND_ENGINE_3 macro has been added.
126 + 124 127
========================
125 128
2. Build system changes
126 129
========================
@@ -22,9 +22,9 @@
22 22
#ifndef ZEND_H
23 23
#define ZEND_H
24 24 25 -
#define ZEND_VERSION "2.8.0-dev"
25 +
#define ZEND_VERSION "3.0.0-dev"
26 26 27 -
#define ZEND_ENGINE_2
27 +
#define ZEND_ENGINE_3
28 28 29 29
#define ZEND_MAX_RESERVED_RESOURCES 4
30 30
@@ -25,10 +25,10 @@
25 25
#include "zend_compile.h"
26 26
#include "zend_build.h"
27 27 28 -
/* The first number is the engine version and the rest is the date.
28 +
/* The first number is the engine version and the rest is the date (YYYYMMDD).
29 29
* This way engine 2/3 API no. is always greater than engine 1 API no..
30 30
*/
31 -
#define ZEND_EXTENSION_API_NO 220140815
31 +
#define ZEND_EXTENSION_API_NO 320140815
32 32 33 33
typedef struct _zend_extension_version_info {
34 34
int zend_extension_api_no;
@@ -35,13 +35,7 @@
35 35
#include "ext/standard/php_string.h"
36 36
#include "ext/standard/basic_functions.h"
37 37 38 -
#ifdef ZEND_ENGINE_2
39 -
# include "zend_exceptions.h"
40 -
#else
41 -
/* PHP 4 compat */
42 -
# define OnUpdateLong OnUpdateInt
43 -
# define E_STRICT E_NOTICE
44 -
#endif
38 +
#include "zend_exceptions.h"
45 39 46 40
#if HAVE_MYSQL
47 41
@@ -2075,7 +2069,6 @@ static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, zend_long result_
2075 2069
mysql_row_length_type *mysql_row_lengths;
2076 2070
#endif
2077 2071 2078 -
#ifdef ZEND_ENGINE_2
2079 2072
if (into_object) {
2080 2073
zend_string *class_name = NULL;
2081 2074
@@ -2094,7 +2087,6 @@ static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, zend_long result_
2094 2087
}
2095 2088
result_type = MYSQL_ASSOC;
2096 2089
} else
2097 -
#endif
2098 2090
{
2099 2091
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &res, &result_type) == FAILURE) {
2100 2092
return;
@@ -2162,7 +2154,6 @@ static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, zend_long result_
2162 2154
mysqlnd_fetch_into(mysql_result, ((result_type & MYSQL_NUM)? MYSQLND_FETCH_NUM:0) | ((result_type & MYSQL_ASSOC)? MYSQLND_FETCH_ASSOC:0), return_value, MYSQLND_MYSQL);
2163 2155
#endif
2164 2156 2165 -
#ifdef ZEND_ENGINE_2
2166 2157
/* mysqlnd might return FALSE if no more rows */
2167 2158
if (into_object && Z_TYPE_P(return_value) != IS_FALSE) {
2168 2159
zval dataset;
@@ -2225,7 +2216,6 @@ static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, zend_long result_
2225 2216
zend_throw_exception_ex(zend_exception_get_default(TSRMLS_C), 0 TSRMLS_CC, "Class %s does not have a constructor hence you cannot use ctor_params", ce->name->val);
2226 2217
}
2227 2218
}
2228 -
#endif
2229 2219 2230 2220
}
2231 2221
/* }}} */
@@ -148,7 +148,7 @@ ZEND_GET_MODULE(oci8)
148 148
#endif /* COMPILE_DL */
149 149
/* }}} */
150 150 151 -
#ifdef ZEND_ENGINE_2
151 +
#if defined(ZEND_ENGINE_2) || defined(ZEND_ENGINE_3)
152 152 153 153
/* {{{ Function arginfo */
154 154
ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_define_by_name, 0, 0, 3)
@@ -645,7 +645,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_oci_collection_trim_method, 0, 0, 1)
645 645
ZEND_END_ARG_INFO()
646 646
/* }}} */
647 647 648 -
#else /* ZEND_ENGINE_2 */
648 +
#else /* defined(ZEND_ENGINE_2) || defined(ZEND_ENGINE_3) */
649 649
/* {{{ Keep the old arginfo behavior when building with PHP 4 */
650 650 651 651
static unsigned char arginfo_ocifetchinto[] = { 2, BYREF_NONE, BYREF_FORCE };
@@ -755,7 +755,7 @@ static unsigned char arginfo_oci_bind_array_by_name[] = { 3, BYREF_NONE, BYREF_N
755 755
#define arginfo_oci_collection_trim_method NULL
756 756
#define arginfo_oci_collection_free_method NULL
757 757
/* }}} */
758 -
#endif /* ZEND_ENGINE_2 */
758 +
#endif /* defined(ZEND_ENGINE_2) || defined(ZEND_ENGINE_3) */
759 759 760 760
/* {{{ extension function prototypes
761 761
*/
@@ -23,9 +23,7 @@
23 23
#define _GNU_SOURCE
24 24 25 25
#include "php.h"
26 -
#ifdef ZEND_ENGINE_2
27 -
# include "zend_exceptions.h"
28 -
#endif
26 +
#include "zend_exceptions.h"
29 27
#include "php_ini.h"
30 28
#include "ext/standard/info.h"
31 29
#include "pdo/php_pdo.h"
@@ -37,9 +37,6 @@ extern zend_module_entry xmlwriter_module_entry;
37 37
typedef struct _xmlwriter_object {
38 38
xmlTextWriterPtr ptr;
39 39
xmlBufferPtr output;
40 -
#ifndef ZEND_ENGINE_2
41 -
xmlOutputBufferPtr uri_output;
42 -
#endif
43 40
} xmlwriter_object;
44 41 45 42
@@ -22,7 +22,7 @@
22 22
#endif
23 23
#include "php.h"
24 24
#if HAVE_ZIP
25 -
#ifdef ZEND_ENGINE_2
25 +
#if defined(ZEND_ENGINE_2) || defined(ZEND_ENGINE_3)
26 26 27 27
#include "php_streams.h"
28 28
#include "ext/standard/file.h"
@@ -348,5 +348,5 @@ php_stream_wrapper php_stream_zip_wrapper = {
348 348
NULL,
349 349
0 /* is_url */
350 350
};
351 -
#endif /* ZEND_ENGINE_2 */
351 +
#endif /* defined(ZEND_ENGINE_2) || defined(ZEND_ENGINE_3) */
352 352
#endif /* HAVE_ZIP */
Original file line number Diff line number Diff line change
@@ -29,10 +29,6 @@
29 29
#include <stdlib.h>
30 30
#include <stdio.h>
31 31 32 -
#ifndef ZEND_ENGINE_2
33 -
#error HEAD does not work with ZendEngine1 anymore
34 -
#endif
35 - 36 32
#include "ext/standard/dl.h"
37 33
#include "ext/standard/file.h"
38 34
#include "ext/standard/fsock.h"
You can’t perform that action at this time.
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.3