mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-27 20:03:40 +08:00
Code Issues Packages Projects Releases Wiki Activity
103,118 Commits 500 Branches 1,381 Tags 811 MiB
a56700043e
Commit Graph

103118 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Remi Collet
754e1c463d ZEND_ACC_CLONE is removed 2017-06-25 08:23:30 +02:00
Remi Collet
8e98a44eb2 fix version 2017-06-25 08:22:29 +02:00
Anatol Belski
31e4afe3c3 [ci skip] update NEWS 2017-06-24 01:37:45 +02:00
Anatol Belski
cf1f9a20fd Merge branch 'PHP-7.1' 
* PHP-7.1:
  [ci skip] update NEWS
 2017-06-24 01:29:51 +02:00
Anatol Belski
4e98990f6b [ci skip] update NEWS 2017-06-24 01:28:58 +02:00
Anatol Belski
eb68301df1 Relax test condition, as OpenSSL 1.1.x out differs in EOL only 2017-06-24 00:25:51 +02:00
Anatol Belski
d7b9eb981a Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix bug #74798 pkcs7_en/decrypt does not work if \x0a is used in content
 2017-06-24 00:24:56 +02:00
Anatol Belski
b714309056 Fix bug #74798 pkcs7_en/decrypt does not work if \x0a is used in content 
The patch for bug #74720 was incomplete.
 2017-06-24 00:18:57 +02:00
Nikita Popov
272a9f29f5 Merge branch 'PHP-7.1' 2017-06-23 17:33:36 +02:00
Nikita Popov
5b5a92b8b6 Fixed bug #74623 2017-06-23 17:32:45 +02:00
Nikita Popov
4948da178a Make inference robust against infinite loop 
Right now, if narrowing occurs on non-debug builds, inference can
easily go into an infinite loop. Prevent this, and add a pointer
that this should be reported as a bug.
 2017-06-23 17:07:44 +02:00
Dmitry Stogov
d55b43d9cb Merge branch 'fast_shutdown' 
* fast_shutdown:
  Reseet EG(active) a bit early.
  Reuse "nIndex"
  shutdown_executor() refactoring (reuse opcache fast request shutdown code)
 2017-06-23 14:59:29 +03:00
Dmitry Stogov
866d3b40e9 Reseet EG(active) a bit early. 2017-06-23 14:58:19 +03:00
Nikita Popov
748069e3a0 Merge branch 'PHP-7.1' 2017-06-23 13:32:51 +02:00
Nikita Popov
721de5b542 Merge branch 'PHP-7.0' into PHP-7.1 2017-06-23 13:31:39 +02:00
ideal
4d6100569b Fix error if compiled without -fpermissive flag. 2017-06-23 13:31:23 +02:00
Dmitry Stogov
40ed9aaa48 Reuse "nIndex" 2017-06-23 14:23:00 +03:00
Joe Watkins
a79ec404b2
Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix method "eof"
 2017-06-23 07:53:24 +01:00
Joe Watkins
bd8940a1fe
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix method "eof"
 2017-06-23 07:53:12 +01:00
danchukas
b255b97e43
fix method "eof" 
replace "eof" with  "feof"
because:
1) http://php.net/manual/ru/function.feof.php
2) Error: Call to undefined function eof()
 2017-06-23 07:53:00 +01:00
Joe Watkins
5796fff344
Merge branch 'PHP-7.1' 
* PHP-7.1:
  Remove superfluous branch
 2017-06-23 07:51:59 +01:00
Joe Watkins
b903733762
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Remove superfluous branch
 2017-06-23 07:51:46 +01:00
Thomas Punt
b1301a0686
Remove superfluous branch 2017-06-23 07:51:32 +01:00
Marat Nagayev
99b611958f fix news 2017-06-22 22:41:53 +01:00
Jakub Zelenka
bf8717594c Update NEWS with info about openssl pkcs7 read and verify changes 2017-06-22 20:39:09 +01:00
Jelle van der Waa
787a18a50a Add openssl_pkcs7_read and output P7B in openssl_pkcs7_verify 
Add an optional argument to openssl_pkcs7_verify to save the P7B
structure which can contain extra CA intermediate certificates send
along with an S/MIME signed email.

