Commit Graph

2002 Commits

Author SHA1 Message Date
Anatol Belski
8ad4de887f Don't create plist files when using clang analyzer 2017-10-25 18:06:56 +02:00
Anatol Belski
bcad693468 Merge branch 'PHP-7.2'
* PHP-7.2:
  Fail hard when re2c is not found or the version requirement not met
  Fix mismatching alloc
2017-10-23 19:15:43 +02:00
Anatol Belski
734c1f3cd4 Fail hard when re2c is not found or the version requirement not met
With 7.2, the binary SDK supplies the minimal required version, thus no
reason to fail later at the compilation time.
2017-10-23 19:01:14 +02:00
Anatol Belski
620d3abfde Merge branch 'PHP-7.2'
* PHP-7.2:
  Fix re2c version detection
2017-10-10 13:00:38 +02:00
Anatol Belski
9c5a1dad64 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Fix re2c version detection
2017-10-10 13:00:26 +02:00
Anatol Belski
30f121f9bc Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix re2c version detection
2017-10-10 12:59:14 +02:00
Anatol Belski
d1fc9b425f Fix re2c version detection 2017-10-10 10:52:52 +02:00
Anatol Belski
0494d90fec Merge branch 'PHP-7.2'
* PHP-7.2:
  Fix ftok() multibyte path support
2017-10-09 13:15:17 +02:00
Anatol Belski
a51c542b53 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Fix ftok() multibyte path support
2017-10-09 13:13:51 +02:00
Anatol Belski
dc3b9fe619 Fix ftok() multibyte path support 2017-10-09 13:12:40 +02:00
Anatol Belski
eca3bc59b2 Merge branch 'PHP-7.2'
* PHP-7.2:
  Fix mkdir() special case for path length < 260 and > 248
2017-09-28 13:20:09 +02:00
Anatol Belski
4f63024206 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Fix mkdir() special case for path length < 260 and > 248
2017-09-28 13:19:48 +02:00
Anatol Belski
72c008f945 Fix mkdir() special case for path length < 260 and > 248 2017-09-28 13:18:31 +02:00
Anatol Belski
131abe715c Merge branch 'PHP-7.2'
* PHP-7.2:
  Update lib_versions.txt
2017-09-18 09:38:14 +02:00
Anatol Belski
de2f28ede1 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Update lib_versions.txt
2017-09-18 09:37:46 +02:00
Anatol Belski
e3e3d37fa9 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Update lib_versions.txt
2017-09-18 09:36:29 +02:00
Anatol Belski
7670590efd Update lib_versions.txt 2017-09-18 09:34:58 +02:00
Anatol Belski
658d8d9760 Merge branch 'PHP-7.2'
* PHP-7.2:
  Fix command
2017-09-02 16:59:12 +02:00
Anatol Belski
ecc8f3cf16 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Fix command
2017-09-02 16:58:58 +02:00
Anatol Belski
296d0826da Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix command
2017-09-02 16:58:44 +02:00
Anatol Belski
24da62d342 Fix command 2017-09-02 16:56:52 +02:00
Anatol Belski
708fb44207 Merge branch 'PHP-7.2'
* PHP-7.2:
  Yet one DLL to ignore
2017-09-01 10:39:10 +02:00
Anatol Belski
fb597a8123 Yet one DLL to ignore 2017-09-01 10:37:59 +02:00
Anatol Belski
4cb06b9327 Merge branch 'PHP-7.2'
* PHP-7.2:
  Make for exclusion per regex
2017-08-31 23:58:19 +02:00
Anatol Belski
8191b9790b Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Make for exclusion per regex
2017-08-31 23:57:58 +02:00
Anatol Belski
db78eff4c9 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Make for exclusion per regex
2017-08-31 23:57:36 +02:00
Anatol Belski
a86df6bcb0 Make for exclusion per regex 2017-08-31 23:56:42 +02:00
Anatol Belski
d4268e6eb5 Merge branch 'PHP-7.2'
* PHP-7.2:
  Extend ignore list for DLLs to not to look after
