Commit Graph

1718 Commits

Author SHA1 Message Date
Anatol Belski
5fa9a6d176 Merge branch 'PHP-7.1'
* PHP-7.1:
  prepend known bin folders to the path for nmake test runs
2016-10-27 20:44:30 +02:00
Anatol Belski
66f3fcee08 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  prepend known bin folders to the path for nmake test runs
2016-10-27 20:43:25 +02:00
Anatol Belski
1be8339891 prepend known bin folders to the path for nmake test runs 2016-10-27 20:41:41 +02:00
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
6ebb447d77 Poor copy/paste mistake, nobody saw I used getrusage.[c|h] as skeleton here! 2016-10-19 07:10:28 +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
d0a3f2e46d Make proc_nice() more in line with that of Unix, as discussed with Anatol 2016-10-18 23:25:59 +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
Leigh
56908edfbe Merge branch 'master' into remove-mcrypt 2016-10-18 09:17:03 +01:00
Kalle Sommer Nielsen
5c169af7c9 Change the semantics of proc_nice() for Windows to better match the values of the wmic output 2016-10-16 05:21: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
Leigh
bc4676e050 Remove mcrypt 2016-10-04 13:20:36 +01: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
7020e6f9ae fix leak 2016-09-01 23:45:31 +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
646d3f66a3 Merge branch 'PHP-7.1'
* PHP-7.1:
  add error check and fix leak
  fix leak
2016-08-29 17:26:41 +02:00
Anatol Belski
7ecfb4b954 fix leak 2016-08-29 17:25:13 +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
b415290c92 fix leak 2016-08-28 19:42:41 +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
Anatol Belski
f407707bd6 Merge branch 'PHP-7.1'
* PHP-7.1:
  fix leak
  add parentheses
  fix clang compat
  fix leak
2016-08-27 22:30:06 +02:00
Anatol Belski
92a60a67cf fix leak 2016-08-27 22:28:13 +02:00
Anatol Belski
b6440a74c1 add parentheses 2016-08-27 22:26:18 +02:00
Anatol Belski
e6b9446301 Merge branch 'PHP-7.1'
* PHP-7.1:
  fix leak
2016-08-26 22:05:50 +02:00
Anatol Belski
88f6706656 fix leak 2016-08-26 22:05:06 +02:00
Anatol Belski
becc5cd11b sync shm* implementation signatures with POSIX 2016-08-23 00:27:17 +02:00
Kalle Sommer Nielsen
fea6d5d18f Make this inline like the many other variants we got of this function (win32/time.c, Zend/zend_virtual_cwd.c, ...) 2016-08-17 23:52:44 +02:00
Kalle Sommer Nielsen
13e076f446 We do not need to check the return value of php_win32_init_gettimeofday() anymore, as the symbol is always going to be available to us 2016-08-11 04:35:51 +02:00
Kalle Sommer Nielsen
ff1a3cecae The call to FreeLibrary() should be within the if, so we don't pass INVALID_HANDLE_VALUE to it, in case LoadLibrary() fails 2016-08-11 04:13:34 +02:00
Kalle Sommer Nielsen
36b050c2c5 Get rid of these slow calls to LoadLibrary()/GetProcAddress() calls on Windows, we require Windows Vista as bare minimum for PHP anyway, so it does not make any sense to do this slow emulation anyway.
GD:
 - PrintWindow() is available as of Windows XP, it requires linking to User32.lib, which config.w32 for ext/gd already.

CLI:
 - The borrowed functions from PostgreSQL to set the titles of the console window uses SetConsoleTitle() and GetConsoleTitle(), both are available as of Windows 2000 from Kernel32.lib which we already are linking against.

Standard:
 - The disk space utility functions uses GetDiskFreeSpaceExA() which is available as of Windows XP, again links to Kernel32.lib.
 - The symlink() PHP function uses CreateSymbolicLinkA() which is available from Windows Vista, again from Kernel32.lib.
 - php_get_windows_name() in info.c uses GetNativeSystemInfo() which is available as of Windows XP and GetProductInfo() which is available as of Windows Vista, both are again from Kernel32.lib.

