Commit graph

775 commits

Author SHA1 Message Date
Kalle Sommer Nielsen
dfbcd4e207 Do not overwrite config.nice.bat if --with-config-profile is used on Windows 2016-10-20 13:10:28 +02:00
Kalle Sommer Nielsen
465fdd1de8 T1Lib support was removed in 7.0 2016-10-19 09:02:41 +02:00
Kalle Sommer Nielsen
60d847a0cf Fix typo 2016-10-19 09:01:29 +02:00
Kalle Sommer Nielsen
63869d9491 Move these files to the same compilation batch instead of two 2016-10-19 06:44:30 +02:00
Kalle Sommer Nielsen
59090b6499 Ignore notices with headers already being defined to their magic HAVE_<name>_H define on Windows.
This is very minor and only happens so far for zlib.h, which both ext/zip and ext/zlib looks for.
2016-10-19 06:29:15 +02:00
Kalle Sommer Nielsen
0ffd0a0217 Improve the config.simple.bat for Windows a little;
This adds --with-config-profile=foobar, this generates a config.foobar.bat file in the root of php-src directory with the relevant configuration arguments.
2016-10-19 01:14:15 +02:00
Kalle Sommer Nielsen
6cb13be2c8 Added config.simple for the Windows build system, this is pretty much
like running configure for only the core of PHP and sapi/cli for quick
and fast building.

buildconf
config.simple
nmake
Release_TS\php -v