2017-08-31 20:56:25 +02:00
Anatol Belski
01171db15d Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Extend ignore list for DLLs to not to look after
2017-08-31 20:55:53 +02:00
Anatol Belski
965570541b Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Extend ignore list for DLLs to not to look after
2017-08-31 20:55:12 +02:00
Anatol Belski
6ec494016b Extend ignore list for DLLs to not to look after
fix typo
2017-08-31 20:54:11 +02:00
Anatol Belski
27644c1466 Merge branch 'PHP-7.2'
* PHP-7.2:
  Fix `nmake install` fails when there are no shared extensions
2017-08-31 20:34:41 +02:00
Anatol Belski
e7c1c86ceb Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Fix `nmake install` fails when there are no shared extensions
2017-08-31 20:34:03 +02:00
Anatol Belski
1f977d2377 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix `nmake install` fails when there are no shared extensions
2017-08-31 20:33:31 +02:00
Dylan K. Taylor
2e77f5eed3 Fix nmake install fails when there are no shared extensions
check for existence instead of muting everything

check for exe existence before trying to copy
2017-08-31 20:32:36 +02:00
Anatol Belski
1a116169e7 Merge branch 'PHP-7.2'
* PHP-7.2:
  Copy dependencies of the core DLL in `nmake snap` for statically-compiled extensions when packaging builds
2017-08-31 19:49:24 +02:00
Anatol Belski
7ebf2902e7 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Copy dependencies of the core DLL in `nmake snap` for statically-compiled extensions when packaging builds
2017-08-31 19:48:43 +02:00
Anatol Belski
020d3decb3 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Copy dependencies of the core DLL in `nmake snap` for statically-compiled extensions when packaging builds
2017-08-31 19:48:11 +02:00
Dylan K. Taylor
4e9c3e9396 Copy dependencies of the core DLL in nmake snap for statically-compiled extensions when packaging builds 2017-08-31 19:46:47 +02:00
Anatol Belski
0c85d155ae Merge branch 'PHP-7.2'
* PHP-7.2:
  update libs versions
2017-08-25 11:29:24 +02:00
Anatol Belski
bd823a076c Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  update libs versions
2017-08-25 11:29:12 +02:00
Anatol Belski
3641ba4332 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  update libs versions
2017-08-25 11:28:54 +02:00
Anatol Belski
55db2c31cd update libs versions 2017-08-25 11:28:12 +02:00
Anatol Belski
b1a8dcc001 Merge branch 'PHP-7.2'
* PHP-7.2:
  Switch to non deprecated PGO options
2017-08-24 17:15:36 +02:00
Anatol Belski
99ca99f079 Switch to non deprecated PGO options 2017-08-24 17:14:24 +02:00
Kalle Sommer Nielsen
672c98a456 Kill a compiler warning 2017-08-24 00:44:29 +02:00
Anatol Belski
1287c205a9 Correct default value in master 2017-08-21 19:38:44 +02:00
Anatol Belski
3351e3b477 Merge branch 'PHP-7.2'
* PHP-7.2:
  Correct default value
2017-08-21 19:38:17 +02:00
Anatol Belski
5b4b19981c Correct default value 2017-08-21 19:37:41 +02:00
Anatol Belski
e33259f310 Use wide char API for the event log 2017-08-19 17:08:43 +02:00
Anatol Belski
dda70e0106 Follow up on ed9c16ad5def47d1c8ae2787f53dccfac893ce5f
The event log is not line based, passing the message as is here is just
fine. Otherwise we'd create multiple event log items with partial
messages.
2017-08-19 13:51:44 +02:00
Philip Prindeville
a1f3a0105d Turn php_syslog() into wrapper for syslog and split lines 2017-08-19 13:51:44 +02:00
Anatol Belski
fb55ec36e3 Merge branch 'PHP-7.2'
* PHP-7.2:
  Fix .pgd name for ts build