Notes:
 - ext/interbase & ext/pdo_firebird uses GetProcAddress(), I'm not entirely sure how to handle this one.
 - ext/sqlite3, this is apart of the bundled libsqlite3, I don't really wanna play around with our bundled libs and make it a bigger issue for those who maintain and upgrade them.
 - ext/readline, the call to GetProcAddress() here does not do any system calls, so it is left as is.
 - win32/ioutil.c uses GetProcAddress(), but the function it attempts to load (PathCchCanonicalizeEx()) is only available from Windows 8 and greater (Pathcch.lib linkage).
 - win32/time.c uses GetSystemTimePreciseAsFileTime() which is available from Windows 8 and greater to get the current system date and time which the highest possible precision and falls back to GetSystemTimeAsFileTime() (available as of Windows 2000), again Kernel32.lib, the GetSystemTimePreciseAsFileTime() is left in a GetProcAddress().
2016-08-11 02:09:50 +02:00
Anatol Belski
e20e9c6998 Merge branch 'PHP-7.1'
* PHP-7.1:
  check malloc result
2016-08-08 12:18:57 +02:00
Anatol Belski
33a7ad2365 check malloc result 2016-08-08 10:33:07 +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
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

https://msdn.microsoft.com/en-us/library/windows/desktop/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
Anatol Belski
c7256095c5 update libs_versions.txt 2016-01-08 08:36:21 +01:00
Julien Pauli
928d2cb3a4 Merge branch 'PHP-7.0'
* PHP-7.0:
  Happy new year (Update copyright to 2016)
2016-01-04 18:14:08 +01:00
Julien Pauli
736b91c650 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Happy new year (Update copyright to 2016)

Conflicts:
	ext/json/php_json_encoder.h
	sapi/continuity/capi.c
2016-01-04 18:13:38 +01:00
Lior Kaplan
53fb2f1e5c Happy new year (Update copyright to 2016) 2016-01-03 01:44:37 +02:00
Lior Kaplan
71c1980025 Happy new year (Update copyright to 2016) 2016-01-01 20:06:12 +02:00
Lior Kaplan
3d5438bf7b Merge branch 'PHP-7.0'
* PHP-7.0:
  Update header to PHP Version 7
  Happy new year (Update copyright to 2016)
  Happy new year (Update copyright to 2016)
2016-01-01 20:04:31 +02:00
Lior Kaplan
2eb1f38d24 Happy new year (Update copyright to 2016) 2016-01-01 20:03:16 +02:00
Lior Kaplan
ed35de784f Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Happy new year (Update copyright to 2016)
2016-01-01 19:48:25 +02:00
Lior Kaplan
49493a2dcf Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
Anatol Belski
17eff65001 Merge branch 'PHP-7.0'
* PHP-7.0:
  rather use the supplied inttypes.h with vc14
  fix test redirection when run not from source root
2015-10-23 10:16:51 +02:00
Anatol Belski
448d1ce428 rather use the supplied inttypes.h with vc14 2015-10-23 09:47:00 +02:00
Anatol Belski
d8f47bd177 Merge branch 'PHP-7.0'
* PHP-7.0:
  prepare NEWS for next
  update libs_versions.txt
2015-10-13 10:35:33 +02:00
Anatol Belski
afdbd8f95b update libs_versions.txt 2015-10-13 09:41:34 +02:00
Anatol Belski
9f27624641 fix ftok() export 2015-10-10 19:15:02 +02:00
Anatol Belski
c3dd6058df rename header 2015-10-10 17:31:33 +02:00
Anatol Belski
f588c29f9a fix macro name 2015-10-10 17:31:26 +02:00
Anatol Belski
2dc0ce2fcd enable ftok implementation 2015-10-10 17:31:19 +02:00
Anatol Belski
5def56e23f initial ftok() implementation for win32 2015-10-10 17:31:12 +02:00
Ferenc Kovacs
7d0c04c1e9 Merge branch 'PHP-7.0'
* PHP-7.0:
  pear 1.10 was released and the go-pear and install pear phars are now php7 compatible
