1
0
mirror of https://github.com/php/php-src.git synced 2026-04-18 05:21:02 +02:00
Commit Graph

105598 Commits

Author SHA1 Message Date
Nikita Popov
a8db62086e Merge branch 'PHP-7.2' 2017-11-17 23:22:12 +01:00
Nikita Popov
31d9287d2b Merge branch 'PHP-7.1' into PHP-7.2 2017-11-17 23:22:07 +01:00
Nikita Popov
092d0922ea Merge branch 'PHP-7.0' into PHP-7.1 2017-11-17 23:21:48 +01:00
Nikita Popov
0e097f2c96 Fixed bug #75535
The sizeof()s for Content-Length and Transfer-Encoding were missing
the trailing ":". Apart from being generally wrong, this no longer
verified that the header actually contains a colon, leading to the
null http_header_value being used.

Additionally, in the interest of being defensive, also make sure
that http_header_value is non-null by setting it to the end of
the header line (effectively an empty string) if there is no colon.
If the following conditions are correct, this value is not going
to be used though.
2017-11-17 23:18:05 +01:00
Anatol Belski
80d6eb6806 Fix unsigned comparisons and remove dead code
Fix unsigned comparison

Cleanup never executed block

Fix unsigned comparison

Fix unsigned comparison, diff can't be < 0

Fix unsigned comparison

Fix unsigned comparison

Remove dead code
2017-11-17 22:38:44 +01:00
Nikita Popov
3ce1a977d4 Merge branch 'PHP-7.2' 2017-11-17 22:26:04 +01:00
Nikita Popov
1310234aa3 Fix printf format issues on i386 2017-11-17 22:25:03 +01:00
Anatol Belski
ad38168bdd Use log1p from the CRT 2017-11-17 21:22:51 +01:00
Anatol Belski
c7bf314b65 Fix unsigned comparison 2017-11-17 18:54:42 +01:00
Anatol Belski
80b926d24d Fix unsigned comparison 2017-11-17 18:53:37 +01:00
Anatol Belski
70427b1107 Keep the compile time condition for the label use 2017-11-17 18:46:57 +01:00
Anatol Belski
6e3cdf1dcc Remove unused assignment 2017-11-17 18:20:52 +01:00
Anatol Belski
24356e307c Fix condition 2017-11-17 18:19:32 +01:00
Anatol Belski
261ed5d2ec Merge branch 'PHP-7.2'
* PHP-7.2:
  Update SDK version for AppVeyor
2017-11-17 16:38:53 +01:00
Anatol Belski
d5a2ddab53 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Update SDK version for AppVeyor
2017-11-17 16:38:32 +01:00
Anatol Belski
61f5af6e05 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Update SDK version for AppVeyor
2017-11-17 16:37:40 +01:00
Anatol Belski
1ed08f9877 Update SDK version for AppVeyor 2017-11-17 16:37:00 +01:00
Dmitry Stogov
aa7bf41502 Use cheaper checks 2017-11-17 13:23:22 +03:00
Nikita Popov
9fbb019848 Move adjust_for_fetch_type directly after emission
And drop the distinction between compile_X and compile_X_common.
This avoids WTF moments like compile_simple_var_no_cv completely
ignoring the BP_VAR type passed to it...
2017-11-16 22:28:29 +01:00
Nikita Popov
d9da166649 Minor fetch type adjustment cleanup
No need to call adjust_fetch_type on FETCH_THIS, just to special
case it in adjust_fetch_type...
2017-11-16 22:13:07 +01:00
Nikita Popov
a164e91dfb Merge branch 'PHP-7.2' 2017-11-16 21:27:34 +01:00
Nikita Popov
95e9cc2871 Backport some printf() fixes to 7.2 2017-11-16 21:26:33 +01:00
Nikita Popov
26f8fc833b Enable and fix printf() format warnings
Add _unchecked() variants of zend_spprintf and zend_strpprintf for
cases where we specifically want to disable these checks, such as
use of %H.
2017-11-16 21:15:36 +01:00
Dmitry Stogov
b8a4225a5f Reverted incorrect changes to setlocale() 2017-11-16 18:10:28 +03:00
Dmitry Stogov
288c1dd6da Missed change 2017-11-16 18:10:15 +03:00
Dmitry Stogov
73bde7bbd0 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Fix (*NO_JIT) usage when JIT is enabled
  Refactor ASCII to wide conversion