2017-08-19 00:32:25 +02:00
Anatol Belski
f2ed8c1087 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Fix .pgd name for ts build
2017-08-19 00:32:11 +02:00
Anatol Belski
5ef63b6f0e Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix .pgd name for ts build
2017-08-19 00:31:55 +02:00
Anatol Belski
ba59b6f11b Fix .pgd name for ts build 2017-08-19 00:31:04 +02:00
Anatol Belski
3acfdbb27e Merge branch 'PHP-7.2'
* PHP-7.2:
  Fix phpize exit status
2017-08-18 12:06:28 +02:00
Anatol Belski
6c3c88074c Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Fix phpize exit status
2017-08-18 12:06:19 +02:00
Anatol Belski
4494ad6911 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix phpize exit status
2017-08-18 12:06:07 +02:00
Anatol Belski
065551bc9c Fix phpize exit status
Configure and others are generated, not copied. Seems there's yet much
more to do wrt exit status catching.
2017-08-18 11:54:56 +02:00
Anatol Belski
86bd6ab72c Merge branch 'PHP-7.2'
* PHP-7.2:
  Add dump env target
2017-08-18 11:10:31 +02:00
Anatol Belski
642983c59a Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Add dump env target
2017-08-18 11:10:18 +02:00
Anatol Belski
264271f69e Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Add dump env target
2017-08-18 11:09:59 +02:00
Anatol Belski
e7f4e67155 Add dump env target 2017-08-18 11:08:27 +02:00
Anatol Belski
4804d64fdb Merge branch 'PHP-7.2'
* PHP-7.2:
  Remove mistakingly added line
2017-08-08 19:40:53 +02:00
Anatol Belski
823ca5c697 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Remove mistakingly added line
2017-08-08 19:40:42 +02:00
Anatol Belski
42608a3401 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Remove mistakingly added line
2017-08-08 19:40:28 +02:00
Anatol Belski
afb20f4895 Remove mistakingly added line 2017-08-08 19:37:55 +02:00
Anatol Belski
cd5365c849 Merge branch 'PHP-7.2'
* PHP-7.2:
  Sync makefile options for phpize
2017-08-08 17:59:59 +02:00
Anatol Belski
e62db6309c Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Sync makefile options for phpize
2017-08-08 17:59:44 +02:00
Anatol Belski
315d3910fa Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Sync makefile options for phpize
2017-08-08 17:59:15 +02:00
Anatol Belski
075986f214 Sync makefile options for phpize
- run target
- debugger mode
2017-08-08 17:58:10 +02:00
Anatol Belski
bb217f781a Merge branch 'PHP-7.2'
* PHP-7.2:
  Unify EOL
2017-08-07 17:05:51 +02:00
Anatol Belski
dcd669b4d9 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Unify EOL
2017-08-07 17:04:15 +02:00
Anatol Belski
9ebf813ea4 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Unify EOL
2017-08-07 17:03:54 +02:00
Anatol Belski
4c9fe5a490 Unify EOL 2017-08-07 17:03:17 +02:00
Anatol Belski
ac1513ee4a Merge branch 'PHP-7.2'
* PHP-7.2:
  fix test target for phpize
2017-08-07 16:57:22 +02:00
Anatol Belski
d36344e888 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  fix test target for phpize
2017-08-07 16:45:57 +02:00
Anatol Belski
da966a93ac Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix test target for phpize
2017-08-07 16:45:41 +02:00
Anatol Belski
d058e30917 fix test target for phpize 2017-08-07 16:45:02 +02:00
Joe Watkins
2b5886a885
Merge branch 'PHP-7.2'
* PHP-7.2:
  minor loop optimizations, closes #2633