2015-10-07 16:15:59 +02:00
Ferenc Kovacs
f9e3461c02 pear 1.10 was released and the go-pear and install pear phars are now php7 compatible 2015-10-07 13:56:47 +02:00
Kalle Sommer Nielsen
16ff9cb93b Note the PHP version at the top of configure 2015-09-17 14:28:19 +02:00
Anatol Belski
e4c190ef6d adjust versions in confutils 2015-09-17 13:31:27 +02:00
Anatol Belski
0562ec85df Fix bug #70145 From field incorrectly parsed from headers 2015-08-19 11:05:35 +02:00
Anatol Belski
7f4ae19c80 added /guard:cf to release builds 2015-08-19 10:56:43 +02:00
Christoph M. Becker
3d8214a021 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix #67604: The built windows documention refers to nonexistent dll
2015-08-18 21:26:09 +02:00
Christoph M. Becker
c12aa3c7ce Fix #67604: The built windows documention refers to nonexistent dll
Since quite a while the Windows builds ship with php5apache2_4.dll, but not
with other server modules. We fix some out-dated info in install.txt.
2015-08-18 21:21:28 +02:00
Anatol Belski
e42a29bf81 updated libs_versions.txt 2015-07-24 20:23:07 +02:00
Ferenc Kovacs
35b61e4f4d pear 1.10.0dev2 2015-07-31 10:22:50 +02:00
Anatol Belski
7d41afeee8 fix thread safety 2015-07-29 10:36:27 +02:00
Christoph M. Becker
4e8f01cb6e Fix #36365: scandir duplicates file name at every 65535th file
Due to DIR.offset being declared as short we have an overflow. This patch
changes the field to int.
2015-07-28 01:04:55 +02:00
Christoph M. Becker
b6bcf9c51a Add support for regenerating phpdbg lexers and scanners on Windows 2015-07-28 00:26:55 +02:00
Anatol Belski
352bf686ce update libs_version.txt 2015-07-24 20:24:50 +02:00
Anatol Belski
73c0fc0df4 move the define to the right place
thanks Kalle )
2015-07-06 19:43:35 +02:00
Anatol Belski
cb2d33f3e2 fix ext/ldap build 2015-07-06 19:35:29 +02:00
Dmitry Stogov
4bd22cf1c1 Improved zend_string API (Francois Laupretre)
Squashed commit of the following:

commit d96eab8d79
Author: Francois Laupretre <francois@tekwire.net>
Date:   Fri Jun 26 01:23:31 2015 +0200

    Use the new 'ZSTR' macros in the rest of the code.

    Does not change anything to the generated code (thanks to compat macros) but cleaner.

commit b352643910
Author: Francois Laupretre <francois@tekwire.net>
Date:   Thu Jun 25 13:45:06 2015 +0200

    Improve zend_string API

    Add missing methods
2015-06-29 16:44:54 +03:00
Kalle Sommer Nielsen
7517d385ea Merge branch 'master' of https://git.php.net/push/php-src 2015-06-25 19:09:00 +02:00
Bob Weinand
f42cdf83b0 Fix paths issue when fetching .phpdbginit under Windows 2015-06-25 00:36:01 +02:00
Kalle Sommer Nielsen
41404bfafd Also silence copy here 2015-06-22 15:26:21 +02:00
Kalle Sommer Nielsen
093546308e Silence the "1 file(s) copied" notice (from copying the manifest file) 2015-06-22 13:56:35 +02:00
Christoph M. Becker
163f51a4cf Fixed bug #61574 - No MSI
The information regarding the Windows installers (.msi) in install.txt are
obsolete, so let's remove them.
2015-06-11 22:54:47 +02:00
Christoph M. Becker
d8223c4424 Fixed bug #61574 - No MSI
The information regarding the Windows installers (.msi) in install.txt are
obsolete, so let's remove them.
2015-06-11 22:52:30 +02:00
Anatol Belski
349cf3229c add error message 2015-06-08 07:06:21 +02:00
Anatol Belski
06332e6706 introduced DllMain for the main php DLL
The particular need on this is because of the current situation
with determining the background functionality for the
gettimeofday. DllMain allows to initialize stuff before the DLL
can be actually used. Thus, we use different time API on win7
and win8 and later, so the function pointer needs to be
initialized before anything in the DLL could even demand it.

The change also opens the door for the further optimizations,
as now we're able to do the very basic initializations for the
whole DLL before it could ever start to live. Fe on this way the
TLS initialization could be done, when utilizing the
DLL_THREAD_ATTACH/DETACH case. Whether it's really usable in
portable way should be synced with other platforms.

Be aware that it's dangerous as it possibly causes dead locks.
So to use with care. One willing to add items to DllMain should
better read the documentation twice and even then try to defer
the necessary action.
2015-06-02 15:56:32 +02:00
Anatol Belski
6fea2f1dd7 fix phpize mode for manifest embedding 2015-05-31 23:03:47 +02:00
Anatol Belski
34bcd69f82 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix phpize mode for manifest embedding
2015-05-31 23:02:01 +02:00
Anatol Belski
f029a2856b fix phpize mode for manifest embedding 2015-05-31 23:01:21 +02:00
Anatol Belski
021effbe97 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  backport the basic code to properly recognize win 8.1 and 10
  backport the manifest changes for makefile
  backport the manifest changes in js
  add default manifest
  add test
