]>
granicus.if.org Git - php/log
Côme Bernigaud [Mon, 6 Jul 2015 12:28:01 +0000 (14:28 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Updated README, added test to create LDAP base if missing and ease tests
Anatol Belski [Mon, 6 Jul 2015 12:27:17 +0000 (14:27 +0200)]
update NEWS about #69900
backport for 5.6 to go
Côme Bernigaud [Mon, 6 Jul 2015 12:26:49 +0000 (14:26 +0200)]
Updated README, added test to create LDAP base if missing and ease tests
Dmitry Stogov [Mon, 6 Jul 2015 09:28:14 +0000 (12:28 +0300)]
Fixed test (shift operators throw Error)
Dmitry Stogov [Mon, 6 Jul 2015 08:25:19 +0000 (11:25 +0300)]
Fixed return value
Xinchen Hui [Mon, 6 Jul 2015 07:36:55 +0000 (15:36 +0800)]
Merge branch 'signed_char' of https://github.com/antonblanchard/php-src
Xinchen Hui [Mon, 6 Jul 2015 07:24:51 +0000 (15:24 +0800)]
Reorder the conditions
Xinchen Hui [Mon, 6 Jul 2015 07:22:40 +0000 (15:22 +0800)]
Fixed segfault while with generating ext info
Anton Blanchard [Sun, 5 Jul 2015 23:41:09 +0000 (09:41 +1000)]
http parser code assumes char is signed
A char can be either signed or unsigned, and on PowerPC and ARM it is
unsigned. The following code will always be false on these architectures:
if (c == -1) goto error;
Anatol Belski [Sun, 5 Jul 2015 18:18:17 +0000 (20:18 +0200)]
bring back the division by zero warning
Stanislav Malyshev [Sun, 5 Jul 2015 08:24:35 +0000 (01:24 -0700)]
Merge branch 'pull-request/1368'
* pull-request/1368:
moved function warning test to money_format_error.phpt file
Stanislav Malyshev [Sun, 5 Jul 2015 08:10:29 +0000 (01:10 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Cleaned white spaces in PHP_INI definition of phar
Dominic [Fri, 19 Jun 2015 10:31:03 +0000 (12:31 +0200)]
Cleaned white spaces in PHP_INI definition of phar
Removes unnecessary white spaces.
Stanislav Malyshev [Sun, 5 Jul 2015 08:04:22 +0000 (01:04 -0700)]
Merge branch 'pull-request/1351'
* pull-request/1351:
Cleaned white spaces in PHP_INI definition of phar
Stanislav Malyshev [Sun, 5 Jul 2015 08:01:27 +0000 (01:01 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix typo, see #68476
Stanislav Malyshev [Sun, 5 Jul 2015 08:01:00 +0000 (01:01 -0700)]
Merge branch 'pull-request/1324' into PHP-5.6
* pull-request/1324:
fix typo, see #68476
Bob Weinand [Sun, 5 Jul 2015 00:00:38 +0000 (02:00 +0200)]
Fix use after free with opcache (interned strings)
Kalle Sommer Nielsen [Sat, 4 Jul 2015 19:21:15 +0000 (21:21 +0200)]
This macro check is not needed (Anatol)
Kalle Sommer Nielsen [Sat, 4 Jul 2015 16:55:22 +0000 (18:55 +0200)]
Replace references to PHP_WIN32 and TSRM_WIN32 with ZEND_WIN32 in Zend/, this also fixes 1 instance of where fflush(stderr) was misplaced (zend_extensions.c)
Xinchen Hui [Sat, 4 Jul 2015 03:05:50 +0000 (11:05 +0800)]
Fixed bug #69983 (get_browser fails with user agent of null)
Aaron Piotrowski [Fri, 3 Jul 2015 22:28:11 +0000 (17:28 -0500)]
Switch code on thrown Errors to 0, update related tests
Aaron Piotrowski [Fri, 3 Jul 2015 21:47:16 +0000 (16:47 -0500)]
Remove E_EXCEPTION
Aaron Piotrowski [Fri, 3 Jul 2015 21:21:02 +0000 (16:21 -0500)]
Switch macro with __VA_ARGS__ to function
Aaron Piotrowski [Fri, 3 Jul 2015 21:04:33 +0000 (16:04 -0500)]
Remove need to pass error level
Aaron Piotrowski [Fri, 3 Jul 2015 18:41:17 +0000 (13:41 -0500)]
Enable throwing custom exceptions from errors
Nikita Popov [Fri, 3 Jul 2015 16:32:09 +0000 (18:32 +0200)]
Always report object leaks
Previously cycles were excluded from leak reports, however the
situation here has improved a lot in the meantime and we can
report all leaks.
Nikita Popov [Fri, 3 Jul 2015 16:38:12 +0000 (18:38 +0200)]
Don't leak generator cycle in ReflectionGenerator test
This is tracked by bug #69989.
Aaron Piotrowski [Fri, 3 Jul 2015 14:45:03 +0000 (09:45 -0500)]
Switch position of ce in exception ce variable names
Aaron Piotrowski [Fri, 3 Jul 2015 14:44:48 +0000 (09:44 -0500)]
Change zend_exception_get_default() to zend_exception_ce
Aaron Piotrowski [Fri, 3 Jul 2015 01:57:53 +0000 (20:57 -0500)]
Cleanup exception ce API
Removed recently added functions to get Error ce's and marked the old functions
fetching default_exception_ce and error_exception_ce as deprecated.
Anatol Belski [Fri, 3 Jul 2015 14:22:01 +0000 (16:22 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix backport mistake
Anatol Belski [Fri, 3 Jul 2015 14:21:02 +0000 (16:21 +0200)]
fix backport mistake
in 5.6 it has to be explicitly copied to avoid double free
Christoph M. Becker [Fri, 3 Jul 2015 11:32:05 +0000 (13:32 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fixed fix #69975 wrt. ODBCVER < 0x0300
Christoph M. Becker [Fri, 3 Jul 2015 11:30:39 +0000 (13:30 +0200)]
fixed fix #69975 wrt. ODBCVER < 0x0300
Anatol Belski [Fri, 3 Jul 2015 10:45:59 +0000 (12:45 +0200)]
improve info about the applink
Anatol Belski [Fri, 3 Jul 2015 10:40:18 +0000 (12:40 +0200)]
added openssl applink shim note to UPGRADING.INTERNALS
Anatol Belski [Fri, 3 Jul 2015 09:46:30 +0000 (11:46 +0200)]
add missing item in the content table
Anatol Belski [Fri, 3 Jul 2015 09:17:16 +0000 (11:17 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
backport
c01943bffc8b719e552d307f522820d50f783a4c into 5.6
Anatol Belski [Fri, 3 Jul 2015 09:16:02 +0000 (11:16 +0200)]
Anatol Belski [Fri, 3 Jul 2015 08:15:52 +0000 (10:15 +0200)]
fix improper behavior
openssl_spki_export() is documented to return string, but it's
obviously not achieved writing it to stdout :)
Anatol Belski [Fri, 3 Jul 2015 05:10:46 +0000 (07:10 +0200)]
integrate the applink shim in the other bins
Anatol Belski [Thu, 2 Jul 2015 17:49:40 +0000 (19:49 +0200)]
integrate the openssl applink shim
This fixes ext/openssl/tests/openssl_spki_export.phpt failing
with the no OPENSSL_Applink error. Applink is also an interesting
technique documented in the OpenSSL FAQ
https://www.openssl.org/support/faq.html#PROG2
which allows under circumstances using different OpenSSL binaries
than those a program was linked with.
Xinchen Hui [Fri, 3 Jul 2015 03:18:53 +0000 (11:18 +0800)]
Catch the specifical exception
Christoph M. Becker [Fri, 3 Jul 2015 01:12:09 +0000 (03:12 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Added more tests to improve function coverage
Edgar R. Sandi [Tue, 30 Jun 2015 01:02:19 +0000 (22:02 -0300)]
Added more tests to improve function coverage
Aaron Piotrowski [Thu, 2 Jul 2015 22:46:51 +0000 (17:46 -0500)]
Allow integer default for float type
Christoph M. Becker [Thu, 2 Jul 2015 22:29:44 +0000 (00:29 +0200)]
updated NEWS
Christoph M. Becker [Thu, 2 Jul 2015 22:25:03 +0000 (00:25 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
updated NEWS
Fix #69975: PHP segfaults when accessing nvarchar(max) defined columns
Christoph M. Becker [Thu, 2 Jul 2015 22:23:44 +0000 (00:23 +0200)]
updated NEWS
Christoph M. Becker [Thu, 2 Jul 2015 22:04:50 +0000 (00:04 +0200)]
Fix #69975: PHP segfaults when accessing nvarchar(max) defined columns
The SQL Server Native Client 11.0 and maybe other ODBC drivers report
NVARCHAR(MAX) columns as SQL_WVARCHAR with size 0. This causes too small a
buffer to be emalloc'd, likely causing a segfault in the following. As we don't
know the real size of the column data, we treat such colums as
SQL_WLONGVARCHAR.
The related bug #67437 suggests that some drivers report a size of ~4GB. It is
not certain that this is really the case (there might be some integer overflow
involved, and anyway, there has been no feedback), so we do not cater for this
now. However, it would not be hard to treat all sizes above a certain threshold
in a similar way, i.e. as SQL_WLONGVARCHAR.
Bob Weinand [Thu, 2 Jul 2015 19:19:26 +0000 (21:19 +0200)]
Update NEWS for bug #69957
Niklas Keller [Thu, 2 Jul 2015 18:34:49 +0000 (20:34 +0200)]
Correct type hint name for booleans in method signatures
Bob Weinand [Thu, 2 Jul 2015 18:49:30 +0000 (20:49 +0200)]
XFAILED tests are not "You may have found a problem in PHP"
Bob Weinand [Thu, 2 Jul 2015 18:47:44 +0000 (20:47 +0200)]
Introduce ArithmeticError
Dmitry Stogov [Thu, 2 Jul 2015 17:29:06 +0000 (20:29 +0300)]
Cleanup (avoid reallocation)
Dmitry Stogov [Thu, 2 Jul 2015 16:09:37 +0000 (19:09 +0300)]
Cleanup (avoid reallocation)
Dmitry Stogov [Thu, 2 Jul 2015 15:58:04 +0000 (18:58 +0300)]
Cleanup (avoid reallocations)
Dmitry Stogov [Thu, 2 Jul 2015 15:50:54 +0000 (18:50 +0300)]
Cleanup (avoid reallocation)
Anatol Belski [Thu, 2 Jul 2015 14:34:42 +0000 (16:34 +0200)]
add missing items to the table of contents
Anatol Belski [Thu, 2 Jul 2015 14:32:57 +0000 (16:32 +0200)]
update UPGRADING infos
Anatol Belski [Thu, 2 Jul 2015 13:19:38 +0000 (15:19 +0200)]
fix pipe peek timeout
Christoph M. Becker [Thu, 2 Jul 2015 10:16:41 +0000 (12:16 +0200)]
Fix alignment on 32-bit
Christoph M. Becker [Thu, 2 Jul 2015 08:51:26 +0000 (10:51 +0200)]
improve timings evaluations in test
Anatol Belski [Wed, 1 Jul 2015 18:06:48 +0000 (20:06 +0200)]
use proper place to cleanup
Anatol Belski [Wed, 1 Jul 2015 08:23:57 +0000 (10:23 +0200)]
fix test for systems with lower time resolution
Anatol Belski [Tue, 30 Jun 2015 17:53:48 +0000 (19:53 +0200)]
remove stderr descriptor
Anatol Belski [Tue, 30 Jun 2015 17:25:14 +0000 (19:25 +0200)]
no need to fflush here
Anatol Belski [Tue, 30 Jun 2015 17:22:17 +0000 (19:22 +0200)]
added test for bug #69900
Anatol Belski [Tue, 30 Jun 2015 16:07:16 +0000 (18:07 +0200)]
select the case to set the pipe blocking option more precisely
Anatol Belski [Tue, 30 Jun 2015 16:05:41 +0000 (18:05 +0200)]
fixed wrong number for the new option
Anatol Belski [Tue, 30 Jun 2015 15:37:38 +0000 (17:37 +0200)]
fix c/p issue
Anatol Belski [Tue, 30 Jun 2015 15:21:21 +0000 (17:21 +0200)]
properly set the pipe blocking option
Anatol Belski [Tue, 30 Jun 2015 13:57:49 +0000 (15:57 +0200)]
add missing stuff is the header
Anatol Belski [Tue, 30 Jun 2015 13:47:25 +0000 (15:47 +0200)]
initial stuff to make allow blocking pipes on windows
Xinchen Hui [Thu, 2 Jul 2015 11:02:49 +0000 (19:02 +0800)]
Fixed conditional jump or move depends on uninitialised value(s)
==11551== at 0x57CB23C: xpmParseData (parse.c:702)
Xinchen Hui [Thu, 2 Jul 2015 10:43:06 +0000 (18:43 +0800)]
Fixed bug #69521 (Segfault in gc_collect_cycles()).
Xinchen Hui [Thu, 2 Jul 2015 04:31:26 +0000 (12:31 +0800)]
Use hash_str directly
Xinchen Hui [Thu, 2 Jul 2015 04:23:50 +0000 (12:23 +0800)]
Same here
Xinchen Hui [Thu, 2 Jul 2015 04:19:55 +0000 (12:19 +0800)]
Use one_char_string
Xinchen Hui [Thu, 2 Jul 2015 04:18:23 +0000 (12:18 +0800)]
Use one_char_string
Xinchen Hui [Thu, 2 Jul 2015 04:04:14 +0000 (12:04 +0800)]
Use zend_string in setcookie (save value reallocated)
Xinchen Hui [Thu, 2 Jul 2015 03:44:28 +0000 (11:44 +0800)]
Unnecessary duplication
Xinchen Hui [Thu, 2 Jul 2015 03:04:24 +0000 (11:04 +0800)]
This can not be true
Bob Weinand [Thu, 2 Jul 2015 00:04:16 +0000 (02:04 +0200)]
CT eval ZEND_DIV in all cases (warning was removed)
Bob Weinand [Wed, 1 Jul 2015 23:54:08 +0000 (01:54 +0200)]
Use DivisionByZeroError instead of exception for %/intdiv()
Bob Weinand [Wed, 1 Jul 2015 22:32:46 +0000 (00:32 +0200)]
Remove warning upon division by zero
Dmitry Stogov [Wed, 1 Jul 2015 23:00:34 +0000 (02:00 +0300)]
Fixed memory leak because of incorrect 'if ();' optimization
Christoph M. Becker [Wed, 1 Jul 2015 21:50:12 +0000 (23:50 +0200)]
updated NEWS
Christoph M. Becker [Wed, 1 Jul 2015 21:45:52 +0000 (23:45 +0200)]
Fix #69976: Unable to parse "all" urls with colon char
If a colon occurs in a query string or fragment of a partial URL without
scheme, parse_url() tries to regard it as port separator. If up to 5 digits
follow and then a slash or the end of the string, parse_url() fails.
We're fixing this by checking whether the colon is part of the query string or
the fragment, under the assumption that question marks and hash signs are only
allowed as separators of query string and fragments, respectively, what is
guarenteed for URIs (RFC 3986), but not necessarily for URLs (RFC 1738) where
question marks are allowed for usernames and passwords.
Anyhow, this constitutes a minor BC, so the fix is applied to master only.
Dmitry Stogov [Wed, 1 Jul 2015 19:18:40 +0000 (22:18 +0300)]
Cleanup (removed dead code)
Dmitry Stogov [Wed, 1 Jul 2015 19:17:55 +0000 (22:17 +0300)]
Cleanup (avoid reallocation)
Dmitry Stogov [Wed, 1 Jul 2015 19:17:08 +0000 (22:17 +0300)]
Cleanup (avoid reallocation)
Dmitry Stogov [Wed, 1 Jul 2015 16:04:18 +0000 (19:04 +0300)]
Cleanup (avoid reallocatios and side effects in php_strip_tags)
Dmitry Stogov [Wed, 1 Jul 2015 15:23:06 +0000 (18:23 +0300)]
Fixed broken name
Dmitry Stogov [Wed, 1 Jul 2015 14:32:04 +0000 (17:32 +0300)]
Cleanup (updated comments)
Dmitry Stogov [Wed, 1 Jul 2015 14:30:00 +0000 (17:30 +0300)]
Cleanup (replce hack by a clean implementation)
Dmitry Stogov [Wed, 1 Jul 2015 14:07:57 +0000 (17:07 +0300)]
Cleanup (removed dead code)
Dmitry Stogov [Wed, 1 Jul 2015 14:01:42 +0000 (17:01 +0300)]
Cleanup (avoid duplication)
Dmitry Stogov [Wed, 1 Jul 2015 13:32:13 +0000 (16:32 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
change the inclusion order which fixes the vc build
Dmitry Stogov [Wed, 1 Jul 2015 13:31:20 +0000 (16:31 +0300)]
Cleanup (updated comments about optimization of comparison with IS_NULL)