2017-07-25 06:54:29 +01:00
Joe Watkins
8d5a5fbf6b
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  minor loop optimizations, closes #2633
2017-07-25 06:54:20 +01:00
Joe Watkins
78ad5e8864
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  minor loop optimizations, closes #2633
2017-07-25 06:51:44 +01:00
Joe Watkins
69b48f83df
minor loop optimizations, closes #2633 2017-07-25 06:47:58 +01:00
Kalle Sommer Nielsen
3964678d49 Bail on invalid configure args if this is a snapshot build (as suggested by Anatol) 2017-07-24 23:38:09 +02:00
Anatol Belski
209ebbd652 Merge branch 'PHP-7.2'
* PHP-7.2:
  Combine conditions for the automatic interactive console activation
2017-07-24 14:52:58 +02:00
Anatol Belski
8a6afbef3f Combine conditions for the automatic interactive console activation
as with bug #74979 it seems to have regressions which were not
present before.
2017-07-24 14:47:32 +02:00
Kalle Sommer Nielsen
b67d6fdb66 Fix line feeds 2017-07-23 10:02:38 +02:00
Kalle Sommer Nielsen
a8b6d50da4 --with-mp is only available for VS anyway, so don't make the argument available if it doesn't have any effect 2017-07-22 23:54:15 +02:00
Kalle Sommer Nielsen
73cc299159 win32/install.txt is no more, just copy INSTALL instead 2017-07-21 22:43:25 +02:00
Kalle Sommer Nielsen
07e8bdd8c2 Free the HMODULE handle after use 2017-07-21 22:24:14 +02:00
Kalle Sommer Nielsen
1e9e7d4dc4 Point to the online documentation for installation of PHP in INSTALL, and remove the almost duplicate win32/install.txt, one place for all docs should be enough 2017-07-21 18:42:57 +02:00
Kalle Sommer Nielsen
a2f22b1d2a Don't bail configure on Windows if a configure argument was not found, this mimics that of the Unix build system.
configure --hello-world will now yield the following in the bottom of the configure summary:

WARNING
The following arguments is invalid, and therefore ignored:
 --hello-world
2017-07-21 18:33:42 +02:00
Kalle Sommer Nielsen
bfdd22a3de Remove old references to SAPIs and extensions no longer in the core 2017-07-19 09:09:24 +02:00
Anatol Belski
65d5e025a7 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix missing var for phpize
2017-07-17 19:40:31 +02:00
Anatol Belski
4ef9f536ba fix missing var for phpize
(cherry picked from commit 36c3d71407)
2017-07-17 19:38:50 +02:00
Anatol Belski
36c3d71407 fix missing var for phpize 2017-07-17 06:54:47 +02:00
Anatol Belski
b5fd99b636 Merge branch 'PHP-7.1'
* PHP-7.1:
  Fixed bug #74923 Crash when crawling through network share
2017-07-14 13:24:21 +02:00
Anatol Belski
5d15fdc4a4 Fixed bug #74923 Crash when crawling through network share 2017-07-14 13:23:24 +02:00
Anatol Belski
613102bd67 add next vc15 toolset to the list 2017-07-13 12:20:34 +02:00
Anatol Belski
bc16deee83 Revert "Enable whole program optimization for builds without PGO, too"
This reverts commit f052e99df6.

There appear to be link issues with upcoming 19.11 and /LTCG, prefer
wider dependency compatibility.
2017-07-13 12:20:34 +02:00
Anatol Belski
d9f72886aa extend comment 2017-07-13 12:20:34 +02:00
Anatol Belski
1300017cdc cleanup discontinued target 2017-07-13 08:18:50 +02:00
Anatol Belski
2b37da9eda parametrize zip names
simplify names
2017-07-11 21:45:49 +02:00
Paragon Initiative Enterprises
5cfa26c181 Squashed commit - Add ext/sodium
RFC: https://wiki.php.net/rfc/libsodium
Licensing: https://web.archive.org/web/20170710161517/https://github.com/jedisct1/libsodium-php/issues/127
2017-07-11 07:25:50 +02:00
Anatol Belski
e24a8012a0 fix uninitialized var 2017-07-09 17:54:46 +02:00
Anatol Belski
a51cb393b1 fix comparison warning 2017-07-09 16:28:17 +02:00
Anatol Belski
ba5df1c682 comply with POSIX signature 2017-07-09 16:23:31 +02:00
Anatol Belski
8d0d326ff9 fix warning 2017-07-09 16:05:36 +02:00
Anatol Belski
84079f4a1e cleanup casts 2017-07-09 15:31:05 +02:00
Anatol Belski
0acb6d1ae2 Merge branch 'PHP-7.1'
* PHP-7.1:
  update libs versions
  Fix NEWS entry location
  Fix NEWS entry location
  news entry for 74819
  news entry for 74651
  news entry for 74111
  news entry for 74435
  news entry for 74603
