Commit Graph

100771 Commits

Author SHA1 Message Date
Sara Golemon
77becd0865 Correct function protos in intl/idn 2016-12-27 22:52:26 -08:00
Sara Golemon
3e4b74dc9f Use zend_string in intl/idn 2016-12-27 22:47:16 -08:00
Sara Golemon
23b484cfe1 Simplify error path in intl/idn 2016-12-27 22:37:29 -08:00
Anatol Belski
f8aa57ab2f fix uninitialized value 2016-12-27 23:43:49 +01:00
Nikita Popov
1c85bef46b Merge branch 'PHP-7.1' 2016-12-27 22:22:14 +01:00
Nikita Popov
d82bd3696e Merge branch 'PHP-7.0' into PHP-7.1 2016-12-27 22:22:05 +01:00
Nikita Popov
f2f35a2b27 Disable AppVeyor fast_finish
As NTS and TS fail in different ways, we want to see both.
2016-12-27 22:20:40 +01:00
Graham Campbell
22f3695fe1 Fixed typo in "session_module_name" 2016-12-27 22:01:19 +01:00
Nikita Popov
1bf67622f8 Merge branch 'PHP-7.1' 2016-12-27 21:52:56 +01:00
Nikita Popov
937115f8c5 Merge branch 'PHP-7.0' into PHP-7.1 2016-12-27 21:52:33 +01:00
Mitch Hagstrand
2d51267c07 Makes the sapi web server and curl tests more reliable
1. Increased the time for the sapi/cli/tests/php_cli_server.inc to accept connections.
2. sapi/cli/tests/php_cli_server.inc has errors messages and a `stop` function.
3. bug67429.phpt uses the `stop` function to shutdown the webserver before starting a new one.
4. Removed ext/curl/tests/bug48203_multi-win32.phpt test now that ext/curl/tests/bug48203_multi.phpt
   runs on Windows also.
2016-12-27 21:52:05 +01:00
Mitch Hagstrand
92678d1a83 Fixes the curl tests to be more reliable in Travis CI
1. Increases the amount of time for the PHP built-in server to accept a connection
2. Outputs an error if the PHP built-in server fails
3. In bug48203_multi.phpt the test no longer starts and stops multiple PHP built-in servers
2016-12-27 21:52:05 +01:00
Anatol Belski
0d31433111 fork tests 2016-12-26 21:38:27 +01:00
dedal.qq
d9c4b49c8a New parsing parameters in curl 2016-12-26 11:03:25 -08:00
Barbu Paul - Gheorghe
e52d2b88e4 Reduce redundant storage of required number of parameters to required flag
The required field, until now, stored how many required parameters
the function, it belongs to, has. I think this is rather problematic
because it's a feature of the function to know how many required
parameters it has, not of the parameter itself. The parameter should
only say if it's required or optional (among other unrelated things).

Also storing the function's number of required parameters in every
parameter was redundant since the _zend_function structure already
has that information. And storing the same value (number of required
parameters) across multiple variables is inefficient and could lead
to inconsistencies.
2016-12-26 10:39:19 -08:00
Sara Golemon
0aaea39740 Merge branch 'PHP-7.1'
* PHP-7.1:
  Interpretation of curl_setopt values for boolean parameters
2016-12-25 22:33:11 -08:00
Sara Golemon
a49675faac Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Interpretation of curl_setopt values for boolean parameters
2016-12-25 22:33:03 -08:00
dedal.qq
7f29e7c678 Interpretation of curl_setopt values for boolean parameters 2016-12-25 22:32:49 -08:00
Sara Golemon
16758a3c66 Merge branch 'PHP-7.1'
* PHP-7.1:
  Remove extraneous parentheses in conditions
2016-12-25 22:18:27 -08:00
Sébastien Santoro
5d7c774bea Remove extraneous parentheses in conditions
The zend_vm_gen.php generator now checks if the condition is already
enclosed by parentheses, and them only if needed.

This fixes nine clang/llvm parentheses-equality warnings.
2016-12-25 22:17:46 -08:00
Sara Golemon
533737b4aa Merge branch 'PHP-7.1'
* PHP-7.1:
  Fixes #65689. PDO_Firebrid / exec() does not free allocated statement.
