Merge branch 'master' of https://git.php.net/repository/php-src
# By Michael Wallner (18) and others
# Via David Soria Parra (8) and others
* 'master' of https://git.php.net/repository/php-src: (37 commits)
better way to fix PRIu64 availability on windows
Revert "EmptyIterator now implements Countable; fixes bug 60577"
RFC 6598 reserved ip range starts at 100.64.0.0
fix a very rare case of use of uninitialized value combined with a memleak
fix test concurrency
fix test concurrency
fix test concurrency
fix test concurrency
fix test concurrency
fix build - PRIu64 vs %I64u
final bits
we need to use the full stream wrapper for filters
let the libsqlite3 symbols be exported in dll
NEWS/UPGRADING{,.INTERNALS} notes about temp POST stream
Exclude bison 3.0 by Mike
NEWS for added reserved ip addresses according to RFC 6598
Add RFC 6598 IPs to reserved addresses
upload2G note
NEWS for #60577
NEWS for bug #64441
...
Michael Wallner [Tue, 17 Sep 2013 08:50:49 +0000 (10:50 +0200)]
Merge branch 'slim-postdata'
* slim-postdata:
slim post data
add NEWS entry; add simple test
more precise condition
make this work in vc11 too
Use int64_t and atoll() after discussion with johannes
ws
Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files above 2G.
Merge branch 'master' of https://git.php.net/repository/php-src
# By Michael Wallner (3) and others
# Via Michael Wallner (2) and Xinchen Hui (2)
* 'master' of https://git.php.net/repository/php-src:
use 65k of data to get a more explicit result
double test timeout for travis
this test is fragile on travis, let's see why
Add test for ISSUE #128
Fixed bug #65665 (Exception not properly caught when opcache enabled)
Save a TSRMLS_FETCH() for zval_ptr_dtor in executor
Merge branch 'master' of https://git.php.net/repository/php-src
# By Nikita Popov (10) and others
# Via Nikita Popov (6) and others
* 'master' of https://git.php.net/repository/php-src: (26 commits)
Remove some more unnecessary macros from phar
Remove PHAR_(Z)STR* usages
Remove version checks in phar
Fix two warnings
Provide more macros for handling of interned strings
Make use of Z_*VAL and ZVAL_* in language scanner
Make consistent use of Z_*VAL macros in compiler
fix broken sha2 configure tests
fix broken sha2 configure tests
Small cleanup in class name resolution of compiler
Fixed minor bug in test.
Move NEWS entries to correct version
Fix bug #64782: SplFileObject constructor make $context optional
Prepare pdo_firebird for a pecl release also
Fix bug #65502: DateTimeImmutable::createFromFormat returns DateTime
Fix bug #65548: Comparison for DateTimeImmutable doesn't work
Sort the NEWS file alphabetically.
Request non-keep-alive connections by default in HTTP 1.1 requests.
Allow CURLOPT_FOLLOWLOCATION to be used with open_basedir.
Tinker with the wording of the short_open_tag description.
...
Provide more macros for handling of interned strings
* str_erealloc behaves like erealloc for normal strings, but will
use emalloc+memcpy for interned strings.
* str_estrndup behaves like estrndup for normal strings, but will
not copy interned strings.
* str_strndup behaves like zend_strndup for normal strings, but
will not copy interned strings.
* str_efree_rel behaves like efree_rel for normal strings, but
will not free interned strings.
* str_hash will return INTERNED_HASH for interned strings and
compute it using zend_hash_func for normal strings.
Small cleanup in class name resolution of compiler
* The fetch_type and check_ns_name parameters of
zend_resolve_class_name were unused and are now removed.
* ZEND_FETCH_CLASS_GLOBAL is no longer used (no code actually
checking for it).
* The checks for usage of "namespace" as class name were
unnecessary as that situation can't occur anyways.
Adam Harvey [Wed, 11 Sep 2013 21:11:29 +0000 (14:11 -0700)]
Request non-keep-alive connections by default in HTTP 1.1 requests.
As noted in FR #65634, at present we don't send a Connection request header
when the protocol version is set to 1.1, which means that RFC-compliant Web
servers should respond with keep-alive connections. Since there's no way of
reusing the HTTP connection at present, this simply means that PHP will appear
to hang until the remote server hits its connection timeout, which may be quite
some time.
This commit sends a "Connection: close" header by default when HTTP 1.1 (or
later) is requested by the user via the context options. It can be overridden
by specifying a Connection header in the context options. It isn't possible to
disable sending of the Connection header, but given "Connection: keep-alive" is
the same as the default HTTP 1.1 behaviour, I don't see this as a significant
issue — users who want to opt in for that still can.
As a note, although I've removed an efree(protocol_version), this doesn't
result in a memory leak: protocol_version is freed in the out: block at the end
of the function anyway, and there are no returns between the removed efree()
and the later call. Yes, I ran the tests with valgrind to check that. ☺
Implements FR #65634 (HTTP wrapper is very slow with protocol_version 1.1).
Adam Harvey [Tue, 10 Sep 2013 18:42:42 +0000 (11:42 -0700)]
Allow CURLOPT_FOLLOWLOCATION to be used with open_basedir.
Newer versions of libcurl prevent file:// location response headers by default,
which means that the open_basedir check is unnecessary — the fact
CURLOPT_REDIR_PROTOCOLS can't set CURLPROTO_FILE with open_basedir enabled
means that there's no possibility of breaching the open_basedir restriction,
and this allows HTTP redirects to be followed automatically.
Implements FR #65646 (re-enable CURLOPT_FOLLOWLOCATION with open_basedir or
safe_mode).
Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
Remove obsolete flag
Update DTrace probes
Add test for oci_set_* error changes
Make oci_set_*($connection,...) errors retrievable via oci_error($connection). Improve some error handling to produce error text on some rare edge cases. Disambiguate the Oracle library function call return status values from ORA error numbers. Review and unify error data types.
Make oci_set_*($connection,...) errors retrievable via oci_error($connection).
Improve some error handling to produce error text on some rare edge cases.
Disambiguate the Oracle library function call return status values from ORA error numbers.
Review and unify error data types.
projects / php / log