2017-11-16 17:10:04 +03:00
Dmitry Stogov
ccc12b82da Avoid unnecessary reference-counting on strings. 2017-11-16 17:09:32 +03:00
Dmitry Stogov
ce18738a30 Removed "_" from API functions. 2017-11-16 17:09:01 +03:00
Anatol Belski
a370a6af64 Fix (*NO_JIT) usage when JIT is enabled
If (*NO_JIT) is put into the pattern, the JIT compilation will still
succeed but produce no code. The pattern will still have to be
interpreted and is not suitable for the JIT fast path. This means,
we still need to check the pattern info after JIT compilation and only
set the flags when the JIT code was produced.
2017-11-16 14:12:05 +01:00
Anatol Belski
acaaf4608a Refactor ASCII to wide conversion
- add SSE2 based ASCII check in 16 byte blocks
- use early return on fail
2017-11-16 12:57:11 +01:00
Nikita Popov
50eeb46e21 Merge branch 'PHP-7.2'
[ci skip]
2017-11-16 00:19:49 +01:00
Tyson Andre
9379b319b0 Fix typo in UPGRADING, should be oci_unregister_taf_callback
See de65a2243f which exposes
the unregister functionality.

[ci skip]
2017-11-16 00:19:36 +01:00
zimuyang
b304f3bc0e Remove duplicate check for already loaded extension 2017-11-16 00:16:15 +01:00
Nikita Popov
1e3f625aa5 Merge branch 'PHP-7.2' 2017-11-15 23:01:52 +01:00
Nikita Popov
6640e03df8 Merge branch 'PHP-7.1' into PHP-7.2 2017-11-15 23:01:25 +01:00
DanielCiochiu
dba5a798a2 Fixed #74862: Unable to clone instance when private __clone defined
Even though __clone was implemented as private and called only from
parent class, child extending class instance could not be cloned.
2017-11-15 23:00:26 +01:00
Anatol Belski
994dafc71c Merge branch 'PHP-7.2'
* PHP-7.2:
  [ci skip] update NEWS
2017-11-15 20:42:37 +01:00
Anatol Belski
97b046a608 [ci skip] update NEWS 2017-11-15 20:41:15 +01:00
Anatol Belski
ce85d0f24f Add missing ifdef 2017-11-15 20:21:40 +01:00
Anatol Belski
9acbab30cc Remove padding 2017-11-15 18:03:51 +01:00
Anatol Belski
721a669996 Merge branch 'PHP-7.2'
* PHP-7.2:
  Refine allocation
  NEWS
2017-11-15 18:03:20 +01:00
Anatol Belski
6f41ca4de1 Refine allocation
None of currently supported codepages would claim more than 5
bytes per a multibyte glyph, that's (255*5+1)kb, not 2kb anymore.
2017-11-15 18:02:01 +01:00
Anatol Belski
178add7a58 Unroll loop for ASCII check 2017-11-15 16:02:46 +01:00
Remi Collet
4764574910 NEWS 2017-11-15 15:35:21 +01:00
Anatol Belski
c6d0c8aa3b Merge branch 'PHP-7.2'
* PHP-7.2:
  Fix C++ compatibility for TSRM_TLS
2017-11-15 12:45:21 +01:00
Anatol Belski
0e5d4ea555 Fix C++ compatibility for TSRM_TLS
If a C++11 source is compiled, thread_local is preferred. Furthermore,
at least GCC treats __thread vs. thread_local a different way and under
certain circumstances would refuse to compile __thread is a C++11 source.
This change is far behind in time, any up-to-date compiler supports C++11
and otherwise it won't take effect on lower versions.
2017-11-15 12:44:04 +01:00
Dmitry Stogov
6bcace1b72 Use single memory pool for result metadata and result set. 2017-11-15 14:07:09 +03:00
Anatol Belski
a0724819c2 Merge branch 'PHP-7.2'
* PHP-7.2:
  Add missing var declarations for phpize mode
2017-11-15 12:02:09 +01:00
Anatol Belski
5b28218cc6 Add missing var declarations for phpize mode 2017-11-15 12:00:58 +01:00
Anatol Belski
0045ed1064 Merge branch 'PHP-7.2'
* PHP-7.2:
  Regenerate cp map
2017-11-15 11:24:56 +01:00