2015-05-31 19:32:21 +02:00
Anatol Belski
31d59bf915 backport the manifest changes for makefile 2015-05-31 18:59:00 +02:00
Anatol Belski
50d4ea90b3 backport the manifest changes in js 2015-05-31 18:53:51 +02:00
Anatol Belski
7e731e4d9d add default manifest 2015-05-31 18:17:58 +02:00
Anatol Belski
7ab99ed4b0 manifest for the main php dll needs to be copied manually 2015-05-29 00:29:25 +02:00
Anatol Belski
66d57be2b0 pack the default manifest for devel 2015-05-28 23:23:36 +02:00
Anatol Belski
29ca3fad62 add *.manifest to cleanup 2015-05-28 23:23:33 +02:00
Anatol Belski
247fd93de9 correct manifest 2015-05-28 23:23:30 +02:00
Anatol Belski
4bbfa2469e take the default manifest
yet to be reworked for the case some custom manifest were supplied
2015-05-28 23:23:23 +02:00
Anatol Belski
f17b732694 add default manifest 2015-05-28 23:23:21 +02:00
Anatol Belski
2802fdaf0c fixup default versions, just for the case 2015-05-28 23:23:17 +02:00
Kalle Sommer Nielsen
0a173501c8 Fix deplister with VC14, noticed by Jan Ehrhardt 2015-05-28 23:06:49 +02:00
Anatol Belski
58ed12b1a2 update lib versions info 2015-05-27 18:15:43 +02:00
Anatol Belski
fd256be671 remove fastcgi.c from the dll target 2015-05-26 09:03:52 +02:00
Anatol Belski
cf0397ef06 reverted 0512b38 and 1411ca5 2015-05-26 09:02:19 +02:00
Xinchen Hui
49b10ee264 Merge branch 'master' into merge-fastcgi 2015-05-26 14:17:21 +08:00
Anatol Belski
cfadcfc734 cleanup more redundant S_IS* declarations 2015-05-25 18:03:26 +02:00
Anatol Belski
404360f261 pick up sasl auth plugins if there was any in the deps 2015-05-24 23:49:45 +02:00
Anatol Belski
1411ca58b1 implement necessary symbol exports 2015-05-23 20:55:20 +02:00
Xinchen Hui
fef18f4bea Merge branch 'master' into merge-fastcgi 2015-05-23 10:29:45 +08:00
Anatol Belski
fc94fb3e5b Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated NEWS
  added missing GLOB_BRACE support check
  added SKIPIF section to test to make sure that GLOB_BRACE is supported
  fix #69628: complex GLOB_BRACE fails on Windows
  added PHPT to check for bug #69628