(This also enables --with-mp for multi processing for a faster build)
2016-10-18 23:13:30 +02:00
Kalle Sommer Nielsen
64945e9387 Implemented proc_nice() for Windows (FR #49806)
The core implementation details are described in win32/nice.c for values sent to proc_nice(), these can however be discussed to maybe comply with those of wmic, Anatol, thoughts?

The test supplied uses wmic for testing the functionality, it could potentially fail on systems where either wmic is not available or the system language is not english (as Microsoft tends to translate even CLI programs).
2016-10-16 04:17:35 +02:00
Anatol Belski
63c7a09786 Merge branch 'PHP-7.1'
* PHP-7.1:
  add zend_bailout to cppcheck conf
2016-10-10 13:12:34 +02:00
Anatol Belski
4b8bdac8db add zend_bailout to cppcheck conf 2016-10-10 13:11:45 +02:00
Anatol Belski
e017b940ab Merge branch 'PHP-7.1'
* PHP-7.1:
  sync win32 makefile with makedist zendparse exports
2016-09-29 13:02:54 +02:00
Anatol Belski
3828323290 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  sync win32 makefile with makedist zendparse exports
2016-09-29 13:02:03 +02:00
Anatol Belski
62bed405da sync win32 makefile with makedist zendparse exports
With a newer bison this part is relevant. Whil bison 2.4.1 is still
used, this changes cater for the forward compatibility.
2016-09-29 12:56:49 +02:00
Anatol Belski
558f684e60 Merge branch 'PHP-7.1'
* PHP-7.1:
  update libs_versions.txt
  update libs_versions.txt
2016-09-26 15:42:56 +02:00
Anatol Belski
5e24fe9fde Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  update libs_versions.txt
  update libs_versions.txt
2016-09-26 15:42:32 +02:00
Anatol Belski
eaee65080e update libs_versions.txt 2016-09-26 15:41:41 +02:00
Anatol Belski
59c72a6edb Merge branch 'PHP-7.1'
* PHP-7.1:
  update libs versions
  update libs versions
2016-09-22 17:04:06 +02:00
Anatol Belski
5b46c2b67d Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  update libs versions
  update libs versions
2016-09-22 17:03:49 +02:00
Anatol Belski
11ff616d0f update libs versions 2016-09-22 17:02:54 +02:00
Anatol Belski
edc4de58b7 Merge branch 'PHP-7.1'
* PHP-7.1:
  fix useless assignment
  avoid needless function call
  remove useless assignment
  remove unused assignment
  rewrite the getcwd part
  fix leak
  fix unused assignment
  remove duplicated symbol
2016-09-01 23:54:33 +02:00
Anatol Belski
cd7853b455 remove duplicated symbol 2016-09-01 23:45:31 +02:00
Anatol Belski
40b49a7f9e Merge branch 'PHP-7.1'
* PHP-7.1:
  add more defs for resource alloc/dealloc
  add yet one define
2016-08-31 12:11:19 +02:00
Anatol Belski
e446ec14e5 add more defs for resource alloc/dealloc 2016-08-31 12:10:40 +02:00
Anatol Belski
4c8e6a2c95 add yet one define 2016-08-31 12:10:40 +02:00
Anatol Belski
5101bd026c Merge branch 'PHP-7.1'
* PHP-7.1:
  extend help message
2016-08-29 18:25:38 +02:00
Anatol Belski
78401a7f01 extend help message 2016-08-29 18:25:00 +02:00
Anatol Belski
90c38299fd Merge branch 'PHP-7.1'
* PHP-7.1:
  fix search path
  support also cppcheck for static analyze
2016-08-29 17:47:21 +02:00
Anatol Belski
faccbeb588 fix search path 2016-08-29 17:44:37 +02:00
Anatol Belski
3ab2a58753 support also cppcheck for static analyze 2016-08-29 17:44:37 +02:00
Anatol Belski
d2ac2cd40d Merge branch 'PHP-7.1'
* PHP-7.1:
  extend help msg
  fix leak
  extend clang vs compat options
  fix leak
  integrate clang analyzer
2016-08-28 21:20:31 +02:00
Anatol Belski
be0958d291 extend help msg 2016-08-28 20:18:11 +02:00
Anatol Belski
48b1cb2f12 extend clang vs compat options 2016-08-28 19:42:41 +02:00
Anatol Belski
10c2ac8c81 integrate clang analyzer 2016-08-28 19:42:41 +02:00
Kalle Sommer Nielsen
a402d0bdab Added a warning in case --with-mp is combined with --enable-debug
This causes a D9030 since we specify a minimal build using /Gm in case we make a debug build
2016-08-06 11:00:22 +02:00
Anatol Belski
ff71137bef Merge branch 'PHP-7.1'
* PHP-7.1:
  update libs_versions.txt
  update libs_versions.txt
2016-08-03 15:07:10 +02:00
Anatol Belski
c17092fc13 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  update libs_versions.txt
  update libs_versions.txt
2016-08-03 15:06:39 +02:00
Anatol Belski
e3dabe448d update libs_versions.txt 2016-08-03 15:06:02 +02:00
Anatol Belski
845f66ba64 increase versions for 7.2 2016-08-02 11:01:57 +02:00
Anatol Belski
30118e33b3 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  update NEWS
  Enable 'nmake test' on building extensions
  Make phpize use PHP_PREFIX as the default location (windows)
2016-07-25 09:52:38 +02:00
y-uti
0f9bf85ad9 Enable 'nmake test' on building extensions
On Windows, Makefile generated by phpize doesn't have the 'test'
target rule. This commit fixes that and enables 'nmake test' on
Windows.
2016-07-25 09:46:06 +02:00
y-uti
6ed7136371 Make phpize use PHP_PREFIX as the default location (windows)
The default path to where an extension is installed should be
PHP_PREFIX/ext on windows.
2016-07-25 09:46:00 +02:00
Anatol Belski
a8b105b412 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  update libs_version.txt
  update libs_versions.txt
2016-07-21 01:56:55 +02:00
Anatol Belski
e7168519dd update libs_version.txt 2016-07-21 01:54:53 +02:00
Anatol Belski
661f17663a Merge branch 'PHP-7.0'
* PHP-7.0:
  update NEWS
  Make phpize set a proper build type (windows)
2016-07-12 13:03:30 +02:00
y-uti
acc58f1845 Make phpize set a proper build type (windows) 2016-07-12 12:59:11 +02:00
Anatol Belski
3d3f11ede4 Fixed the UTF-8 and long path support in the streams on Windows.
Since long the default PHP charset is UTF-8, however the Windows part is
out of step with this important point. The current implementation in PHP
doesn't technically permit to handle UTF-8 filepath and several other
things. Till now, only the ANSI compatible APIs are being used. Here is more
about it

dd317752%28v=vs.85%29.aspx

The patch fixes not only issues with multibyte filenames under
incompatible codepages, but indirectly also issues with some other multibyte
encodings like BIG5, Shift-JIS, etc. by providing a clean way to access
filenames in UTF-8. Below is a small list of issues from the bug tracker,
that are getting fixed:

https://bugs.php.net/63401
https://bugs.php.net/41199
https://bugs.php.net/50203
https://bugs.php.net/71509
https://bugs.php.net/64699
https://bugs.php.net/64506
https://bugs.php.net/30195
https://bugs.php.net/65358
https://bugs.php.net/61315
https://bugs.php.net/70943
https://bugs.php.net/70903
https://bugs.php.net/63593
https://bugs.php.net/54977
https://bugs.php.net/54028
https://bugs.php.net/43148
https://bugs.php.net/30730
https://bugs.php.net/33350
https://bugs.php.net/35300
https://bugs.php.net/46990
https://bugs.php.net/61309
https://bugs.php.net/69333
https://bugs.php.net/45517
https://bugs.php.net/70551
https://bugs.php.net/50197
https://bugs.php.net/72200
https://bugs.php.net/37672

Yet more related tickets can for sure be found - on bugs.php.net, Stackoverflow
and Github. Some of the bugs are pretty recent, some descend to early
2000th, but  the user comments in there last even till today. Just for example,
bug #30195 was opened in 2004, the latest comment in there was made in 2014. It
is certain, that these bugs descend not only to pure PHP use cases, but get also
redirected from the popular PHP based projects. Given the modern systems (and
those supported by PHP) are always based on NTFS, there is no excuse to keep
these issues unresolved.

The internalization approach on Windows is in many ways different from
UNIX and Linux, while it supports and is based on Unicode. It depends on the
current system code page, APIs used and exact kind how the binary was compiled
The locale doesn't affect the way Unicode or ANSI API work. PHP in particular
is being compiled without _UNICODE defined and this is conditioned by the
way we handle strings. Here is more about it

https://msdn.microsoft.com/en-us/library/tsbaswba.aspx

However, with any system code page ANSI functions automatically convert
paths to UTF-16. Paths in some encodings incompatible with the
current system code page, won't work correctly with ANSI APIs. PHP
till now only uses the ANSI Windows APIs.

For example, on a system with the current code page 1252, the paths
in cp1252 are supported and transparently converted to UTF-16 by the
ANSI functions. Once one wants to handle a filepath encoded with cp932 on
that particular system, an ANSI or a POSIX compatible function used in
PHP will produce an erroneous result. When trying to convert that cp932 path
to UTF-8 and passing to the ANSI functions, an ANSI function would
likely interpret the UTF-8 string as some string in the current code page and
create a filepath that represents every single byte of the UTF-8 string.
These behaviors are not only broken but also disregard the documented
INI settings.

This patch solves the issies with the multibyte paths on Windows by
intelligently enforcing the usage of the Unicode aware APIs. For
functions expect Unicode (fe CreateFileW, FindFirstFileW, etc.), arguments
will be converted to UTF-16 wide chars. For functions returning Unicode
aware data (fe GetCurrentDirectoryW, etc.), resulting wide string is
converted back to char's depending on the current PHP charset settings,
either to the current ANSI codepage (this is the behavior prior to this patch)
or to UTF-8 (the default behavior).

In a particular case, users might have to explicitly set
internal_encoding or default_charset, if filenames in ANSI codepage are
necessary. Current tests show no regressions and witness that this will be an
exotic case, the current default UTF-8 encoding is compatible with any
supported system. The dependency libraries are long switching to Unicode APIs,
so some tests were also added for extensions not directly related to streams.
At large, the patch brings over 150 related tests into the core. Those target
and was run on various environments with European, Asian, etc. codepages.
General PHP frameworks was tested and showed no regressions.

The impact on the current C code base is low, the most places affected
are the Windows only places in the three files tsrm_win32.c, zend_virtual_cwd.c
and plain_wrapper.c. The actual implementation of the most of the wide
char supporting functionality is in win32/ioutil.* and win32/codepage.*,
several  low level functionsare extended in place to avoid reimplementation for
now. No performance impact was sighted. As previously mentioned, the ANSI APIs
used prior the patch perform Unicode conversions internally. Using the
Unicode  APIs directly while doing custom conversions just retains the status
quo. The ways to optimize it are open (fe. by implementing caching for the
strings converted to wide variants).

The long path implementation is user transparent. If a path exceeds the
length of _MAX_PATH, it'll be automatically prefixed with \\?\. The MAXPATHLEN
is set to 2048 bytes.

Appreciation to Pierre Joye, Matt Ficken, @algo13 and others for tips, ideas
and testing.

Thanks.
2016-06-20 12:45:39 +02:00
maxdax15801
d7da8f5ea4 Fix bug #47517 php-cgi.exe missing UAC manifest
Add a <requestedExecutionLevel> to the manifest so Windows doesn't
use file and registry virtualization for backwards compatibility
with pre-Vista versions.
2016-06-02 22:55:18 +02:00
Anatol Belski
09b8550f59 Merge branch 'PHP-7.0'
* PHP-7.0:
  update libs versions
  upate libs versions
2016-05-03 18:28:08 +02:00
Anatol Belski
578ba03339 update libs versions 2016-05-03 18:27:21 +02:00
Nikita Popov
d3ed75b9eb Remove HAVE_CRYPT checks
We always provide a crypt implementation. HAVE_CRYPT is only
relevant as to whether the crypt() C function exists.
2016-03-25 21:09:47 +01:00