| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The $Id$ keywords were used in Subversion where they can be substituted
with filename, last revision number change, last changed date, and last
user who changed it.
In Git this functionality is different and can be done with Git attribute
ident. These need to be defined manually for each file in the
.gitattributes file and are afterwards replaced with 40-character
hexadecimal blob object name which is based only on the particular file
contents.
This patch simplifies handling of $Id$ keywords by removing them since
they are not used anymore.
|
| |
|
| |
|
|
|
|
| |
Keep non-constant "php_stream_wrapper"s in API functions and callbacks for compatibility.
|
| |
|
| |
|
| |
|
|
|
|
|
| |
In certain case, it could take more than just 0/1, but 2 bits should
be enough.
|
|
|
|
| |
as it's a flag now, just set the value
|
| |
|
|
|
|
| |
32 bytes are spared on 64-bit build
|
|
|
|
|
| |
Sometimes int is overflown. That might still come out with a right
result, but is ofc not clean.
|
|
|
|
|
|
| |
As revealed by #72857, this value conflicts with the xport option.
Wrong code can otherwise cause streams misbehave, fe if local and
network streams APIs are mixed.
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
These are either in debug code (fix them), commented out (drop
them) or in dead compatibility macros (drop them).
One usage was in php_stream_get_from_zval(), which we have not used
since at least PHP 5.2 and, judging from the fact that nobody
complained about it causing compile errors in PHP 7, nobody else
uses it either, so drop it.
There are still remaining uses in mysqli embedded and odbc birdstep.
These probably need to be dropped outright.
|
| |
|
|\
| |
| |
| |
| | |
* PHP-5.6:
Happy new year (Update copyright to 2016)
|
| | |
|
| |
| |
| |
| |
| |
| | |
This macro is not used but it's wrong as zend_fetch_resource
accepts only 3 args and just one res index. So obviously
we need to use zend_fetch_resource2 here.
|
| | |
|
| | |
|
| |
| |
| |
| | |
This avoids flushing in readonly mode upon close
|
| | |
|
| |
| |
| |
| | |
#if's for checking already)
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
* PHP-5.6:
Fix stream_select() issue with OpenSSL buffer
Conflicts:
main/streams/streams.c
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Ensure data from OpenSSL internal buffer has been
transfered to PHP stream buffer before a select()
emulation operation is performed
Addresses bug #65137
https://bugs.php.net/bug.php?id=65137
Conflicts:
ext/openssl/xp_ssl.c
|
| | |
|
| |
| |
| |
| | |
reallocations and improve string reuse.
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* origin/master:
made the apache ini holders to be zend_bool
Removed useless local variable
Use simpler functions
Fixed test
small fixes to UPGRADING
Reorder to save alignment size (of course, only for common used structs)
|
| | | |
|
| | | |
|
|/ / |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
* PHP-5.6:
removing the NEWS entry as we had to revert this fix for now
Revert "Merge branch 'PHP-5.5' into PHP-5.6"
Revert "fix TS build"
Revert "Merge branch 'PHP-5.4' into PHP-5.5"
Revert "Bug #67965: Fix blocking behavior in non-blocking crypto streams"
Revert "Bug #41631: Fix regression from first attempt (6569db8)"
|
| |
| |
| |
| |
| | |
This reverts commit 30a73658c63a91c413305a4c4d49882fda4dab3e, reversing
changes made to 7fac56e0729385bbd2bb040f06a20a697d9de5fd.
|
| | |
|
| |
| |
| |
| | |
This reverts commit 25f5ba94aca1e89ee5f0c66513e58826afa3b853.
|
| |
| |
| |
| | |
Since now PHP's printf-like functions have many custom specifiers, the amount of false-positives wasnt worth it
|
|\ \
| |/
| |
| |
| | |
* PHP-5.6:
Fix stream_select() issue with OpenSSL buffer
|
| |\
| | |
| | |
| | |
| | | |
* PHP-5.5:
Fix stream_select() issue with OpenSSL buffer
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* PHP-5.4:
Fix stream_select() issue with OpenSSL buffer
Conflicts:
ext/openssl/xp_ssl.c
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Ensure data from OpenSSL internal buffer has been
transfered to PHP stream buffer before a select()
emulation operation is performed
Addresses bug #65137
https://bugs.php.net/bug.php?id=65137
Conflicts:
ext/openssl/xp_ssl.c
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
Fixed ext/standard/tests/streams/bug61115.phpt
|
| | | | |
|