2015-05-21 09:47:30 +02:00
Christoph M. Becker
8c6e8e7870 fix #69628: complex GLOB_BRACE fails on Windows 2015-05-21 09:44:15 +02:00
Anatol Belski
eef762d576 Merge branch 'pull-request/1278' 2015-05-21 08:52:41 +02:00
Anatol Belski
5ea429494e add license header 2015-05-20 19:14:09 +02:00
Anatol Belski
fad25c9306 add license header 2015-05-20 19:14:07 +02:00
Anatol Belski
514aa4ef53 remove dead code 2015-05-20 19:14:06 +02:00
Anatol Belski
a6190359ad add vim modelines 2015-05-20 19:14:05 +02:00
Anatol Belski
a233af16b9 add vim modeline 2015-05-20 19:14:04 +02:00
Anatol Belski
5dc7db8ee7 disable unused members in struct rusage 2015-05-20 19:14:02 +02:00
Kalle Sommer Nielsen
958d9505aa long > zend_long (Thanks Anatol) 2015-05-20 16:15:11 +02:00
Kalle Sommer Nielsen
22fc3baa7a Windows support for getrusage()
* See getrusage.c/h for implementation details and limitations
* Tests passes and have had their SKIPIF updated
* psapi.lib is now linked to by default
2015-05-20 15:45:37 +02:00
Xinchen Hui
e383cb4493 Move fastcgi.c to main 2015-05-19 16:04:35 +08:00
Anatol Belski
2027b949ea remove version check
the cause of the recursive inclusion is fixed, it's not compiler
version dependent
2015-05-15 08:20:33 +02:00
Anatol Belski
55f6687237 added the inclusion guard
the vc check can be likely removed, to be checked
2015-05-15 00:15:01 +02:00
Christoph M. Becker
e42aae1e9b fix #69628: complex GLOB_BRACE fails on Windows 2015-05-13 23:47:54 +02:00
Anatol Belski
8f2b0e64d7 add config vars for phpize where conf opts aren't enabled 2015-05-04 16:07:27 +02:00
Anatol Belski
c4f8dd9071 add config vars for phpize 2015-05-04 15:59:14 +02:00
Anatol Belski
110ce301e0 fix compiler check for phpize 2015-05-04 15:13:58 +02:00
Anatol Belski
4923d23469 fix include with vc14 2015-04-22 22:26:06 +02:00
Kalle Sommer Nielsen
4e41decdf2 Fixed Windows build after Dmitry's smart_str change 2015-04-16 16:37:00 +02:00
Anatol Belski
d3f1abc27d catch up with INF handling under VS 2015-04-06 17:01:19 +02:00
Kalle Sommer Nielsen
a7b4f32519 This should be the last of the old VC stuff in the Windows build system, also up the check to require VC11 now 2015-03-29 08:05:42 +02:00
Kalle Sommer Nielsen
60cbef19a2 Drop the VC6 portable version of strtoi64, as it is no longer needed 2015-03-29 07:49:35 +02:00
Kalle Sommer Nielsen
be2111e05e Enable all compiler warnings and linker warnings for debug builds on Windows. This is a slightly modified version of the patch in #55709 2015-03-29 06:06:24 +02:00
Kalle Sommer Nielsen
8153286efe Drop zend_indent() as it was never used, complete or working 2015-03-27 20:04:46 +01:00
Anatol Belski
5539cb5972 indicate if an ext was forced shared globally 2015-03-23 15:09:04 +01:00
Anatol Belski
f195870a9e implemented --with-all-shared option 2015-03-23 15:09:01 +01:00
Anatol Belski
585a5748e8 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated libs versions
  updated libs versions
2015-03-23 08:39:33 +01:00
Anatol Belski
c2ec4f90d2 updated libs versions 2015-03-23 08:38:58 +01:00
Anatol Belski
a52385fc02 updated libs versions 2015-03-23 08:35:36 +01:00
Stanislav Malyshev
3d00867bba Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  update news
  Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM configuration options)
2015-03-17 13:09:08 -07:00
Stanislav Malyshev
4a2e613730 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM configuration options)
2015-03-17 13:06:17 -07:00
Stanislav Malyshev
bfb669891e Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM configuration options) 2015-03-17 13:05:43 -07:00
Anatol Belski
56b0ff0e5d Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  Fixed bug #65406 Enchant broker plugins are in the wrong place in windows
2015-03-17 09:22:11 +01:00
Anatol Belski
a6a58dddc3 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #65406 Enchant broker plugins are in the wrong place in windows
2015-03-17 09:20:54 +01:00
Anatol Belski
0f18a15e89 Fixed bug #65406 Enchant broker plugins are in the wrong place in windows 2015-03-17 09:20:16 +01:00
Anatol Belski
206481cd01 create php prefix before copying dlls 2015-03-12 15:25:43 +01:00
Anatol Belski
8cc8d4830a Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  create the php prefix if doesn't exist
2015-03-12 15:21:33 +01:00
Anatol Belski
6b643f0741 create the php prefix if doesn't exist 2015-03-12 15:20:53 +01:00
Anatol Belski
6c5d7c29f7 properly deinit mail socket 2015-03-11 21:46:42 +01:00
Anatol Belski
cf4c60b372 use proper value to check the log_source handle 2015-03-11 21:46:41 +01:00
Anatol Belski
ea2e197224 fix leaking registry key handle 2015-03-10 09:10:24 +01:00
Stanislav Malyshev
fdc46d790b Merge branch 'pull-request/1070'
* pull-request/1070:
  More docs for /win32/build/confutils.js
  Adding some inline docs/docs cleanup
2015-03-08 16:46:15 -07:00
Anatol Belski
9577a20b3b fix invalid write 2015-03-06 16:42:31 +01:00
Anatol Belski
01ccfb7cc9 fix ini registry handling 2015-03-04 19:27:45 +01:00
Anatol Belski
fc5d9175b6 ensure the mail() socket is not leaked after request 2015-03-04 10:24:44 +01:00
Anatol Belski
2841aa95db fix thread safety for win32/sendmail 2015-03-03 20:42:28 +01:00
Anatol Belski
82fd62df19 avoid this pointers play 2015-03-03 19:30:15 +01:00
Anatol Belski
2f79fd8d43 use correct free api 2015-03-03 18:09:28 +01:00
Anatol Belski
cddde315c7 Fixed bug #69154 Access violation in php7.dll!_emalloc
one more invalid free
2015-03-03 17:19:17 +01:00
Anatol Belski
74813e6f04 fix socket leaking and better connection err check 2015-03-03 17:19:15 +01:00
Anatol Belski
30830bcefd Fixed bug #69115 crash in mail
There were two issues

