Commit Graph

1365 Commits

Author SHA1 Message Date
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
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
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
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
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