2017-07-08 13:42:47 +02:00
Anatol Belski
b38de96733 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  update libs versions
2017-07-08 13:42:10 +02:00
Anatol Belski
0fdceb6cd5 update libs versions 2017-07-08 13:41:50 +02:00
Anatol Belski
57432da0b9 fix command 2017-07-07 09:05:33 +02:00
Kalle Sommer Nielsen
c5f83f3426 Write the URL on a new line, so that it is easier copyable 2017-07-07 04:15:13 +02:00
Anatol Belski
9ad0d0ca3c replace the stack var by a macro 2017-07-06 20:47:04 +02:00
Anatol Belski
bae668ee2a add missing include guards 2017-07-04 16:21:45 +02:00
Anatol Belski
a56700043e vim folds and modelines 2017-07-04 16:08:48 +02:00
Anatol Belski
8871d2d12e Fixed bug #74849 Process is started as interactive shell in PhpStorm 2017-07-03 21:59:31 +02:00
Anatol Belski
7dc4d46325 follow up on 0c992792220bbfb375d5dc8222beb2a55da8441a 2017-06-15 23:48:03 +02:00
Richard Fussenegger
5fa1cd224b Fixed php_socket_t to int conversion
This warning was about a possible loss of data due to the downcast of `php_socket_t` to `int`. The former maps to a platform specific type, hence, it might downcast from a 64 bit integer to a 32 bit intger.

Fixed possibly overflowing vars

Due to the change from `int` to `php_socket_t` some variables might overflow now. Changed all variables that might be affected.

Revert "Fixed possibly overflowing vars"

This reverts commit bf64fd5984.

Use aliased PHP socket type

Using the alias protects us from changes to the underlying type.

Removed ignored nfds argument

The `nfds` argument to the Win32 `select` function is always ignored, regardless of its actual value. Hence, we should not pass it in the first place. See https://msdn.microsoft.com/en-us/library/windows/desktop/ms740141(v=vs.85).aspx for reference.

Target value is not a pointer

Avoid overflow in loop
2017-06-15 23:48:03 +02:00
Dmitry Stogov
71daef93bc preg_replace() optimization 2017-06-07 13:50:16 +03:00
Anatol Belski
4bdd63595b Merge branch 'PHP-7.1'
* PHP-7.1:
  improve error handling
2017-05-17 13:38:03 +02:00
Anatol Belski
02e9e59beb improve error handling 2017-05-17 13:35:42 +02:00
Anatol Belski
1507f30d15 Merge branch 'PHP-7.1'
* PHP-7.1:
  fix wrong error check
2017-05-17 12:51:46 +02:00
Anatol Belski
6e3d24bcf4 fix wrong error check 2017-05-17 12:50:41 +02:00
Anatol Belski
37cbda7cdf Merge branch 'PHP-7.1'
* PHP-7.1:
  [ci skip] update libs_versions.txt
  [ci skip] update libs versions file
2017-05-08 13:13:18 +02:00
Anatol Belski
83033f0b32 [ci skip] update libs_versions.txt 2017-05-08 13:11:12 +02:00
Anatol Belski
bdd66e1492 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  [ci skip] update libs versions file
2017-05-08 13:10:48 +02:00
Anatol Belski
ca870dfee7 [ci skip] update libs versions file 2017-05-08 13:10:13 +02:00
Anatol Belski
83d8daef97 Merge branch 'PHP-7.1'
* PHP-7.1:
  Fixed bug #74510 win32/sendmail.c anchors CC header but not BCC
