Xinchen Hui
a23a88b3e7
Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
2015-11-02 10:47:32 +08:00
Xinchen Hui
37ed0dafe4
Fixed bug #70828 (php-fpm 5.6 with opcache crashes when referencing a non-existent constant)
2015-11-02 10:47:02 +08:00
Jakub Zelenka
e62db72111
Use standard title for new openssl tests
2015-10-29 19:11:57 +00:00
root
06c6b51e7d
new tests to openssl module, don't covered yet.
2015-10-29 19:06:40 +00:00
Markus Staab
8e83ea6e5d
fixed another comment typo
2015-10-28 09:03:16 +01:00
Lynn
a4d5accf7d
rm duplicate include
2015-10-28 11:21:15 +08:00
Anatol Belski
524a468d5f
Merge branch 'PHP-7.0'
...
* PHP-7.0:
sync NEWS
7.0.1 is next
2015-10-27 20:20:58 +01:00
Anatol Belski
5dd59cc90d
sync NEWS
2015-10-27 20:10:06 +01:00
Anatol Belski
ac4601eadd
7.0.1 is next
2015-10-27 20:08:54 +01:00
Markus Staab
08c97ea0a1
fixed typo
2015-10-27 17:29:28 +01:00
Markus Staab
b83782e682
fixed another comment typo
2015-10-27 17:27:57 +01:00
Markus Staab
058a7ab55c
fixed typo in comment
...
introduced in eb32da13cd
2015-10-27 17:26:36 +01:00
Anatol Belski
24bae1614f
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fix frequent reallocations with many small strings
correct snprintf usage
2015-10-27 17:08:51 +01:00
Dmitry Stogov
eb32da13cd
Fix frequent reallocations with many small strings
2015-10-27 17:07:58 +01:00
Anatol Belski
0e50a4c008
correct snprintf usage
2015-10-27 17:07:51 +01:00
James Titcumb
2863f46d68
Fixed typo in reflection phpt
2015-10-27 13:18:50 +00:00
Andrey Hristov
c484bf9439
Merge branch 'PHP-7.0'
2015-10-27 13:33:05 +01:00
Andrey Hristov
c133515811
Merge branch 'PHP-5.6' into PHP-7.0
2015-10-27 13:32:45 +01:00
Andrey Hristov
6d51b7b2e3
Another Fix for Bug #68344 MySQLi does not provide way to disable peer certificate validation
...
Added the possibility to explicitly state that the peer certificate should not be checked.
Back to the default - checking the certificate.
Exported MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT
Usage : mysqli_real_connect( , , , , , MYSQLI_CLIENT_SSL | MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT)
If mysqli_ssl_set() is not called, but only MYSQLI_CLIENT_SSL is passed, without the (don't) very flag,
then no verification takes place.
2015-10-27 12:59:09 +01:00
Xinchen Hui
9c1d0946f4
It should not be const
2015-10-27 10:08:27 +08:00
Xinchen Hui
69beb29e15
Fixed Bug #70797 (Error while making PHP7)
...
error: ‘for’ loop initial declarations are only allowed in C99 mode
2015-10-27 10:06:22 +08:00
Xinchen Hui
1af0118ff8
Merge branch 'PHP-7.0'
2015-10-26 17:29:22 -07:00
Xinchen Hui
008d8b6789
Fixed bug #70656 (require() statement broken after opcache_reset() or a few hours of use)
2015-10-26 17:28:19 -07:00
Xinchen Hui
31553f07f2
Revert "Fixed bug #70656 (require() statement broken after opcache_reset() or a few hours of use)"
...
This reverts commit 3ef96c2cc6
2015-10-26 17:26:30 -07:00
Xinchen Hui
0771b46099
Merge branch 'PHP-7.0'
2015-10-26 17:11:16 -07:00
Leigh
54ff923ff5
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Use arc4random on OpenBSD 5.5+ and NetBSD 7+
2015-10-30 19:11:09 +00:00
Leigh
faf835be2b
Use arc4random on OpenBSD 5.5+ and NetBSD 7+
...
As discussed with @weltling, keeping arc4random on the condition that the OS has a solid implementation of it
2015-10-30 19:08:20 +00:00
Dmitry Stogov
3e89c883bb
Changed ZEND_CLONE->extended_value meaning to relative offset (previously it was absolute opline number)
2015-10-30 14:53:53 +03:00
Reeze Xia
880965b95e
Merge branch 'PHP-7.0'
...
* PHP-7.0:
This couldn't be false as it has been checked before
Use h parameter to avoid duplicate ht access of `array_combine()`
2015-10-30 19:52:03 +08:00
Reeze Xia
c4297a5a29
This couldn't be false as it has been checked before
2015-10-30 19:50:54 +08:00
Reeze Xia
68b431e37d
Use h parameter to avoid duplicate ht access of array_combine()
2015-10-30 19:49:04 +08:00
Dmitry Stogov
9ccb432cab
Argument type renaming (ADDR->JMP_ADDR, OPLINE->JMP_ABS, REL_OPLINE->JMP_REL)
2015-10-30 07:18:44 +03:00
Dmitry Stogov
5c65fc29ad
Fixed few issues:
...
- Added ZEND_VM_LAST_OPCODE macro
- Use better names LINE->OPLINE, REL_LINE->REL_OPLINE, FCALL->FAST_CALL, FRET->FAST_RET
- Added ISSET flag to extended value of ZEND_ISSET_ISEMPTY_VAR opcode
2015-10-30 07:18:44 +03:00
Dmitry Stogov
d83600a2d5
Added zend_get_opcode_flags() function to get information about opcode operands and extended_value meaning
2015-10-30 07:18:44 +03:00
Dmitry Stogov
648347536a
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fixed incomplete initialization.
2015-10-30 07:16:31 +03:00
Dmitry Stogov
3c5a3e77d4
Fixed incomplete initialization.
2015-10-30 07:15:56 +03:00
Jakub Zelenka
24ab2bb694
Merge branch 'PHP-7.0'
2015-10-29 19:15:57 +00:00
Jakub Zelenka
41de89f61b
Merge branch 'PHP-5.6' into PHP-7.0
2015-10-29 19:14:25 +00:00
Dmitry Stogov
cb85f570c8
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fixed memory leak in php_stream_context_set_option()
2015-10-29 20:07:37 +03:00
Dmitry Stogov
c67fc6bb09
Fixed memory leak in php_stream_context_set_option()
2015-10-29 20:06:55 +03:00
Xinchen Hui
f596c8a3e1
Merge branch 'PHP-7.0'
2015-10-29 15:02:00 +08:00
Xinchen Hui
241e340f78
Make these tests fail faster, Thanks to GFW
2015-10-29 15:01:43 +08:00
Xinchen Hui
661798ad34
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
2015-10-29 14:35:31 +08:00
Xinchen Hui
494bf962a6
Merge branch 'PHP-7.0'
2015-10-29 14:35:07 +08:00
Xinchen Hui
179fba3f38
Fixed bug #70808 (array_merge_recursive corrupts memory of unset items)
...
I knew, this fix seems ugly
2015-10-29 14:33:58 +08:00
Dmitry Stogov
4d702c21d0
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Don't remap .text segment if huge pages are not available.
2015-10-29 08:45:22 +03:00
Julien Pauli
eb59dd7d81
Don't remap .text segment if huge pages are not available.
2015-10-29 08:44:19 +03:00
Dmitry Stogov
da8e6ec4a5
Fixed incorrect instruction cleanup
2015-10-28 23:10:33 +03:00
Dmitry Stogov
3b44e40277
fixed incorrect bitmask
2015-10-28 21:26:52 +03:00
Dmitry Stogov
b009f84ec0
Removed incorrect "return" statement
2015-10-28 21:26:52 +03:00
