Commit Graph

1638 Commits

Author SHA1 Message Date
Anatol Belski
c20ae623c2 Merge branch 'PHP-7.1'
* PHP-7.1:
  sync with the incremental and inter-file analysis option
2017-03-07 15:31:54 +01:00
Anatol Belski
b8f75e75f6 sync with the incremental and inter-file analysis option
available as of cppcheck 1.77
2017-03-07 15:27:57 +01:00
Anatol Belski
7aa0632cfb extend ccppcheck defs 2017-03-07 01:29:45 +01:00
Anatol Belski
ffcdb2be16 Merge branch 'PHP-7.1'
* PHP-7.1:
  Support run or test target invoked within debugger
2017-02-24 19:43:26 +01:00
Anatol Belski
0ceedea2cc Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Support run or test target invoked within debugger
2017-02-24 19:41:30 +01:00
Anatol Belski
9450e23b32 Support run or test target invoked within debugger
Useful, as it gets all the environment produced by the makefile. For the
test target, it might make sense to have the child process debug plugin
for VS installed.
2017-02-24 19:37:16 +01:00
Anatol Belski
41d2944b0a more appropriate var name 2017-02-21 14:37:42 +01:00
Anatol Belski
42a8f0755c add folds 2017-02-21 14:36:06 +01:00
Anatol Belski
0d529d6eb3 The d_name member of struct dirent should be a pointer
Rework for 60950702, so then any encoding is supported. The path
segment length is measured in wchar_t size, whereby the number
of wchar_t is 255+\0. This means, in the actual encoding, the path
segment size can become (255*<bytes per glyph>)+\0 bytes in worst
case. It is still valid, as all the FS API uses wide chars
internally.
2017-02-12 22:23:51 +01:00
Anatol Belski
7b9f93b3f9 remove loop
The limit is big enough, and it's questionable such amount of
random data can ever make sense anyway.
2017-02-12 19:25:23 +01:00
Anatol Belski
97d620449c fix loop 2017-02-12 19:15:40 +01:00
Anatol Belski
d53d0a5dc4 refactor php_win32_get_random_bytes(), take 2
As in previous variant, locking is removed and the initialization
is done only once at process start. The CNG API turns out to be
faster, also the initialization is less resources hungry. The
initialization part could need to be improved, if too much startup
failures are sighted in the real world usage. Though that would mean
having locking back.

The usage of CNG was already pointed out and requested in several
reports, with the further refactoring it appears to make sense and
simplify things a backward compatible way.
2017-02-12 17:47:14 +01:00
Anatol Belski
048aec4796 Revert "refactor php_win32_get_random_bytes()"
This reverts commit 23bd7bcde0.

Looks like this change is unstable. If same CSP is use but multiple processers,
the initialization failures are possible. Thus, CryptAcquireContext in
every process, even if it won't be used at all, is not sensible. This
might actually motivate to look for better CSP APIs.
2017-02-11 21:47:09 +01:00
Anatol Belski
23bd7bcde0 refactor php_win32_get_random_bytes()
- avoid locking
- initialize only once
- the process will fail, if no init failed
2017-02-11 19:15:35 +01:00
Anatol Belski
02991f75ce Revert "move winsock specific stuff into dllmain"
This reverts commit d94c2c796a.

WSA functions are documented explicitly as unsafe for dllmain
2017-02-11 18:55:32 +01:00
Anatol Belski
d94c2c796a move winsock specific stuff into dllmain 2017-02-11 16:46:17 +01:00
Anatol Belski
cefa8ddcc9 Merge branch 'PHP-7.1'
* PHP-7.1:
  add missing datatype as sync for 5113909
2017-02-11 14:53:20 +01:00
Anatol Belski
bf2627e58c add missing datatype as sync for 5113909 2017-02-11 14:51:15 +01:00
Anatol Belski
fa0df0cdc5 Merge branch 'PHP-7.1'
* PHP-7.1:
  fix possible NULL dereference
2017-02-01 13:46:50 +01:00
Anatol Belski
ba358c5695 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix possible NULL dereference
2017-02-01 13:45:45 +01:00
Anatol Belski
8dfa428ccd fix possible NULL dereference 2017-02-01 13:43:33 +01:00
Anatol Belski
df85e1fffd Merge branch 'PHP-7.1'
* PHP-7.1:
  remove unused var
  use zend_string API
  Fixed bug #74005 mail.add_x_header causes RFC-breaking lone line feed