2017-05-02 12:33:26 +02:00
Anatol Belski
3d9563b8b2 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed bug #74510 win32/sendmail.c anchors CC header but not BCC
2017-05-02 12:32:40 +02:00
Anatol Belski
20a608d9da Fixed bug #74510 win32/sendmail.c anchors CC header but not BCC 2017-05-02 12:31:00 +02:00
Anatol Belski
e9d5214b85 no vista anymore 2017-04-28 13:41:58 +02:00
Anatol Belski
dca2a855c8 prefer OpenSSL 1.1 with 7.2 as that's what is default 2017-04-24 18:39:04 +02:00
Anatol Belski
8f20eb0ea1 Remove --enable-one-shot as it's dead already for long
The usable option is --with-mp, the implementation is available since 7.0.
2017-04-24 17:54:50 +02:00
Anatol Belski
632d68f5f9 Merge branch 'PHP-7.1'
* PHP-7.1:
  Support also no,shared configure arg vals by default
2017-04-24 16:22:57 +02:00
Anatol Belski
f504e9eb72 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Support also no,shared configure arg vals by default
2017-04-24 16:22:16 +02:00
Anatol Belski
f7b8322b14 Support also no,shared configure arg vals by default
This indirectly fixes bug #74398 where --with-extname is expected to be
configured shared with our default dependency package. With a non
default deps, it still can be enforced --with-extname=static
2017-04-24 15:46:22 +02:00
Anatol Belski
6a2b48b4e5 Merge branch 'PHP-7.1'
* PHP-7.1:
  extend error map
2017-04-15 17:30:43 +02:00
Anatol Belski
62bec0e212 extend error map 2017-04-15 17:27:45 +02:00
Anatol Belski
93f594831c extend flag to reduce re-link time 2017-04-13 12:50:18 +02:00
Anatol Belski
8121cb5046 Pass explicit PHP version string to mkdist.php 2017-04-11 16:20:42 +02:00
Anatol Belski
f052e99df6 Enable whole program optimization for builds without PGO, too 2017-04-11 15:21:10 +02:00
Anatol Belski
a94fc577af Fix command syntax, env var has to be nmake macro in makefile 2017-04-11 13:29:08 +02:00
Anatol Belski
c14eecb9ac use php.exe from the SDK for packaging, not the one just compiled 2017-04-11 12:00:10 +02:00
Markus Staab
f160ee1251 remove no longer accurate comment 2017-04-11 11:53:43 +02:00
Anatol Belski
fa7bd5eabf Fail hard if sed isn't found
now that the new SDK is required and supplies it.
2017-04-11 11:40:23 +02:00
Anatol Belski
be540347e2 Merge branch 'PHP-7.1'
* PHP-7.1:
  fix re2c version comparison
2017-04-11 11:38:07 +02:00
Anatol Belski
3dc9279188 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix re2c version comparison
2017-04-11 11:37:03 +02:00
Anatol Belski
dd17659b86 fix re2c version comparison 2017-04-11 11:03:24 +02:00
Matt Ficken
873c505ad9 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix #74410 by calling WaitForMultipleObjects() instead of MsgWaitForMultipleObjects()
2017-04-11 01:56:54 -07:00
Matt Ficken
76c9b58431 Fix #74410 by calling WaitForMultipleObjects() instead of
MsgWaitForMultipleObjects()
2017-04-11 01:54:57 -07:00
Matt Ficken
d83743739e Fix #74410 by calling WaitForMultipleObjects() instead of MsgWaitForMultipleObjects() 2017-04-11 01:06:56 -07:00
Anatol Belski
528468579b intergarte furher newer flag in FindFirstFileEx for win7+ only 2017-04-10 11:09:51 +02:00
Anatol Belski
ad4ef13c5d Switch to FindFirstFileEx with basic info level
That omits querying of short names, thus improving perf.
2017-04-07 21:15:37 +02:00
Anatol Belski
936e341b5e missing bits for php_sys_stat_ex so everything is handled with wide chars
rename to pathw_len
2017-04-03 17:39:15 +02:00
Anatol Belski
6ab2c558f1 add existence check for clang lib dir and improve on x86 2017-04-03 15:29:56 +02:00
Anatol Belski
731cb8a827 basic ASAN suport for clang on Windows
fix makefile generation for non clang

