19aafe43b2
Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012
...
Visual Studio 2012 includes sanity checks for C++11 features, see
http://msdn.microsoft.com/en-us/library/vstudio/bb531344(v=vs.110).aspx
To fix the 'inline' keyword redefinition for C++ in debug mode, the
new macros ZEND_WIN32_KEEP_INLINE is introduced, ZEND_WIN32_FORCE_INLINE is
automatically appended in release mode.
2014-01-04 01:41:49 +01:00
250ee4c17a
Merge branch 'PHP-5.6'
2014-01-04 01:30:44 +01:00
72a16851f4
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-04 01:29:15 +01:00
d992a972c0
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-04 01:24:54 +01:00
7e8e21df0c
Fix bug #66286 : Incorrect object comparison with inheritance
...
std_compare_objects immidiately returned 0 if the property tables
of both objects contain NULL at some index. Thus it would report
objects as equal even though properties following after that
differ.
2014-01-04 01:22:14 +01:00
0f53e37494
Merge branch 'PHP-5.6'
2014-01-03 11:09:07 +08:00
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
65fd18fd88
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Improved empty string handling. Now ZE uses an interned string instead of allocation new empty string each time. (Some extensions might need to be fixed using str_efree() instead of efree() to support interned strings).
Conflicts:
NEWS
Zend/zend_extensions.h
Zend/zend_modules.h
2013-12-26 14:51:05 +04:00
03a37de9b3
Improved empty string handling. Now ZE uses an interned string instead of allocation new empty string each time. (Some extensions might need to be fixed using str_efree() instead of efree() to support interned strings).
2013-12-26 14:47:13 +04:00
d6713f3989
Fixed warning "No new line at end of file"
2013-12-26 17:45:37 +08:00
ef56cfb991
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed ZEND_MM_MEM_TYPE=mmap_zero
2013-12-26 11:53:03 +04:00
0ff0e82f26
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed ZEND_MM_MEM_TYPE=mmap_zero
Conflicts:
NEWS
2013-12-26 11:52:39 +04:00
6414fe283e
Fixed ZEND_MM_MEM_TYPE=mmap_zero
2013-12-26 11:51:32 +04:00
f4a96983e1
Merge branch 'PHP-5.6'
...
* PHP-5.6:
removed outdated IsDebuggerPresent declaration
2013-12-23 12:01:26 +01:00
19039984e2
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
removed outdated IsDebuggerPresent declaration
2013-12-23 12:01:10 +01:00
3f7a145b5a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
removed outdated IsDebuggerPresent declaration
2013-12-23 12:00:49 +01:00
f156e684ac
removed outdated IsDebuggerPresent declaration
...
This piece of code seems to retain compatibility with some windows
versions before 2000. Today it's not relevant anymore and only
produces a warning C4273 because of the conflicting prototype. In
VC9 the declaration is present in winbase.h:4142, but available
is it already in winxp. Here's the doc link
http://msdn.microsoft.com/en-us/library/windows/desktop/ms680345(v=vs.85).aspx
2013-12-23 11:53:47 +01:00
6a2a2b52f9
Bump ZEND_MODULE_API_NO due to the TSRMLS change to zend_is_true()
2013-12-22 14:10:59 -08:00
704866d6fd
opcodes
2013-12-22 13:20:41 +00:00
d455377fad
opcodes
2013-12-22 13:20:17 +00:00
8ce521a6a7
missing, apparently
2013-12-22 13:19:35 +00:00
df9f2ad2e9
Merge branch 'PHP-5.6' of https://github.com/php/php-src into PHP-5.6
2013-12-22 13:17:21 +00:00
621862a192
Merge branch 'PHP-5.6'
...
* PHP-5.6:
stop warnings from unused opcode map
- BFN
Conflicts:
NEWS
Zend/zend_vm_opcodes.h
2013-12-22 13:15:40 +00:00
2a1b60569f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
stop warnings from unused opcode map
- BFN
- Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
Included new .c file in build too
Fixed little typo in zend_vm_gen.php
Moved to new file, killing a lot of warnings
2013-12-22 13:11:20 +00:00
247ec0d81f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
stop warnings from unused opcode map
- BFN
2013-12-22 13:07:41 +00:00
b1df00a7c9
stop warnings from unused opcode map
2013-12-22 13:00:51 +00:00
5b1f6caaf0
Merge branch 'PHP-5.6'
2013-12-22 00:57:31 +01:00
129fb22b37
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
Zend/zend_vm_opcodes.c
2013-12-22 00:55:46 +01:00
7e3af096b3
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
Zend/zend_vm_opcodes.c
2013-12-22 00:54:59 +01:00
97bf254385
Included new .c file in build too
2013-12-22 00:52:05 +01:00
2874eba714
Merge branch 'PHP-5.5' into PHP-5.6
...
Conflicts:
Zend/zend_vm_opcodes.h
2013-12-21 23:54:38 +01:00
00cc4dccb8
Fixed little typo in zend_vm_gen.php
2013-12-21 23:52:48 +01:00
0dd2765687
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
Zend/zend_vm_opcodes.h
2013-12-21 23:49:28 +01:00
61199be02f
Moved to new file, killing a lot of warnings
2013-12-21 23:45:34 +01:00
0cc89be244
Merge branch 'PHP-5.6'
2013-12-21 21:33:15 +01:00
b14f31872b
Merge branch 'PHP-5.5' into PHP-5.6
2013-12-21 21:32:42 +01:00
560f90e511
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
Zend/zend_vm_gen.php
Zend/zend_vm_opcodes.h
2013-12-21 21:31:48 +01:00
7894e397d8
Fixed build...
2013-12-21 21:29:08 +01:00
e2b75e5bb7
Merge branch 'PHP-5.6'
2013-12-21 19:32:41 +01:00
9b4b5fa737
Merge branch 'PHP-5.5' into PHP-5.6
2013-12-21 19:31:27 +01:00
b52c300eca
Merge branch 'PHP-5.4' into PHP-5.5
2013-12-21 19:27:58 +01:00
50d50c2f04
Added an opcode to opcode name map
...
That way extensions etc. don't have to maintain their own lists anymore.
Also as phpdbg is included and needs such a map, it'd be counterproductive to need to change two things on every new opcode.
2013-12-21 19:22:47 +01:00
b11b3d201f
Fixed ZTS build. Needed to bump API version number.
2013-12-18 16:44:20 +01:00
aed4b086ac
Eliminate the TSRMLS_FETCH() calls in the ticks functions and hook
2013-12-18 09:32:26 +01:00
bd58146ad6
Kill another TSRMLS_FETCH() in the zend extension loading code
2013-12-18 07:59:47 +01:00
2eb9bd316d
Merge branch 'master' of https://git.php.net/push/php-src
2013-12-18 07:27:14 +01:00
d14670ccdb
Eliminate another TSRMLS_FETCH() in i_zend_is_true()
...
# Affected extensions have all been updated, ext/opcache and ext/zip
# both have macros for cross version compatibility
2013-12-18 07:25:05 +01:00
72389dd53f
Merge branch 'PHP-5.6'
2013-12-17 15:37:26 +08:00
Anatol Belski