- php_pcre_replace could be used directly and sbject_str could be NULL
- the Windows sendmail variant was freeing something passed from the outside
2015-02-27 10:42:20 +01:00
Anatol Belski
3fd613effb removed duplicated code
the exact same function is already used in ext/standard/flock_compat.*
2015-02-21 14:27:14 +01:00
Sobak
b97a9a8098 Drop ZE1-compat leftover 2015-02-20 15:29:54 +01:00
Nikhil Vimal
27defce2bc More docs for /win32/build/confutils.js
Just adding a few more docs
2015-02-16 23:19:47 -06:00
Dmitry Stogov
1eb4352143 Use new ZEND_HASH_FOREACH_... API. 2015-02-10 15:43:12 +03:00
Dmitry Stogov
4241a090ad Avoid reallocation in preg_replace() if nothing was replaced 2015-02-10 13:30:25 +03:00
Nikhil Vimal
616bf6601c Adding some inline docs/docs cleanup 2015-02-09 05:41:49 -06:00
Anatol Belski
1463115e7e Merge branch 'PHP-5.6'
* PHP-5.6:
  fix timelib build configuration

Conflicts:
	ext/date/config.w32
	ext/date/config0.m4
	win32/build/config.w32
	win32/build/config.w32.phpize.in
2015-01-21 16:26:36 +01:00
Anatol Belski
24157f396c fix timelib build configuration 2015-01-21 16:22:23 +01:00
Anatol Belski
35bfa022f9 Merge branch 'PHP-5.6'
* PHP-5.6:
  make timelib_config.h inclusion configurable

Conflicts:
	win32/build/config.w32
	win32/build/config.w32.phpize.in
2015-01-21 13:55:07 +01:00
Anatol Belski
bd52f4a833 make timelib_config.h inclusion configurable 2015-01-21 13:48:38 +01:00
Anatol Belski
fecbb0e7c2 don't error x86 compiler 2015-01-20 20:52:45 +01:00
Anatol Belski
ea689b96a7 cleanup 2015-01-16 11:40:14 +01:00
Xinchen Hui
fc33f52d8c bump year 2015-01-15 23:27:30 +08:00
Xinchen Hui
0579e8278d bump year 2015-01-15 23:26:37 +08:00
Xinchen Hui
73c1be2653 Bump year 2015-01-15 23:26:03 +08:00
matbech
27efc2b2ce Bug fix for wrong regex in mail
The wrong string PHP_WIN32_MAIL_UNIFY_REPLACE instead of PHP_WIN32_MAIL_UNIFY_PATTERN is used for the regex.
2015-01-15 15:07:10 +01:00
Xinchen Hui
2193de0d18 Faster sorting algo 2015-01-14 18:02:41 +08:00
Anatol Belski
2752b409b3 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated libs_versions.txt
  updated libs_versions.txt
  Fix bug #68784
  Fix bug #68784
  We can't output absolute S and T values for the Diophantine solution here since it can vary based on the libgmp version we are linking against and in general there are almost always multiple valid solutions
  We can't output absolute S and T values for the Diophantine solution here since it can vary based on the libgmp version we are linking against and in general there are almost always multiple valid solutions
2015-01-12 13:00:45 +01:00
Anatol Belski
344a61a613 updated libs_versions.txt 2015-01-12 12:59:59 +01:00
Anatol Belski
7a2dbc0e7c Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated libs_versions.txt
  Fix bug #68784
  We can't output absolute S and T values for the Diophantine solution here since it can vary based on the libgmp version we are linking against and in general there are almost always multiple valid solutions
2015-01-12 12:58:37 +01:00
Anatol Belski
2923f24042 updated libs_versions.txt 2015-01-12 12:58:00 +01:00
Stanislav Malyshev
b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Kalle Sommer Nielsen
c0b56232ba Be verbose if --with-mp is enabled 2014-12-28 19:40:33 +01:00
Anatol Belski
60d491c970 throw error in configure.js when no 64-bit compiler detected 2014-12-23 14:06:30 +01:00