Bob Weinand
aa8cac578e
Fix double free in formatted_print.c
2015-12-06 02:54:28 +01:00
Xinchen Hui
cc2147dfaa
Merge branch 'PHP-7.0'
2015-12-04 06:51:26 -08:00
Xinchen Hui
311eb2b11e
Missed one place
2015-12-04 06:51:16 -08:00
Xinchen Hui
ee864f8030
Merge branch 'PHP-7.0'
2015-12-04 06:45:37 -08:00
Xinchen Hui
7ac24aa661
Fixed bug #71028 (Undefined index with ArrayIterator)
2015-12-04 06:45:26 -08:00
Xinchen Hui
d92c75f923
Merge branch 'PHP-7.0'
2015-12-04 11:53:48 +08:00
Xinchen Hui
3ae3341533
Fixed bug #71018 (ReflectionProperty::setValue() behavior changed)
2015-12-04 11:52:08 +08:00
Popa Adrian Marius
9dc6de528d
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Use LL_MASK for SQL_INT64 data formatting
2015-12-03 17:13:59 +02:00
Popa Adrian Marius
9ddfd49063
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Use LL_MASK for SQL_INT64 data formatting
2015-12-03 17:13:45 +02:00
Popa Adrian Marius
8da5752311
Use LL_MASK for SQL_INT64 data formatting
2015-12-03 17:12:02 +02:00
Popa Adrian Marius
c548d6b7a2
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fix Bug #60052 Integer returned as a 64bit integer on X64_86 for pdo_firebird
2015-12-03 16:15:37 +02:00
Popa Adrian Marius
1745ead668
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fix Bug #60052 Integer returned as a 64bit integer on X64_86 for pdo_firebird
2015-12-03 16:15:18 +02:00
Popa Adrian Marius
4173a667fa
Fix Bug #60052 Integer returned as a 64bit integer on X64_86 for pdo_firebird
2015-12-03 16:14:17 +02:00
Lior Kaplan
4dc996f74d
Merge branch 'PHP-7.0'
...
* PHP-7.0:
SIZEOF_SIZE_T doesn't exist on AIX, keep using SIZEOF_LONG
2015-12-02 19:34:13 +02:00
Lior Kaplan
e322fb0015
SIZEOF_SIZE_T doesn't exist on AIX, keep using SIZEOF_LONG
...
Follow up for 3689b444
2015-12-02 19:30:05 +02:00
Andrey Hristov
139af35c25
Add a method for checking if the underlying stream is valid.
2015-12-01 12:52:36 +01:00
Xinchen Hui
badce8c49a
Merge branch 'PHP-7.0'
2015-12-01 10:35:48 +08:00
Xinchen Hui
ed4b887cf6
Fixed bug #70991 (zend_file_cache.c:710: error: array type has incomplete element type)
2015-12-01 10:35:32 +08:00
Scott
00e3b7614e
Update random.c
...
Ref: beb826f6fd
2015-12-01 10:33:33 +08:00
Xinchen Hui
c78a782a2f
Merge branch 'PHP-7.0'
2015-11-30 10:50:34 +08:00
Xinchen Hui
5df6f9f20e
Fixed bug #70993 (Array key references break argument processing)
2015-11-30 10:50:23 +08:00
Xinchen Hui
5c707a6cf8
Merge branch 'PHP-7.0'
2015-11-28 23:44:06 -08:00
Xinchen Hui
9397f52724
Fixed Bug #70967 (Weird error handling for __toString when Error is thrown)
2015-11-28 23:38:19 -08:00
Xinchen Hui
cb5af748b1
Merge branch 'PHP-7.0'
2015-11-27 19:12:37 -08:00
Xinchen Hui
5af61aa1cc
Space
2015-11-27 19:12:26 -08:00
Xinchen Hui
f9a56e00f6
Merge branch 'PHP-7.0'
2015-11-27 07:31:19 -08:00
Xinchen Hui
e9a8d7ff1d
Fixed bug #70977 , #70973 (Segmentation fault with opcache.huge_code_pages=1)
2015-11-27 07:30:37 -08:00
Xinchen Hui
3aa2182db6
Merge branch 'PHP-7.0'
2015-11-27 15:53:19 +08:00
Xinchen Hui
a347b0be48
Fixed bug #70949 (SQL Result Sets With NULL Can Cause Fatal Memory Errors)
2015-11-27 15:52:55 +08:00
Xinchen Hui
d3e6a9ce39
Merge branch 'PHP-7.0'
2015-11-27 11:42:39 +08:00
Xinchen Hui
b0f472b3b2
Fixed test
2015-11-27 11:42:30 +08:00
Xinchen Hui
541b11b5f6
Merge branch 'PHP-7.0'
2015-11-27 11:33:05 +08:00
Xinchen Hui
6cb6c04499
Fixed bug #70982 (setStaticPropertyValue behaviors inconsistently with 5.6)
2015-11-27 11:32:38 +08:00
Dmitry Stogov
2e6cf2710a
Fixed compilation warning
2015-11-26 11:27:24 +03:00
Christopher Jones
eaa94390b3
Merge branch 'PHP-7.0'
2015-11-26 06:53:54 +11:00
Christopher Jones
071247713f
Change line endings: Windows to Unix
2015-11-26 06:51:46 +11:00
Xinchen Hui
07a05836de
Merge branch 'PHP-7.0'
2015-11-25 20:20:51 +08:00
Xinchen Hui
9376e8213c
ZEND_SPACESHIP supports
2015-11-25 20:20:05 +08:00
Christopher Jones
850ef17c5d
Merge branch 'PHP-7.0'
2015-11-25 12:44:10 +11:00
Christopher Jones
7be30eb78c
Improve test portability
2015-11-25 12:43:05 +11:00
Christopher Jones
d10ee1eef1
Fix remaining gcov valgrind issues
2015-11-25 12:42:27 +11:00
Andrey Hristov
85e4fcf647
Give the possibility of the client to pass a factory
2015-11-24 10:23:44 +01:00
Xinchen Hui
7e7c2c062f
Merge branch 'PHP-7.0'
2015-11-24 13:46:04 +08:00
Xinchen Hui
e637ead6ed
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-24 13:45:32 +08:00
Xinchen Hui
e6b46dc2ff
Fixed bug #70960 (ReflectionFunction for array_unique returns wrong number of parameters)
2015-11-24 13:45:16 +08:00
Xinchen Hui
8d4fc591ef
Merge branch 'PHP-7.0'
2015-11-24 11:48:14 +08:00
Xinchen Hui
fd545f4f44
Also fixed 'r'
2015-11-24 11:48:03 +08:00
Xinchen Hui
59933934be
Merge branch 'PHP-7.0'
2015-11-24 11:08:53 +08:00
Xinchen Hui
3e0b2ba5d8
Indent (not sure why it was messed)
2015-11-24 11:08:30 +08:00
Xinchen Hui
31b4581c45
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
2015-11-24 11:05:56 +08:00
Xinchen Hui
26a526fb4a
Merge branch 'PHP-7.0'
2015-11-24 11:05:13 +08:00
Xinchen Hui
91fb1edbbf
Fixed bug #70963 (Unserialize shows UNKNOW in result)
...
Thanks to ryat for reportinig
2015-11-24 11:04:42 +08:00
Côme Bernigaud
e6759644ec
Revert "Added back support for undocummented host:port syntax"
...
This reverts commit 15876e85e5
.
2015-11-24 03:45:21 +01:00
Côme Bernigaud
5a8bcf73ba
Revert "Using default port in ldap_connect when NULL is passed (this was the behavior prior to 5.6.11)"
...
This reverts commit 391087ed28
.
2015-11-24 03:45:17 +01:00
Xinchen Hui
34bff5b91c
Merge branch 'PHP-7.0'
2015-11-23 23:16:11 +08:00
Xinchen Hui
7e9f416218
Fixed bug #70959 (ArrayObject unserialize does not restore protected fields)
2015-11-23 23:15:33 +08:00
Xinchen Hui
26f3710ae8
Merge branch 'PHP-7.0'
2015-11-23 06:22:11 -08:00
Xinchen Hui
801e46d8c0
Add test for bug (count on symbol table)
...
I should have do this ....
2015-11-23 06:21:30 -08:00
Xinchen Hui
8c22edc546
Merge branch 'PHP-7.0'
2015-11-23 06:12:46 -08:00
Xinchen Hui
6313e16a04
Improved fix for bug (count on symbol table)
2015-11-23 06:12:03 -08:00
Xinchen Hui
2ae9a6fca6
Merge branch 'master' of git.php.net:/php-src
2015-11-23 18:49:25 +08:00
Xinchen Hui
6dbf8d142f
Merge branch 'PHP-7.0'
2015-11-23 18:48:59 +08:00
Xinchen Hui
8c51578c81
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-23 18:48:51 +08:00
Xinchen Hui
b9845e5006
Add bug #70957 and #70958 releated test in refection
2015-11-23 18:48:21 +08:00
Andrey Hristov
6b0d026c76
Remove unused variable
2015-11-23 11:36:25 +01:00
Côme Bernigaud
56b584491b
Merge branch 'php-7.0'
...
* php-7.0:
Revert "Added back support for undocummented host:port syntax"
Revert "Using default port in ldap_connect when NULL is passed (this was the behavior prior to 5.6.11)"
2015-11-23 03:15:46 +01:00
Côme Bernigaud
ab39f981f8
Revert "Added back support for undocummented host:port syntax"
...
This reverts commit 15876e85e5
.
2015-11-23 03:08:25 +01:00
Côme Bernigaud
a9bfdcb82c
Revert "Using default port in ldap_connect when NULL is passed (this was the behavior prior to 5.6.11)"
...
This reverts commit 391087ed28
.
2015-11-23 03:08:02 +01:00
Xinchen Hui
3178242cda
Merge branch 'PHP-7.0'
2015-11-21 20:58:34 -08:00
Xinchen Hui
eada2aa91a
Fixed bug (count on symbol tables)
2015-11-21 20:58:29 -08:00
Xinchen Hui
1e9fcb49ac
conflicts variable name
2015-11-20 19:03:18 -08:00
Dmitry Stogov
4d49736155
cleanup
2015-11-21 01:19:45 +03:00
Dmitry Stogov
02fad0414b
Fixed wrong BB.flags initialization
2015-11-20 23:32:27 +03:00
Dmitry Stogov
b3393baa5d
Refactored CFG based optimization using new CFG representation.
...
Squashed commit of the following:
commit 907533390678f58eac738040ef62a40788048bef
Author: Dmitry Stogov <dmitry@zend.com>
Date: Fri Nov 20 21:25:28 2015 +0300
cleanup
commit 82f7e6f5bb434f12e9fdf45f597be351527f383c
Author: Dmitry Stogov <dmitry@zend.com>
Date: Fri Nov 20 21:22:01 2015 +0300
Update build system
commit 8fd83d843fde3f486692de4e2c6b7d64d4192704
Author: Dmitry Stogov <dmitry@zend.com>
Date: Fri Nov 20 20:50:32 2015 +0300
Reachable blocks can't be empty
commit 5822a36269833930a35cb3547222357118b11310
Author: Dmitry Stogov <dmitry@zend.com>
Date: Fri Nov 20 19:11:02 2015 +0300
added missing constraints
commit 2d0c00b243479924de0260ae8d80d624c36994a3
Author: Dmitry Stogov <dmitry@zend.com>
Date: Fri Nov 20 19:03:12 2015 +0300
optimization
commit 29d1e5eb210c51b052cac4d6c232aaa2c724dbbb
Author: Dmitry Stogov <dmitry@zend.com>
Date: Fri Nov 20 18:34:11 2015 +0300
Added missing optimization patterns
commit 38dd3b3f2459f5193c742633213f41d78326ea28
Author: Dmitry Stogov <dmitry@zend.com>
Date: Fri Nov 20 17:47:06 2015 +0300
zend_optimize_block() refactoring
commit 3dc97bd1f6d433dff0617338382347b6d0c08f84
Author: Dmitry Stogov <dmitry@zend.com>
Date: Fri Nov 20 14:30:32 2015 +0300
We don't use CFG back-references anymore
commit 2242c9e0aa741d287146ad43179650796f199f2d
Author: Dmitry Stogov <dmitry@zend.com>
Date: Fri Nov 20 14:16:03 2015 +0300
Consistent naming
commit 64f2856716069390ed7703ac88905cebf5e04023
Author: Dmitry Stogov <dmitry@zend.com>
Date: Fri Nov 20 13:29:32 2015 +0300
Optimization and separate building of direct CFG from predecessrs calculation
commit 9389be4869b13ec45df5dbd443015d2ac539a347
Author: Dmitry Stogov <dmitry@zend.com>
Date: Fri Nov 20 10:44:19 2015 +0300
Use CFG without back references (incomplete, but works)
commit 3d3ecd4b883959cf7b86c33622183295f913924e
Author: Dmitry Stogov <dmitry@zend.com>
Date: Fri Nov 20 00:50:09 2015 +0300
Fixed iteration in reverse order
commit 52f7fde0c3dfa4b4591519828ebdb238c2377936
Author: Dmitry Stogov <dmitry@zend.com>
Date: Thu Nov 19 18:35:09 2015 +0300
Separate debugging code into zend_dump.c
commit 4193a039ea96bae41baf97c6e458f419e8dbf9c5
Author: Dmitry Stogov <dmitry@zend.com>
Date: Thu Nov 19 17:22:04 2015 +0300
Remove unused code
commit 4228fdc57d8d120e1dad4e4d44045fa1a6f06fe0
Author: Dmitry Stogov <dmitry@zend.com>
Date: Thu Nov 19 17:21:20 2015 +0300
Remove dead live-ranges only on assembling basic blocks
commit 9a4a7966edf19b92678876f85565700694205598
Author: Dmitry Stogov <dmitry@zend.com>
Date: Thu Nov 19 15:26:29 2015 +0300
New CFG representation (incomplete)
2015-11-20 22:06:36 +03:00
Xinchen Hui
cc98663fcd
Merge branch 'PHP-7.0'
2015-11-20 06:37:54 -08:00
Xinchen Hui
519f9bc675
Fixed bug #70947 (INI parser segfault with INI_SCANNER_TYPED)
2015-11-20 06:37:38 -08:00
Xinchen Hui
1065feba7d
Merge branch 'PHP-7.0'
...
Conflicts:
ext/gd/gd_compat.c
2015-11-20 15:37:43 +08:00
Xinchen Hui
64a90a6b98
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-20 15:36:26 +08:00
Xinchen Hui
b42eb16cf4
This seems better
2015-11-20 15:36:13 +08:00
Xinchen Hui
8a50a96f46
Merge branch 'PHP-7.0'
2015-11-20 15:22:59 +08:00
Xinchen Hui
7e68d6e735
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-20 15:22:45 +08:00
Xinchen Hui
c8d6673b59
Fixed build error "undefined symbol gdJpegGetVersionString"
2015-11-20 15:22:05 +08:00
Christopher Jones
22d79c8d14
Merge branch 'PHP-7.0'
2015-11-20 09:16:33 +11:00
Christopher Jones
f66e25a82b
Fixed LOB implementation size_t/zend_long mismatch reported by gcov
2015-11-20 09:14:05 +11:00
Christopher Jones
8b32fe80ae
Stablize test on Windows
2015-11-20 09:13:47 +11:00
Dmitry Stogov
d6308afce9
Proper optmisation of "goto" into the middle of "try" block.
2015-11-19 11:19:06 +03:00
Remi Collet
9d7baed840
Merge branch 'PHP-7.0'
...
* PHP-7.0:
NEWS
Fixed bug #70940 Segfault in soep / type_to_string
2015-11-19 08:19:23 +01:00
Remi Collet
6680c2b22e
Fixed bug #70940 Segfault in soep / type_to_string
2015-11-19 08:18:13 +01:00
Dmitry Stogov
df63ec564e
minor fixes
2015-11-18 23:03:20 +03:00
Dmitry Stogov
104a597113
Eliminate unreachable live ranges
2015-11-18 18:04:02 +03:00
Dmitry Stogov
66b953e022
Eliminate unreachable catch blocks
2015-11-18 15:34:28 +03:00
Dmitry Stogov
af47326b38
Extended Debug info with live-ranges and excepton-table.
2015-11-18 13:14:57 +03:00
Andrey Hristov
e59814ff34
Fix the macro in case of no statistics
2015-11-18 10:49:37 +01:00
Andrey Hristov
b7b4364269
Fix wrong macro name
2015-11-18 10:35:10 +01:00
Andrey Hristov
ee396aa566
Revert "Fixed compilation on 32-bit Linux"
...
This reverts commit 11c9729a9c
.
2015-11-18 10:13:34 +01:00
Dmitry Stogov
a6cc322b4d
Added internal debug log for block pass.
2015-11-18 02:47:39 +03:00
Dmitry Stogov
030fab6233
Two step optimization for JMPZNZ L,L; L: JMPZ L+1; L: JMPNZ L+1.
2015-11-18 02:45:58 +03:00
Dmitry Stogov
854e8ebb4f
Move JMPZNZ L,L; L: JMPZ L+1; L: JMPNZ L+1 optimization patterns from zend_jmp_optimization() into zend_optimize_block() because the value of Tsource in zend_jmp_optimization() is inconsistent.
...
Fixed compilation warnings.
2015-11-17 21:07:01 +03:00
Andrey Hristov
d477557094
Revert "Add some const-ness to the protocol frame codec"
...
This reverts commit f8c2b45948
.
2015-11-17 17:55:32 +01:00
Andrey Hristov
057ad5626b
Don't use the specific translated name but use the macro for this
2015-11-17 17:48:27 +01:00
Dmitry Stogov
6cb3d90f0f
Skip first basic block (we skiped it before)
2015-11-17 19:02:39 +03:00
Dmitry Stogov
11c9729a9c
Fixed compilation on 32-bit Linux
2015-11-17 19:01:50 +03:00
Andrey Hristov
a6b79f08b3
More const and moved the declaration of php_mysqlnd_scramble() to mysqlnd_auth.h
2015-11-17 14:59:59 +01:00
Andrey Hristov
4ee4a4bb52
constify parameters
2015-11-17 14:49:18 +01:00
Andrey Hristov
43bfbd86d9
Rename from previous acronym (ppec became pfc)
2015-11-17 14:40:03 +01:00
Andrey Hristov
fae994fed9
Bring consistency to the class by renaming the methods too (from the
...
old temporary name)
2015-11-17 13:28:47 +01:00
Andrey Hristov
f8c2b45948
Add some const-ness to the protocol frame codec
2015-11-17 13:17:17 +01:00
Xinchen Hui
03d5fdc1b8
Merge branch 'PHP-7.0'
2015-11-17 20:14:22 +08:00
Xinchen Hui
4f0a05ab3e
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-17 20:14:11 +08:00
Xinchen Hui
66c1f966f0
Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
2015-11-17 20:13:22 +08:00
Xinchen Hui
fba3985f23
Improve the test
2015-11-17 20:12:50 +08:00
Andrey Hristov
33e97d465d
mysqlnd refactoring:
...
- move MYSQLND_READ_BUFFER to own file
2015-11-17 12:32:01 +01:00
Dmitry Stogov
7de190898d
cleanup
2015-11-17 11:24:16 +03:00
Dmitry Stogov
8112e34210
cleanup
2015-11-17 09:59:49 +03:00
Dmitry Stogov
843c165735
Don't undo/redo "pass two" for jump targets in opcache optimizer.
2015-11-17 07:15:35 +03:00
Andrey Hristov
e4173bd15c
mysqlnd refactoring:
...
- reorganize the statistics code a bit. There is one mysqlnd specific function,
for convenience, in mysqlnd_statistics.c - namelyu _mysqlnd_get_client_stats().
The mysqlnd specific stats macros are moved to mysqlnd.h to keep
mysqlnd_statistics.h from being mysqlnd specific.
2015-11-16 16:23:39 +01:00
Andrey Hristov
4fed8a28d0
mysqlnd refactoring :
...
- move the command buffer out of the networking code to the protocol frame
codec.
2015-11-16 15:37:11 +01:00
Andrey Hristov
24cb185cb3
Merge branch 'PHP-7.0'
2015-11-16 13:03:12 +01:00
Andrey Hristov
96406f0842
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-16 12:39:04 +01:00
Andrey Hristov
822400ef3b
News for fixed bug #68344
2015-11-16 12:38:25 +01:00
Andrey Hristov
398caf9336
- Remove dead macrom mysql_list_fields()
...
- Small optimizations here and there
2015-11-16 11:55:46 +01:00
Xinchen Hui
f5be26e04b
Unused var
2015-11-16 18:22:56 +08:00
Xinchen Hui
5bdc5f4e2b
Merge branch 'PHP-7.0'
2015-11-16 17:59:54 +08:00
Xinchen Hui
9134f9e98f
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
ext/mysql/php_mysql.c
2015-11-16 17:59:46 +08:00
Xinchen Hui
25439e939e
Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
2015-11-16 17:00:16 +08:00
Xinchen Hui
be6fd4ba89
Fixed bug #68077 (LOAD DATA LOCAL INFILE / open_basedir restriction)
...
Actually, this only be fixed if php uses mysqlnd
2015-11-16 16:59:55 +08:00
Côme Bernigaud
15876e85e5
Added back support for undocummented host:port syntax
2015-11-16 04:50:12 +01:00
Christopher Jones
1a1349b336
Merge branch 'PHP-7.0'
2015-11-16 08:16:07 +11:00
Christopher Jones
0dce4bef79
Fixed LOB mem leak reported on gcov. Also fixed unsigend comparison compile warning; and remove direct field access
2015-11-16 08:15:22 +11:00
Jakub Zelenka
88f71d921e
Merge branch 'PHP-7.0'
2015-11-15 19:16:01 +00:00
Jakub Zelenka
3c32019989
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-15 19:13:49 +00:00
Jakub Zelenka
e5abc53701
Use the same CS for all json tests
2015-11-15 19:06:09 +00:00
Nikita Popov
e02aea5590
Remove no longer applicable optimization
...
PHP 7 generates CVs inside silenced blocks.
2015-11-14 11:23:31 +01:00
Xinchen Hui
cae84ec224
Merge branch 'substr-useless-check' of https://github.com/tpunt/php-src
2015-11-14 01:44:43 -08:00
Xinchen Hui
1e2ddfcd10
Merge branch 'PHP-7.0'
2015-11-13 19:40:20 -08:00
Xinchen Hui
fce44a5a13
Fixed bug #70910 (extract() breaks variable references)
2015-11-13 19:39:59 -08:00
Dmitry Stogov
3a5fa926bf
Squashed commit of the following:
...
commit afe963e6cc289696e60c6c679796ba2197c52b3b
Author: Dmitry Stogov <dmitry@zend.com>
Date: Fri Nov 13 15:32:29 2015 +0300
Added news entry
commit a126b891c97848dd7ef8f1abf716328c46e0f19c
Author: Dmitry Stogov <dmitry@zend.com>
Date: Fri Nov 13 15:29:21 2015 +0300
VERIFY_RETURN_TYPE doesn't have to cleanup operand on exception, bacause now, live temporary variables are released by exception unwinder.
commit 0db475e98786e6bcaa8401ee3e0b33743b9a2f2b
Author: Dmitry Stogov <dmitry@zend.com>
Date: Thu Nov 12 22:55:39 2015 +0300
Fixed copy/paste
commit 0ac73fe7174bec9de9a610319a98b259bea67f7f
Author: Dmitry Stogov <dmitry@zend.com>
Date: Wed Nov 11 16:11:50 2015 +0300
Fixed bug #62210 (Exceptions can leak temporary variables)
2015-11-13 15:35:07 +03:00
Yasuo Ohgaki
cbe906226a
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Use distinguishable error messages.
2015-11-13 21:27:13 +09:00
Yasuo Ohgaki
a03786f773
Use distinguishable error messages.
2015-11-13 21:25:10 +09:00
Dmitry Stogov
485408b20d
Fixed compilation errors
2015-11-13 00:46:13 +03:00
Dmitry Stogov
16fcd9dcbd
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fixed bug #70900 (SoapClient systematic out of memory error)
2015-11-12 20:37:23 +03:00
Dmitry Stogov
04526093e4
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed bug #70900 (SoapClient systematic out of memory error)
2015-11-12 20:36:39 +03:00
Dmitry Stogov
f8bf9bd86b
Fixed bug #70900 (SoapClient systematic out of memory error)
2015-11-12 20:31:52 +03:00
Andrey Hristov
067380d7c6
MNDR:
...
- constify some parameters to MYSQLND_RES functions
2015-11-12 16:19:16 +01:00
Andrey Hristov
0a7e08d385
MNDR:
...
- cleanup in mysqlnd_result.c
- switch from zend_ulong to size_t for lengths. Accordingly change
mysqli and pdo_mysql for this.
2015-11-12 16:19:16 +01:00
Andrey Hristov
abc8c00072
MNDR:
...
- rename mysqlnd.c to mysqlnd_connection.c
2015-11-12 16:19:16 +01:00
Andrey Hristov
c24d452f60
MNDR:
...
- less dereferencing in mysqlnd_ps . Dereference stmt->conn only once and
use a stack variable. Also make the source cleaner.
2015-11-12 16:19:16 +01:00
Andrey Hristov
94ce013bff
MNDR:
...
- remove unused macros
2015-11-12 16:19:16 +01:00
Andrey Hristov
2e3fc57c5c
MNDR:
...
- move things out of mysqlnd_priv.h
2015-11-12 16:19:16 +01:00
Andrey Hristov
e8ace2d4db
MNDR:
...
- remove inclusion of uneeded headers
2015-11-12 16:19:16 +01:00
Andrey Hristov
4248240648
MNDR:
...
- move the command factory to own file - mysqlnd_commands.c
2015-11-12 16:19:16 +01:00
Andrey Hristov
3f0a542d04
MNDR:
...
- route the option to the right handler
2015-11-12 16:19:16 +01:00
Andrey Hristov
2cea04165c
MNDR:
...
- move all data members from MYSQLND_PFC to MYSQLND_PFC_DATA
2015-11-12 16:19:16 +01:00
Andrey Hristov
c286d7075d
MNDR:
...
- move from char* + len to MYSQLND_STRING
- add some more const modifiers
2015-11-12 16:19:16 +01:00
Andrey Hristov
a530ecff97
MNDR:
...
- better name for MYSQLND_PPEC - MYSQLND_PFC (protocol frame codec)
2015-11-12 16:19:16 +01:00
Andrey Hristov
654d1a7caf
MNDR:
...
- rename MYSQLND_NET to MYSQLND_PPEC (protocol packet envelope codec).
PPEC does only the encoding and decoding to the protocol frame.
2015-11-12 16:19:16 +01:00
Andrey Hristov
80d59a3a36
MNDR:
...
- intermediate step to move MYSQLND_NET from mysqlnd_vio.c to mysqlnd_wireprotocol.c
In following commits MYSQLND_NET's methods and data will be moved to MYSQLND_PROTOCOL
2015-11-12 16:19:16 +01:00
Andrey Hristov
05c5e051be
MNDR:
...
- moved networking code to mysqlnd_vio.c
2015-11-12 16:19:16 +01:00
Andrey Hristov
e9f3139f43
MNDR:
...
- split MYSQLND_NET into MYSQLND_NET and MYSQLND_VIO
MYSQLND_NET is above MYSQLND_VIO. _NET takes care of protocol packet
counting (even with compressed), while VIO is just about the network
(or in case of windows, non-network, but PIPE) transport.
2015-11-12 16:19:16 +01:00
Andrey Hristov
a990573752
MNDR:
...
- some small renaming of methods
2015-11-12 16:19:16 +01:00
Andrey Hristov
0d3329fc93
MNDR:
...
- send_command and send_command_handle_response_* moved to a structure
2015-11-12 16:19:16 +01:00
Andrey Hristov
e81ecc80ca
MNDR:
...
- Move transport string generation to own function, which can be overloaded or sniffed
2015-11-12 16:19:16 +01:00
Andrey Hristov
51085dac1a
MNDR:
...
- remove double decrement
2015-11-12 16:19:16 +01:00
Andrey Hristov
b8b1d45c3c
MNDR:
...
- move connection establishment code to own command - COM_HANDSHAKE
2015-11-12 16:19:16 +01:00
Andrey Hristov
e6419ab401
MNDR:
...
- convert the API of MYSQLND_NET to MYSQLND_STRING
2015-11-12 16:19:16 +01:00
Andrey Hristov
baab519ae5
MNDR:
...
- decouple the commands from the connection. CONN ist passed now only in 1 case
2015-11-12 16:19:16 +01:00
Andrey Hristov
5abee1948e
MNDR:
...
- remove dead code
2015-11-12 16:19:16 +01:00
Andrey Hristov
71e703761f
MNDR:
...
- clean up some things
2015-11-12 16:19:16 +01:00
Andrey Hristov
e30e884e53
MNDR:
...
- move COM_INIT_DE result handling to the command
2015-11-12 16:19:16 +01:00
Andrey Hristov
fefc3045a3
MNDR:
...
- remove COM_FIELD_LIST
2015-11-12 16:19:16 +01:00
Andrey Hristov
75a1fcc724
MNDR:
...
- move handling of commands to the command itself
2015-11-12 16:19:16 +01:00
Andrey Hristov
7e6f9a84cb
MNDR:
...
- split handle_response() into handle_OK and handle_EOF
2015-11-12 16:19:16 +01:00
Andrey Hristov
aa4966d4e3
MNDR:
...
- now send_command_handle_response() also doesn't depend directly on
MYSQLND_CONN_DATA
2015-11-12 16:19:16 +01:00
Andrey Hristov
f7a445856d
MNDR:
...
- pass connection closer and its context
- remove unused parameter
2015-11-12 16:19:16 +01:00
Andrey Hristov
280c834c49
MNDR:
...
- rename the macro for updating the connection state
2015-11-12 16:19:16 +01:00
Andrey Hristov
109dc08ffd
MNDR:
...
- make the connection state a class
2015-11-12 16:19:16 +01:00
Andrey Hristov
78cb5456da
MNDR:
...
- simplify the macroses for the types
2015-11-12 16:19:16 +01:00
Andrey Hristov
e9bccffe29
MNDR:
...
- switch to macro generation of structure names for the methods
2015-11-12 16:19:16 +01:00
Andrey Hristov
3eee292669
MNDR:
...
- Remove the SET_STMT_ERROR macro
2015-11-12 16:19:16 +01:00
Andrey Hristov
4bb784cd0d
MNDR:
...
- make MYSQLND_ERROR_INFO a class
2015-11-12 16:19:16 +01:00
Andrey Hristov
fb1b5abe31
MNDR:
...
- switch to MYSQLND_CLASS_METHOD_TABLE_NAME_DECL() for automatic naming
of class methods
2015-11-12 16:19:16 +01:00
Andrey Hristov
5609eabc6f
MDNR:
...
- make MYSQLND_UPSERT_STATUS more like an object that a simple structure
Still use macros to make updates simple
2015-11-12 16:19:16 +01:00
Andrey Hristov
092afe7212
MNDR:
...
- abstract SSL enabling into COM_ENABLE_SSL
2015-11-12 16:19:16 +01:00
Andrey Hristov
10d4fb8a94
MDNR:
...
- Refactor the command factory. Let the factory be exchangeable.
2015-11-12 16:19:16 +01:00
Andrey Hristov
e24dc94f32
MDNR:
...
- remove dead code
2015-11-12 16:19:16 +01:00
Andrey Hristov
7d7ff67b82
MDNR:
...
- send_command() is no more, thus we need commands for all COM_STMT_*
+ CHANGE_USER
2015-11-12 16:19:16 +01:00
Andrey Hristov
f6ec3df895
MNDR:
...
- Switch for directly executing a command over the wire to creating a
command object which is then executed.
2015-11-12 16:19:16 +01:00
Andrey Hristov
2a44cee4d5
MNDR:
...
- Remove unused variable
2015-11-12 16:19:16 +01:00
Andrey Hristov
c33d3b6e5b
MDNR:
...
- remove dead code
2015-11-12 16:19:16 +01:00
Andrey Hristov
ab961ca347
MNDR:
...
- remove export of functions and have things exported thru an interface
with default implementation
2015-11-12 16:19:16 +01:00
Andrey Hristov
784a371829
MNDR:
...
- Inject the object factory
2015-11-12 16:19:16 +01:00
Andrey Hristov
f16686faa7
MNDR:
...
- don't use the static function name but the hook
2015-11-12 16:19:16 +01:00
Andrey Hristov
19443351ed
MNDR:
...
- remove static function and make it a method. The function doesn't need to
be in mysqlnd_ps.c as it doesn't use any resources anymore from it (it used
in the past)
2015-11-12 16:19:16 +01:00
Andrey Hristov
3f7a7837cd
MDNR:
...
- cleanup after PHP7 changes (removal of TSRMLS_**)
2015-11-12 16:19:16 +01:00
Andrey Hristov
cfd868651a
MDNR:
...
- removed init() method from mysqlnd_conn_data and moved the initialization
to the object factory->get_connection(). Now it is unified as with the prepared
statement which doesn't have any init() method
- the protocol decoder factory now takes connection as parameter at creation and
thus there is no need to pass the connection as parameter when calling the read
or the write method of a packet.
- saved the protocol payload decoder factory as pointer in every packet (read/write)
so the connection doesn't need to be passed on every call of read/write (dependency
has been already injected at creation). This will alow to move protocol specific
code from MYSQLND_NET (send_ex()) to make MYSQLND_NET leaner and free from protocol
stuff.
2015-11-12 16:19:16 +01:00
Andrey Hristov
75dc67c6ae
MNDR:
...
- move macro to a function
2015-11-12 16:19:16 +01:00
Andrey Hristov
2ea4891e75
MNDR:
...
- rename mysqlnd_init to mysqlnd_connection_init
- rename mysqlnd_connect to mysqlnd_connection_connect
- created macros for BC
2015-11-12 16:19:16 +01:00
Andrey Hristov
34a33928d6
MNDR:
...
- Rename MYSQLND_PROTOCOL to MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY
- Rename other symbols related to MYSQLND_PROTOCOL accordingly
2015-11-12 16:19:16 +01:00
Andrey Hristov
4c83582c74
MNDR
...
- enum_mysqlnd_protocol_type -> enum_mysqlnd_session_protocol_type
2015-11-12 16:19:16 +01:00
Andrey Hristov
3091a01799
MNDR
...
- mysqlnd_option -> mysqlnd_client_option
2015-11-12 16:19:16 +01:00
Andrey Hristov
6051a47776
MNDR
...
- Rename simple_command* to send_command
2015-11-12 16:19:16 +01:00
Andrey Hristov
0f38d479e1
MNDR :
...
- Rename MYSQLND_OPTIONS to MYSQLND_SESSION_OPTIONS
- Rename MYSQLND_NET_OPTIONS to MYSQLND_IO_OPTIONS
2015-11-12 16:19:16 +01:00
Dmitry Stogov
7cae94d751
Merge branch 'master' of git.php.net:php-src
...
* 'master' of git.php.net:php-src:
add test for bug #70898
Also protects this one
Update NEWS
Re-fixed #70895
Revert "Fixed bug Bug #70895 null ptr deref and segfault"
Revert "refix bug #70895 "
Revert "Fixed bug #70898 (SIGBUS/GPF zend_mm_alloc_small (zend_alloc.c:1291))"
Fixed bug #70898 (SIGBUS/GPF zend_mm_alloc_small (zend_alloc.c:1291))
Using default port in ldap_connect when NULL is passed (this was the behavior prior to 5.6.11)
update NEWS
refix bug #70895
Fixed bug Bug #70895 null ptr deref and segfault
2015-11-12 13:52:52 +03:00
Xinchen Hui
29674a2e27
Merge branch 'PHP-7.0'
2015-11-12 14:20:24 +08:00
Xinchen Hui
fc611a134b
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-12 14:20:03 +08:00
Côme Bernigaud
391087ed28
Using default port in ldap_connect when NULL is passed (this was the behavior prior to 5.6.11)
...
Note that passing 0 will also result in default port.
2015-11-12 07:06:05 +01:00
Dmitry Stogov
63c4414940
Initialize ctx->optimization_level
2015-11-12 02:46:41 +03:00
Dmitry Stogov
09aa68b294
Break dependency between opcache and optimizer. Remove copatibility macros.
2015-11-12 02:02:24 +03:00
Thomas Punt
c37890062d
Remove useless check in substr()
...
This check (if the start position is greater than the string length) is already performed on line 2399
2015-11-11 22:13:57 +00:00
Dmitry Stogov
948b7f5421
Changed ZEND_FREE.op2.num and ZEND_FE_FREE.op2.num back to use live_range_offset (try_catch_offset does't work)
2015-11-11 11:12:44 +03:00
Xinchen Hui
cd6dda1679
Merge branch 'PHP-7.0'
2015-11-11 12:33:13 +08:00
Xinchen Hui
82f503f587
Re-Fixed bug #70249 (Segmentation fault while running PHPUnit tests on phpBB 3.2-dev)
...
Let's fixed this in the root instead
2015-11-11 12:32:46 +08:00
Xinchen Hui
c3260b66c9
Revert "Fixed bug #70249 (Segmentation fault while running PHPUnit tests on phpBB 3.2-dev)"
...
This reverts commit d6c527830e
.
2015-11-11 12:06:38 +08:00
Xinchen Hui
607e17e269
Merge branch 'PHP-7.0'
2015-11-11 11:35:09 +08:00
Xinchen Hui
d6c527830e
Fixed bug #70249 (Segmentation fault while running PHPUnit tests on phpBB 3.2-dev)
...
Maybe we should introduce a new zend_hash_safe_apply which always reload
the ht->arData to make sure won't segfault the ht is grew?
2015-11-11 11:34:11 +08:00
Dmitry Stogov
baf97b1fcc
We don't nees zend_op_array->brk_cont_array at run-time anymore.
...
Move zend_op_array->brk_cont_array into CG(context).brk_cont_array.
Use more compact zend_op_array->live_range instead of zend_op_array->brk_cont_array.
Semantic is kept unchanged.
2015-11-10 21:48:03 +03:00
Dmitry Stogov
86a96f2cf1
Changed meaning of "op2" for ZEND_FREE, ZEND_FE_FREE, ZEND_FAST_CALL, ZEND_FAST_RET.
...
Previously it was an instruction number.
Now it's an index in op_array->try_cacth_array[].
2015-11-10 19:13:54 +03:00
Matteo Beccati
0ed6e25e52
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Split shmop/tests/002.phpt in two (all + non-root)
Fix bug #70886 in shmop/tests/002.phpt
2015-11-10 09:10:15 +01:00
Matteo Beccati
3cb3979de3
Split shmop/tests/002.phpt in two (all + non-root)
...
One of the conditions tested was expected to fail with "Permission denied",
but it doesn't when running as root. The memory segment was also leaked, hence
the split.
2015-11-10 09:10:10 +01:00
Matteo Beccati
6fa9b76342
Fix bug #70886 in shmop/tests/002.phpt
2015-11-10 09:10:10 +01:00
Jakub Zelenka
a6bd699264
Merge branch 'PHP-7.0'
2015-11-09 18:25:07 +00:00
Jakub Zelenka
570cdc05d7
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-09 18:23:29 +00:00
Jakub Zelenka
1a12403002
Remove SNI test that trigger request to sni.velox.ch
...
This has been requested by Kaspar Brand who provides
sni.velox.ch. That site is only for interactive
testing and not for unit/integration/regression testing.
Although this test is run only in special cases (when
SNI_TESTS is defined) it should still be removed.
Also this test is not reliable as it depends on external
resources.
2015-11-09 18:11:18 +00:00
James Titcumb
bb55ac6279
Fixed typo in reflection phpt
2015-11-07 22:58:56 -08:00
Xinchen Hui
d5113bfa96
Merge branch 'patch-1' of https://github.com/asgrim/php-src
2015-11-07 22:58:30 -08:00
Nikita Popov
83b1679b6f
Merge branch 'PHP-7.0'
...
Conflicts:
ext/opcache/Optimizer/zend_optimizer.c
2015-11-07 17:50:39 +01:00
Nikita Popov
bc3512c1d6
Fix various update_opN_const issues
2015-11-07 17:45:26 +01:00
Nikita Popov
9da456655c
Refactor update_op2_const
...
Combines both switches into one, to avoid having to maintain the same
opcode list twice. This also makes most of the bugs fixed by the next
commit pretty obvious.
No functional change here.
2015-11-07 17:31:09 +01:00
Xinchen Hui
aff639faec
Merge branch 'PHP-7.0'
2015-11-07 07:43:29 -08:00
Xinchen Hui
de8bfb32bd
Use defined macro
2015-11-07 07:43:18 -08:00
Xinchen Hui
f18f71740f
Merge branch 'PHP-7.0'
2015-11-07 07:30:42 -08:00
Xinchen Hui
e9fd8ad446
Fixed bug #70876 (Segmentation fault when regenerating session id with strict mode)
2015-11-07 07:30:31 -08:00
Xinchen Hui
148bb622fa
Revert "Fixed bug #70876 Segmentation fault when regenerating session id with strict mode"
...
This reverts commit 0bf3ebb4ba
.
2015-11-07 07:17:43 -08:00
Reeze Xia
568c81809a
Merge branch 'PHP-7.0'
...
* PHP-7.0:
C99 complain fix
Update NEWS
Fixed bug #70876 Segmentation fault when regenerating session id with strict mode
2015-11-07 22:17:10 +08:00
Reeze Xia
c524f43e4f
C99 complain fix
2015-11-07 22:15:19 +08:00
Reeze Xia
0bf3ebb4ba
Fixed bug #70876 Segmentation fault when regenerating session id with strict mode
...
The comment *mod_data always be non-NULL is not true.
The same as this FIXME: https://github.com/php/php-src/blob/master/ext/session/mod_files.c#L676
2015-11-07 21:46:21 +08:00
Nikita Popov
603c172269
Merge branch 'PHP-7.0'
...
Conflicts:
ext/opcache/Optimizer/zend_optimizer.c
2015-11-07 12:09:20 +01:00
Nikita Popov
99d818f1e9
Don't propagate into ops that error on non-string
...
To properly support this make update_opN_const fallible -- they
are not always called through replace_with_const.
2015-11-07 12:04:51 +01:00
Nikita Popov
00b37e718d
Strip leading backslash in update_opN_const
2015-11-07 12:04:51 +01:00
Nikita Popov
632bee4abb
Fix update_opX_const lowercasing
...
It was lowering in-place.
2015-11-07 12:04:51 +01:00
Matteo Beccati
050c5e8940
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fix bug #70875 Segmentation fault if wsdl has no targetNamespace attribute
Always remember NEWS....
Fix compile warnings about comparison of unsigned expression always being true
Bump OCI8 version
Fix bug 68298 (PHP OCI8 OCI int overflow) (Senthil)
2015-11-07 11:06:10 +01:00
Matteo Beccati
c263dcee2f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fix bug #70875 Segmentation fault if wsdl has no targetNamespace attribute
2015-11-07 11:05:36 +01:00
Matteo Beccati
fd61666d96
Fix bug #70875 Segmentation fault if wsdl has no targetNamespace attribute
2015-11-07 11:00:33 +01:00
Anatol Belski
655e266440
Merge branch 'PHP-7.0'
...
* PHP-7.0:
update NEWS
fix decrement_function regarding bug #70863
Fixed bug #70863 Incorect logic to increment_function for proxy objects
no more dev ZEND_VERSION
Add support for IPV6_V6ONLY on sockets
Conflicts:
Zend/zend.h
2015-11-06 23:10:40 +01:00
Bob Weinand
855bb36fd0
Add support for IPV6_V6ONLY on sockets
2015-11-06 21:45:31 +01:00
Christopher Jones
69613a7ac3
Merge branch 'PHP-7.0'
2015-11-07 02:25:18 +11:00
Christopher Jones
049325ca96
Fix bug 68298 (PHP OCI8 OCI int overflow) (Senthil)
2015-11-07 02:24:17 +11:00
Christopher Jones
a57b205383
Fix compile warnings about comparison of unsigned expression always being true
2015-11-07 02:14:18 +11:00
Christopher Jones
f88a9a9643
Bump OCI8 version
2015-11-07 02:10:57 +11:00
Christopher Jones
3060dfd92e
Fix bug 68298 (PHP OCI8 OCI int overflow) (Senthil)
2015-11-07 01:56:50 +11:00