rename option
2017-04-03 12:02:51 +02:00
Anatol Belski
6d1fc6cd6f hide clang warnings about unimplemented cli options 2017-04-02 17:55:23 +02:00
Anatol Belski
0894c22b49 extend manifest with long path compat info 2017-04-02 16:40:36 +02:00
Anatol Belski
80d5c23c0d do compare on wchar's 2017-04-02 16:40:36 +02:00
Anatol Belski
e0f68ae144 implement basic binary tools sdk version check 2017-03-31 01:46:57 +02:00
Nikita Popov
edcabf6d07 Drop unnecessary allocator return value checks 2017-03-13 22:07:15 +01:00
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
Anatol Belski
d5a3838c65 fix min supported versions 2016-12-22 12:40:58 +01: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
Anatol Belski
ce0669c892 Merge branch 'PHP-7.1'
* PHP-7.1:
  add folds
  fix possible null dereference
2016-12-21 18:00:45 +01:00
Anatol Belski
6ffa1d256f add folds 2016-12-21 17:59:45 +01:00
Anatol Belski
637436628a fix possible null dereference 2016-12-21 17:58:34 +01:00
Anatol Belski
5e2ed8c809 Raise the supported API to win7/server 2008r2 2016-12-21 15:59:45 +01:00
Anatol Belski
747b18ff5c Merge branch 'PHP-7.1'
* PHP-7.1:
  deliver the real cp also if a constant is passed
2016-12-20 02:44:40 +01:00
Anatol Belski
21e2836473 deliver the real cp also if a constant is passed 2016-12-20 02:40:44 +01:00
Anatol Belski
376b73d1d6 Merge branch 'PHP-7.1'
* PHP-7.1:
  chance CLI codepage, only when SAPI is initialized
2016-12-16 17:10:36 +01:00
Anatol Belski
b91d7f186a chance CLI codepage, only when SAPI is initialized
This finally solves issues with DBSC console codepages, and in
general improves the console codepage switching. When
module_initialized, all the possible encoding INI settings with
regard to possible modifications are set, and that's the
right moment to switch the console codepage in regard to I/O.
CJK glyphs might take more than 1 cell, so then  visual issues
can occur, when switching console codepage back and forth. Users
are free to use ini_set(), but any visual issues are then up to
the user responsibility.
2016-12-16 16:49:18 +01:00
Anatol Belski
9bcd2bcc21 Merge branch 'PHP-7.1'
* PHP-7.1:
  Care about intput and output encoding, as per default encoding RFC
2016-12-14 03:12:46 +01:00
Anatol Belski
e33ec61f9c Care about intput and output encoding, as per default encoding RFC
If PHP CLI is used with programs with no Unicode support, the default
PHP console codepage might cause backward incompatible behaviors. This
is solved with this patch by separating the handling of I/O codepage.
As per https://wiki.php.net/rfc/default_encoding input_encodnig and
output_encoding are centralized INI settings, so they're used for the
purpose of adjusting the codepage. This gives user the ability to use
UTF-8 internally, while letting the system API to convert the output
to a compatible codepage. This also might solve the font issues on
systems without good true type support.