2016-12-25 22:07:29 -08:00
Sara Golemon
fcd4c34cb3 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixes #65689. PDO_Firebrid / exec() does not free allocated statement.
2016-12-25 22:07:09 -08:00
Dorin Marcoci
e926bf6507 Fixes #65689. PDO_Firebrid / exec() does not free allocated statement. 2016-12-25 22:06:20 -08:00
Yasuo Ohgaki
daa270b9da Fix tests for appveyor 2016-12-24 08:50:38 +09:00
Bob Weinand
1f474fddbb Merge branch 'PHP-7.1'
Also inline alpn_ctx in openssl_netstream_data (no need for the extra allocation there)
2016-12-22 23:40:24 +01:00
Bob Weinand
7b133e074c Merge branch 'PHP-7.0' into PHP-7.1 2016-12-22 23:34:51 +01:00
Bob Weinand
ac1372d811 Fix alpn_ctx leaking in openssl 2016-12-22 23:34:07 +01:00
Bob Weinand
712c532ab9 Merge branch 'PHP-7.1' 2016-12-22 15:31:58 +01:00
Bob Weinand
898e439333 Merge branch 'PHP-7.0' into PHP-7.1 2016-12-22 15:31:39 +01:00
Bob Weinand
8823b68c41 Fixed bug #73373 (deflate_add does not verify that output was not truncated) 2016-12-22 15:29:36 +01:00
Anatol Belski
758af77e9d Path handling related refactorings
Primarily related to the path handling datatypes, to avoid unnecessary
casts, where possible. Also some rework to avoid code dup. Probably
more places are to go, even not path related, primarily to have less
casts and unsigned integers where possible. That way, we've not only
less warnings and casts, but are also safer with regard to the
integer overflows. OFC it's not a panacea, but still significantly
reduces the vulnerability potential.
2016-12-22 14:56:47 +01:00
Anatol Belski
afb6ca2566 Finish remaining replacement uint => uint32_t
Tthe core should be normalized now, no uints anymore
2016-12-22 14:32:02 +01:00
Nikita Popov
ce97ead399 Merge branch 'PHP-7.1' 2016-12-22 12:47:50 +01:00
Nikita Popov
175b9f67f6 Merge branch 'PHP-7.0' into PHP-7.1 2016-12-22 12:47:29 +01:00
Sébastien Santoro
25c96f92f4 Fix IS_UNDEF comparisons in opcache
These conditions were formerly `!q->pData` and `!p->pData`, and should
now be detected as undefined variables, using the special type IS_UNDEF.

Incidentally, this syntax raised a logical-not-parentheses compiler
warning, now gone.
2016-12-22 12:46:14 +01:00
Anatol Belski
d5a3838c65 fix min supported versions 2016-12-22 12:40:58 +01:00
Yasuo Ohgaki
4899109e7b Update NEWS 2016-12-22 16:04:28 +09:00
Yasuo Ohgaki
a93a51c3bf Fix bug #73100 - Improve bug fix. Forbid to set 'user' save handler other than set_save_handler(). 2016-12-22 16:04:28 +09:00
Kalle Sommer Nielsen
d4831e2d0a Eliminate win95nt.h
- Most of this is builtin php.h now
- Removed some dead defines
- We now pass /D _USE_MATH_DEFINES for M_PI etc
2016-12-22 06:51:18 +01:00
Kalle Sommer Nielsen
a569d003e2 Hmm actually it seems to be the other way around, Anatol? 2016-12-22 05:53:13 +01:00
Kalle Sommer Nielsen
f0f3cb6ab5 Merge branch 'master' of git.php.net:php-src 2016-12-22 05:47:00 +01:00
Kalle Sommer Nielsen
34283026da Sync the default value of --with-odbcver with the hardcoded default for ODBCVER 2016-12-22 05:46:12 +01:00
Anatol Belski
837cce3b0b move the defs to the right place 2016-12-22 02:17:55 +01:00
Bob Weinand
5d7ce72747 Merge branch 'PHP-7.1' 2016-12-22 00:42:05 +01:00
Bob Weinand
728502fc29 Merge branch 'PHP-7.0' into PHP-7.1 2016-12-22 00:40:54 +01:00
Bob Weinand
3b2b080cbc Fixed bug #73704 (phpdbg shows the wrong line in files with shebang) 2016-12-22 00:39:24 +01:00
Nikita Popov
3df43437fe Merge branch 'PHP-7.1' 2016-12-21 22:12:17 +01:00
Nikita Popov
ed0602fe31 Fix string extension in negate_num_string
Forgot to actually assign the reallocated string...
2016-12-21 22:11:17 +01:00
Nikita Popov
114b526649 Merge branch 'PHP-7.1' 2016-12-21 21:28:36 +01:00
Nikita Popov
06699abffb Merge branch 'PHP-7.0' into PHP-7.1 2016-12-21 21:28:29 +01:00