2017-02-01 12:58:47 +01:00
Anatol Belski
5a7fe51235 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  remove unused var
  use zend_string API
  Fixed bug #74005 mail.add_x_header causes RFC-breaking lone line feed
2017-02-01 12:57:02 +01:00
Anatol Belski
15404bda13 remove unused var 2017-02-01 12:49:32 +01:00
Anatol Belski
2cd0d8b711 use zend_string API 2017-02-01 12:45:19 +01:00
Anatol Belski
ec43a11581 Fixed bug #74005 mail.add_x_header causes RFC-breaking lone line feed 2017-02-01 12:36:14 +01:00
Anatol Belski
5a9742e34b Merge branch 'PHP-7.1'
* PHP-7.1:
  add a primitive debug facility to sendmail
2017-01-31 18:29:47 +01:00
Anatol Belski
d5f00717bf Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  add a primitive debug facility to sendmail
2017-01-31 18:28:29 +01:00
Anatol Belski
163bb87897 add a primitive debug facility to sendmail 2017-01-31 18:25:36 +01:00
Brian Evans
2fe9208ee3
Use modern autotools name of configure.ac instead of configure.in
configure.ac was introduced in 2001 with automake-1.15 and autoconf-2.50
to replace the file named configure.in.
Autotools is preparing to remove configure.in in Automake 2.0.
All new software should be using configure.ac.
This also fixes Bug #69770 where extensions are creating configure.in

Signed-off-by: Brian Evans <grknight@gentoo.org>
2017-01-27 06:07:40 +00:00
Anatol Belski
e7166d1708 Merge branch 'PHP-7.1'
* PHP-7.1:
  dirname() should not normalize paths
2017-01-24 18:00:08 +01:00
Anatol Belski
ec78507bd4 dirname() should not normalize paths
This is the BC piece with the case where dirname() is used with an URL.
2017-01-24 17:56:00 +01:00
Anatol Belski
609507024f preliminary fix for bug #73971, more refactoring is needed 2017-01-22 22:43:53 +01:00
Anatol Belski
411c5fbcbf Merge branch 'PHP-7.1'
* PHP-7.1:
  improve and generalize the recognition of a cli sapi
2017-01-09 00:01:19 +01:00
Anatol Belski
d454730407 improve and generalize the recognition of a cli sapi 2017-01-08 23:54:58 +01:00
Anatol Belski
97ac819c2b Merge branch 'PHP-7.1'
* PHP-7.1:
  move various places to the centralized OpenSSL setup routine
  use the new API for opaque symbol in OpenSSL 1.1.x
  implement basic config support for OpenSSL 1.1.x
2017-01-08 00:39:53 +01:00
Anatol Belski
df1e1fdcb9 implement basic config support for OpenSSL 1.1.x 2017-01-08 00:25:46 +01:00
Anatol Belski
3aece4629b Merge branch 'PHP-7.1'
* PHP-7.1:
  /guard is also a security flag
2017-01-07 02:49:44 +01:00
Anatol Belski
22ed374c9a Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  /guard is also a security flag
2017-01-07 02:48:14 +01:00
Anatol Belski
f98d8f6c15 /guard is also a security flag 2017-01-07 02:25:00 +01:00
Sammy Kaye Powers
dac6c639bb Update copyright headers to 2017 2017-01-04 11:23:42 -06:00
Sammy Kaye Powers
478f119ab9 Update copyright headers to 2017 2017-01-04 11:14:55 -06:00
Anatol Belski
797e119682 fix open flags 2017-01-04 12:18:54 +01:00
Joe Watkins
c8aa6f3a9a
Merge branch 'pull-request/2268'
* pull-request/2268:
  Update copyright headers to 2017
2017-01-04 10:00:53 +00:00
Anatol Belski
6e93c1849e make possible to pass also an arbitrary fragment file 2017-01-03 22:10:24 +01:00
Anatol Belski
76654152ee fix var name 2017-01-03 17:59:56 +01:00
Anatol Belski
defd45adc2 implement makefile fragment support for nmake 2017-01-03 17:48:44 +01:00
Sammy Kaye Powers
9e29f841ce Update copyright headers to 2017 2017-01-02 09:30:12 -06: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