Note, that there no change to the default behavior - if input and
output encoding are not set, which is the default case, the default
charset applies to both console input and output. The patch is just
a compilment to the backward compatibility, not more and not less.
2016-12-14 02:51:29 +01:00
Leigh
ff8fbf41c1 Merge branch 'master' into remove-mcrypt 2016-12-12 12:23:50 +00:00
Anatol Belski
459e9f1b63 Merge branch 'PHP-7.1'
* PHP-7.1:
  extend errno mapping
2016-12-10 11:18:34 +01:00
Anatol Belski
8b82e2c2fe extend errno mapping 2016-12-10 11:17:07 +01:00
Anatol Belski
089e5972e9 Merge branch 'PHP-7.1'
* PHP-7.1:
  update libs_versions.txt
  update libs versions.txt
2016-11-22 12:44:56 +01:00
Anatol Belski
1208acfa1b Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  update libs_versions.txt
  update libs versions.txt
2016-11-22 12:44:06 +01:00
Anatol Belski
13c45021dc update libs_versions.txt 2016-11-22 12:42:57 +01:00
Kalle Sommer Nielsen
e59089c6e5 Revert "Added --enable-asm on Windows"
This reverts commit d711798813.

I need a better approach for this and general customized CFLAGS
2016-11-21 00:46:04 +01:00
Kalle Sommer Nielsen
d711798813 Added --enable-asm on Windows
This argument is disabled by default, but if enabled it will create a sub directory in the output directory called 'asm' and dump each compiled .c file's asm there
2016-11-20 22:49:34 +01:00
Kalle Sommer Nielsen
644821e89f Minor grammar 2016-11-20 21:25:25 +01:00
Kalle Sommer Nielsen
b581f7d860 No need to keep the version info for old VC versions we don't even support anymore 2016-11-20 20:56:49 +01:00
Kalle Sommer Nielsen
7e8fd3fb5a Update inline comment with VS.net 2017 + fix typo 2016-11-20 20:55:02 +01:00
Kalle Sommer Nielsen
39cfeea20b Remove typo 2016-11-20 20:52:22 +01:00
Kalle Sommer Nielsen
acbc007a7d Use $(CC) consistently in the Makefile 2016-11-20 20:50:25 +01:00
Kalle Sommer Nielsen
673bbff0e5 Updated the comment regarding what priority modes that are left out for the nice() implementation on Windows 2016-11-19 10:10:48 +01:00
Kalle Sommer Nielsen
ddf95667c4 Remove support for REALTIME_PRIORITY_CLASS in proc_nice() on Windows.
The reasoning for this is because that it requires special permissions and can in the end be dangerous, discovered by Anatol.
2016-11-19 00:32:07 +01:00
Anatol Belski
019bf13a06 Merge branch 'PHP-7.1'
* PHP-7.1:
  don't fail miserably, when an unknown vc version is used
2016-11-18 18:21:49 +01:00
Anatol Belski
828f866e47 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  don't fail miserably, when an unknown vc version is used
2016-11-18 18:21:28 +01:00
Anatol Belski
5b9d7160c5 don't fail miserably, when an unknown vc version is used 2016-11-18 18:19:47 +01:00
Anatol Belski
ad5b79977c Merge branch 'PHP-7.1'
* PHP-7.1:
  add vc15 to the list
2016-11-17 23:47:08 +01:00
Anatol Belski
8806c54b00 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  add vc15 to the list
2016-11-17 23:46:49 +01:00
Anatol Belski
5008acd1f6 add vc15 to the list 2016-11-17 23:43:32 +01:00
Kalle Sommer Nielsen
2104bea5d7 Remove Netware support
If this does not break the Unix system somehow, I'll be amazed. This should get most of it out, apologies for any errors this may cause on non-Windows ends which I cannot test atm.
2016-11-12 11:20:01 +01:00
Anatol Belski
595ad898c1 Merge branch 'PHP-7.1'
* PHP-7.1:
  fix erroneous line in confutils.js
2016-11-12 02:39:30 +01:00
Anatol Belski
8486e045db Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix erroneous line in confutils.js
2016-11-12 02:38:33 +01:00