Introduce a new function called openssl_pkcs7_read, which can read a
PKCS#7 structure passed as a string and returns by reference an array
with PEM certificates formatted as a string.
 2017-06-22 20:36:23 +01:00
Sara Golemon
d09edf7b34 Minor refactor of load extension by name impl 
Minimize the #ifdef surface area
Localize orig_libpath to retry scope
Send errors to php_error() rathern than stderr
 2017-06-22 13:13:45 -04:00
Francois Laupretre
fe5c8f2b80 Allow loading PHP and Zend extensions by name 
Allow extension name as INI 'extension=' and dl() argument
No BC break, as file name is still accepted.
When using the '-z' command line option (CLI/CGI), an absolute file name must still be provided (nothing changed here)
Change comments in example INI files
 2017-06-22 12:58:15 -04:00
Joe Watkins
0f15a03026
Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix configure error
 2017-06-22 14:02:09 +01:00
Joe Watkins
21cbdf6984
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix configure error
 2017-06-22 14:01:45 +01:00
Peter Kokot
660250f4da
Fix configure error 
This patch fixes configure error on some systems such as Alpine.

```
 line 3472: test: =: unary operator expected
```

One of the fixes has been suggested also here already:
https://bugs.php.net/bug.php?id=39835

Thank you for considering merging this.
 2017-06-22 14:01:18 +01:00
Michael Moussa
9437dcd621
Add test for bug #52480 2017-06-22 13:56:03 +01:00
Joe Watkins
2030b59829
Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix bug #73471 PHP freezes with AppendIterator
 2017-06-22 11:58:04 +01:00
Joe Watkins
c56378b0d5
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix bug #73471 PHP freezes with AppendIterator
 2017-06-22 11:57:39 +01:00
jhdxr
81c2a4b9ba
fix bug #73471 PHP freezes with AppendIterator 2017-06-22 11:56:49 +01:00
Joe Watkins
36d064be12
fix news 2017-06-22 11:54:10 +01:00
Joe Watkins
7945dca6ec
Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix bug #74780 parse_url() borken when query string contains colon
  Update NEWS
 2017-06-22 11:53:27 +01:00
Joe Watkins
ed1f64e083
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix bug #74780 parse_url() borken when query string contains colon
 2017-06-22 11:52:39 +01:00
jhdxr
db287b2303
fix bug #74780 parse_url() borken when query string contains colon 2017-06-22 11:52:06 +01:00
Niklas Keller
3250fa09b2
Fix name in NEWS 
It's enough to name my php.net account there.
 2017-06-22 11:48:43 +01:00
Dmitry Stogov
f25ecdacf8 shutdown_executor() refactoring (reuse opcache fast request shutdown code) 2017-06-22 01:45:28 +03:00
Dmitry Stogov
9fb0e6ffe2 Fixed SKIP code 2017-06-22 01:41:59 +03:00
Dmitry Stogov
c7a75b7112 Fixed few test failures if php.ini contains zend.assertions=-1 2017-06-21 18:50:08 +03:00
Dmitry Stogov
06e41cadd9 We don't need any special handling for CG(unclean_shutdown) at this point, because in case of exit() or die() all destructors must be already called before. 2017-06-21 16:11:50 +03:00
Dmitry Stogov
9b201aec07 Setting CG(unclean_shutdown) in fast shutdown doesn't make a lot of sense (it was set to prevent memory leak messages, but we doesn't check memory leaks in RELEASE build anyway). 2017-06-21 16:09:21 +03:00
Dmitry Stogov
7af5741333 Avoid useless duplication 2017-06-21 12:57:24 +03:00
Dmitry Stogov
c61cea7135 Use persistent heap only for persistent connections. 2017-06-21 11:25:30 +03:00
Dmitry Stogov
687123ebf2 Use request heap. 2017-06-21 11:25:05 +03:00
Dmitry Stogov
c16f954ff1 Clear alocated memory blocks, only if this is really necessary. 2017-06-21 10:37:54 +03:00
Christopher Jones
1dfb63feca Update NEWS 2017-06-21 16:17:54 +10:00