Commit graph

1460 commits

Author SHA1 Message Date
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
Kalle Sommer Nielsen
1e02e52859 Fixed compiler warning (Sorry Anatol, but this one was killing me) 2016-08-03 06:16:48 +02:00
Anatol Belski
845f66ba64 increase versions for 7.2 2016-08-02 11:01:57 +02:00
Anatol Belski
fe8daf2a28 fix typo 2016-07-29 15:08:55 +02:00
Anatol Belski
d6f7020eaa add more errno handling 2016-07-29 15:05:41 +02:00
Anatol Belski
d8403aa019 set errno in ioutil access routine 2016-07-29 14:31:06 +02:00
Anatol Belski
6dbfd4287b move error check to right place
this only makes sense when length was passed
2016-07-29 13:33:58 +02:00
Anatol Belski
41d172d20f fix and improve the ioutil cwd routine for nts
- move intermediate var to stack
- fix length calculation
- improve error code setting
2016-07-29 02:41:00 +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
addb2e22b3 fix compiler warning 2016-07-24 03:51:53 +02:00
Anatol Belski
4acde210fd rework long path normalization stuf
Simplify, set error codes, ensure 32-bit is ok as well. The
canonicalization part is still an issue on win7 as the API
is missing there. However a partial improvement is reached
there as well thanks to the slash conversion.
2016-07-24 03:51:47 +02:00
Anatol Belski
69ae61af96 add folds 2016-07-23 23:24:32 +02:00
Anatol Belski
88d4f149a6 improve typedef and fix the fake function 2016-07-23 23:24:32 +02:00
Anatol Belski
40557fdc34 add missing cast 2016-07-23 23:24:32 +02:00
Anatol Belski
0f16c56262 Fixed bug #72625 realpath() fails on non canonical long path 2016-07-23 21:11:27 +02:00
Anatol Belski
fc30b8e0f7 correct comment 2016-07-23 21:11:27 +02:00
Anatol Belski
7d83324105 don't return long path prefix to script 2016-07-23 21:11:27 +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
2349332b66 correct macro names 2016-07-17 12:33:26 +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
2e3903b2d6 fix cli codepage reset 2016-07-11 09:24:41 +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
Nikita Popov
786effaff6 Remove PHP_*_CRYPT constants
They are always 1.
2016-03-25 20:48:34 +01:00
Anatol Belski
1ed4227e64 Merge branch 'PHP-7.0'
* PHP-7.0:
  update libs versions
  update libs versions
2016-03-15 09:44:48 +01:00
Anatol Belski
ba5b98db8c update libs versions 2016-03-15 09:44:05 +01:00
Anatol Belski
d789c4ceb0 Merge branch 'PHP-7.0'
* PHP-7.0:
  extend check for add_flag
2016-03-01 09:36:36 +01:00
Anatol Belski
0df2575e9f extend check for add_flag 2016-03-01 09:36:07 +01:00
Xinchen Hui
dd47b3b963 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed another segfault with file_cache_only now
  Fixed bugs #71317 and #71504
  add test for bug #68957
  update NEWS
  update NEWS
  Fixed #54648 PDO::MSSQL forces format of datetime fields
  remove unneeded free parts
  fix leaks and add one more NULL check
  add NULL check
  fix C89 compat
  fix arg type
  fix nmake clean in phpize mode
2016-03-01 10:51:36 +08:00
Anatol Belski
9ccf3a0292 fix nmake clean in phpize mode 2016-02-29 11:00:09 +01:00
Anatol Belski
e644c9457e Merge branch 'PHP-7.0'
* PHP-7.0:
  cleanup duplicated var
  fix file lists with subdirs passed to EXTENSION()
2016-02-14 17:28:38 +01:00
Anatol Belski
9bef2212aa cleanup duplicated var 2016-02-14 17:20:37 +01:00
Anatol Belski
8289f11390 fix file lists with subdirs passed to EXTENSION()
The underlying place responsible is the ADD_SOURCES() function. With
this, the calls like

EXTENSION("hello", "sub0/file0.c sub1/file1.c", ...)

are working correctly. Same for

ADD_SOURCES("some/dir", "sub0/file0.c sub1/file1.c", ...)
2016-02-14 17:15:20 +01:00
Anatol Belski
0aaddfbba3 Merge branch 'PHP-7.0'
* PHP-7.0:
  update libs version
  update libs version
2016-02-02 09:04:02 +01:00
Anatol Belski
0ec1207d74 update libs version 2016-02-02 09:03:40 +01:00
Anatol Belski
6f19ca8553 Merge branch 'PHP-7.0'
* PHP-7.0:
  fix extensions path for nmake install
  fix extensions path for nmake install
  use correct pointer in the math
2016-02-01 15:43:49 +01:00
Anatol Belski
2764586c6d fix extensions path for nmake install 2016-02-01 15:42:32 +01:00
Anatol Belski
5e73db9cb7 integrate the /Gw compiler switch 2016-01-18 18:32:19 +01:00
Anatol Belski
cce370d4c9 fix compiler version check 2016-01-18 18:32:17 +01:00
Anatol Belski
b94ed769f4 integrate /Zc:inline switch 2016-01-18 18:32:15 +01:00
Anatol Belski
c8ff622f6d Merge branch 'PHP-7.0'
* PHP-7.0:
  update libs_versions.txt
  update libs versions
2016-01-08 08:36:43 +01:00