Commit Graph

1285 Commits

Author SHA1 Message Date
Anatol Belski
64c081f347 moved libs and debug/release mode setup into functions 2014-11-10 23:30:16 +01:00
Anatol Belski
744fb45217 better description for the toolset config option 2014-11-10 10:58:21 +01:00
Anatol Belski
25e75cd091 use proper declarations for zend_stat_t 2014-11-10 10:58:20 +01:00
Anatol Belski
12cf41ca35 move more common ldflags into function 2014-11-07 19:58:30 +01:00
Anatol Belski
af7e3064f3 rename intel toolset to icc - shorter 2014-11-07 19:24:17 +01:00
Anatol Belski
2e5cba25e8 either ms or intel linker is used, /libpath is supported 2014-11-07 18:39:03 +01:00
Anatol Belski
fc734cf95d further catch up with phpize and improved clang arch setup 2014-11-07 18:33:37 +01:00
Anatol Belski
cfd2b39c18 add /fallback for clang-cl 2014-11-07 14:36:13 +01:00
Anatol Belski
c78c6adbd5 parametrize WINVER and update its value 2014-11-07 14:07:33 +01:00
Anatol Belski
b155ba21bd further refactoring of toolset+phpize stuff 2014-11-07 13:48:29 +01:00
Anatol Belski
4d8c28af60 catch up the toolset changes with phpize
also packed common parts into functions so there's less code duplication
2014-11-07 11:48:03 +01:00
Anatol Belski
46d6baf6a0 fix linking for clang, using linker directly 2014-11-07 10:18:11 +01:00
Anatol Belski
1310bb5e2e using the determined linker instead of compiler
this is a clang issue, longer parameter strings would be issue for both
compiler and linker
2014-11-07 10:18:03 +01:00
Anatol Belski
ac71c5812b fix x64 recognition for clang and icc 2014-11-07 10:18:02 +01:00
Anatol Belski
cd2aa28a7d basic support for Intel Composer 2014-11-07 10:18:01 +01:00
Anatol Belski
876c7c451c build system to support clang 2014-11-07 10:18:00 +01:00
Anatol Belski
f2ad1fb3c9 fix preprocessor conditions 2014-11-06 14:03:42 +01:00
Anatol Belski
bea7d06b79 fix comment 2014-11-06 13:55:58 +01:00
Anatol Belski
f5092bd304 final name for vc14 isn't yet set 2014-11-06 13:50:19 +01:00
Anatol Belski
1b4e9c2713 Merge branch 'pull-request/869'
* pull-request/869:
  Various fixes to allow support for new VS2014 features  - Added some typeof checks to handle JS errors introduced in VS2014  - Added VS2014 to the list of compilers  - Changed to use stdint.h if we are using VS2014 or higher  - Skip defining timespec if we're using VS2014 or higher  - Moved u_char typedef out to always be defined regardless of VS version
2014-11-06 13:42:24 +01:00
Chris Tankersley
6b0eca060f Various fixes to allow support for new VS2014 features
- Added some typeof checks to handle JS errors introduced in VS2014
 - Added VS2014 to the list of compilers
 - Changed to use stdint.h if we are using VS2014 or higher
 - Skip defining timespec if we're using VS2014 or higher
 - Moved u_char typedef out to always be defined regardless of VS version
2014-11-05 18:00:09 -05:00
Anatol Belski
842a98ef32 fix datatype mismatch warn 2014-10-29 15:30:02 +01:00
Anatol Belski
9fd0364576 fix datatype mismatch warnings 2014-10-29 15:30:01 +01:00
Anatol Belski
1770ae641b fix datatype mismatches 2014-10-28 17:24:55 +01:00
Anatol Belski
77ab77fd02 fix datatype mismatch 2014-10-28 17:24:54 +01:00
Anatol Belski
e048426402 fix datatype mismatch 2014-10-28 17:24:53 +01:00
Anatol Belski
8aeffdd74c moved most of the core to use static tsrm ls cache pointer
plus apache2handler, cli and cgi
2014-10-15 16:33:40 +02:00
Anatol Belski
c00424e427 bring back all the TSRMLS_FETCH() stuff
for better comparability with the mainstream
2014-10-15 09:37:55 +02:00
Anatol Belski
fe42847799 Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
  let phpize profit from /mp as well
  fix phpize for /mp and more
  fix /mp usage for VC++
  fix wording
2014-10-08 11:39:54 +02:00
Anatol Belski
db6cc049ad let phpize profit from /mp as well 2014-10-08 11:14:23 +02:00
Anatol Belski
9a3af83ee2 fix phpize for /mp and more 2014-10-08 11:01:15 +02:00
Anatol Belski
892efcfc3d fix /mp usage for VC++ 2014-10-08 10:59:15 +02:00
Anatol Belski
b129fecef2 fix wording 2014-10-08 09:01:46 +02:00
Anatol Belski
b946348969 enable static tsrm ls cache in ext/standard 2014-10-05 19:49:41 +02:00
Anatol Belski
ee4ae7fbc3 Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
  remove the remains of dsp files handling
  fix EX usage
  remove misprint parentheses
  remove misprint parentheses
  Replaced EG(This) and EX(object) with EX(This). Internal functions now recieves zend_execute_data as the first argument.
  And this one...
  It should be in extern c
  Remove useless condition
  NEWS entry for previous commit
  NEWS entry for previous commit
  add IPv6 support to php-fpm
  Micro optimization for the most frequency case
  Add hash to EXTENSIONS file
  Remove extensions which are long gone
  we also have xz release tarballs since 5.5
  Fix ZTS build
  improved file size computation in stat()
  Fixed incorrect compilation
  5.5.19 now
2014-10-03 20:30:49 +02:00
Anatol Belski
1ff094deb4 remove the remains of dsp files handling 2014-10-03 19:38:40 +02:00
Anatol Belski
76081df168 using pointer to the tsrm ls cache instead of a function call
yet another approach
2014-10-01 22:04:21 +02:00
Anatol Belski
d624b0d5eb Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (26 commits)
  Micro optimization
  Drop unused INIT_STRING opcode
  Drop unused RAISE_ABSTRACT_ERROR opcode
  CT substitute unqualified true/false/null in namespaces
  Fix a couple compile warnings
  fix test filename
  one more test to illustrate transfer of an arbitrary data amount throug pipes
  fix tests on linux
  better test cleanup
  Use more readable inline functions
  increase the polling period to not to break existing behaviours
  updated NEWS
  Fixed bug #51800 proc_open on Windows hangs forever
  Fixed segfault
  Set an LDAP error code when failing ldap_bind due to null bytes
  Fix segmentation fault in debug_backtrace()
  Drop support for GMP 4.1
  Make gmp_setbit and gmp_clrbit return values consistent
  removed *.dsw and *.dsp files
  Opcache compatibility for coalesce operator
  ...
2014-10-01 01:33:46 +02:00
Anatol Belski
4b3e198023 removed *.dsw and *.dsp files 2014-09-28 19:02:09 +02:00
Anatol Belski
d6096f6036 cleanup TSRMLS_FETCH in win32 2014-09-26 13:30:08 +02:00
Anatol Belski
d11734b4b0 reworked the patch, less new stuff but worky
TLS is already used in TSRM, the way exporting the tsrm cache through
a thread local variable is not portable. Additionally, the current
patch suffers from bugs which are hard to find, but prevent it to
be worky with apache. What is done here is mainly uses the idea
from the RFC patch, but

- __thread variable is removed
- offset math and declarations are removed
- extra macros and definitions are removed

What is done merely is

- use an inline function to access the tsrm cache. The function uses
  the portable tsrm_tls_get macro which is cheap
- all the TSRM_* macros are set to placebo. Thus this opens the way
  remove them later

Except that, the logic is old. TSRMLS_FETCH will have to be done once
per thread, then tsrm_get_ls_cache() can be used. Things seeming to be
worky are cli, cli server and apache. I also tried to enable bz2
shared and it has worked out of the box. The change is yet minimal
diffing to the current master bus is a worky start, IMHO. Though will
have to recheck the other previously done SAPIs - embed and cgi.

The offsets can be added to the tsrm_resource_type struct, then
it'll not be needed to declare them in the userspace. Even the
"done" member type can be changed to int16 or smaller, then adding
the offset as int16 will not change the struct size. As well on the
todo might be removing the hashed storage, thread_id != thread_id and
linked list logic in favour of the explicit TLS operations.
2014-09-25 18:48:27 +02:00
Anatol Belski
7099736dfa Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
  Fix tests/serialize/bug64146.phpt
  Remove zend_dynamic_array
  Remove static allocator
  Fixed typo
  Fix list() destructuring to special variables
  Remove php_varname_check
  Avoid useless reference counting
  Specialization (only IS_VAR ad IS_CV operands may be references)
  Optimized unset()
  Make error paths to be UNEXPECTED
  Replace IS_OP?_TMP_FREE() with more clear (OP?_TYPE == IS_TMP_VAR)
2014-09-23 00:32:48 +02:00
Nikita Popov
982f02afe6 Remove zend_dynamic_array
This was introduced back in 2000 to test a new hashtable
implementation and is no longer used.
2014-09-22 23:45:13 +02:00
Nikita Popov
02bb637bb8 Remove static allocator
We didn't even compile this file anymore
2014-09-22 23:45:13 +02:00
Anatol Belski
4db75dc853 basic windows fix 2014-09-22 20:58:45 +02:00
Anatol Belski
f2e636de05 pickup the alignment definition 2014-09-22 10:26:49 +02:00
Anatol Belski
aa339d00d8 enable native TLS by default on Windows 2014-09-20 22:12:28 +02:00
Florian MARGAINE
268bcdc1cb Removes accidentally added files. 2014-09-20 18:27:09 +02:00
Florian MARGAINE
8eb7e7bf7f Merge branch 'master' into issue-67910
Conflicts:
	README.PARAMETER_PARSING_API
	ext/gmp/tests/001.phpt
2014-09-20 10:09:21 +02:00
Florian MARGAINE
58ed832fc9 Deletes patch leftovers 2014-09-20 10:03:54 +02:00
Florian MARGAINE
cf0303e782 Replaces php5 with php7, without whitespace changes. 2014-09-20 10:01:44 +02:00
Johannes Schlüter
972badf764 s,PHP 5,PHP 7, 2014-09-20 03:27:40 +02:00
Anatol Belski
2700e248b8 add the missing src file 2014-09-20 01:43:05 +02:00
Johannes Schlüter
d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Anatol Belski
c030ff3e71 switch to using mbrlen with VS 2014-09-13 13:52:10 +02:00
Dmitry Stogov
e51677b2e6 fixed reference counting 2014-09-02 11:24:52 +04:00
Anatol Belski
bc7833ddd2 switch to built-in atanh() on vs2013 and up 2014-09-01 15:45:55 +02:00
Anatol Belski
8a7d434025 fix acosh and asinh on win64 with vs2013+ 2014-09-01 14:21:53 +02:00
Anatol Belski
1c252d5dd4 use stddef.h definitions for uintptr_t and intptr_t 2014-08-28 13:07:47 +02:00
Anatol Belski
b63ab83256 several signature and data type fixes 2014-08-26 13:20:21 +02:00
Anatol Belski
4d997f63d9 master renames phase 3 2014-08-25 20:22:49 +02:00
Anatol Belski
c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Anatol Belski
8d6ef99a39 Merge remote-tracking branch 'php/master' 2014-08-21 09:21:31 +02:00
Anatol Belski
333f093010 Merge branch 'PHP-5.6'
* PHP-5.6:
  avoid clash when stdint.h was included after win32/php_stdint.h
2014-08-21 09:09:47 +02:00
Anatol Belski
d3ca974ff5 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  avoid clash when stdint.h was included after win32/php_stdint.h
2014-08-21 09:09:29 +02:00
Anatol Belski
713e9a7eaa avoid clash when stdint.h was included after win32/php_stdint.h 2014-08-21 09:08:44 +02:00
Anatol Belski
77eb6e7278 Merge branch 'master' of git.php.net:php-src
# By Veres Lajos (2) and Lior Kaplan (1)
# Via Lior Kaplan
* 'master' of git.php.net:php-src:
  Correct typo in comments: 'initialized'
  typofixes
  typofixes
2014-08-17 21:40:39 +02:00
Lior Kaplan
543d5eb495 Merge branch 'PHP-5.6'
* PHP-5.6:
  typofixes

Conflicts:
	ext/spl/php_spl.c
2014-08-17 15:53:33 +03:00
Lior Kaplan
56d02d564e Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  typofixes
2014-08-17 15:51:15 +03:00
Lior Kaplan
be2128c805 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  typofixes
2014-08-17 15:48:22 +03:00
Veres Lajos
3f42f2f5d1 typofixes 2014-08-17 15:44:02 +03:00
Anatol Belski
8ee2a4a9b5 first shot on merging the core fro the int64 branch 2014-08-16 11:16:11 +02:00
Dmitry Stogov
01c8aee7d2 cleanup 2014-08-13 22:18:05 +04:00
Dmitry Stogov
4c716e8b51 Merge branch 'master' into test
* master: (39 commits)
  Add __debugInfo() to UPGRADING.
  fix TS build
  Update NEWS
  Update NEWS
  Update NEWS
  Small tidy ups and raise visibility of GitHub PR process
  Bug #41631: Observe socket read timeouts in SSL streams
  wrap int8_t and int16_t with #ifdef to avoid possible clashes
  - Updated to version 2014.6 (2014f)
  Removed Countable::count() change info from UPGRADE.INTERNALS too
  NEWS and UPGRADING for intdiv()
  Revert "Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option"
  Fixed skip case for intdiv 64-bit test
  Use callback structure
  Add EXPECTF
  Fix handling of multi-result sets with PS...used to clean not only the result set but the whole PS.
  5.5.17 now
  5.4.33-dev now
  Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
  Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
  ...

Conflicts:
	ext/fileinfo/libmagic/softmagic.c
	main/streams/xp_socket.c
2014-08-11 11:38:41 +04:00
Anatol Belski
2cdc1a2b74 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  wrap int8_t and int16_t with #ifdef to avoid possible clashes
2014-08-07 15:22:28 +02:00
Anatol Belski
58088c24eb Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  wrap int8_t and int16_t with #ifdef to avoid possible clashes
2014-08-07 15:21:42 +02:00
Anatol Belski
7189039d65 wrap int8_t and int16_t with #ifdef to avoid possible clashes 2014-08-07 15:20:17 +02:00
Xinchen Hui
235d0241d1 Merge branch 'PHP-5.5' into PHP-5.6 2014-07-25 10:52:41 +08:00
Dmitry Stogov
f2a2fccece Merge branch 'master' into phpng
* master:
  fix nmake snap when ext name is different in target dll
  force atoll macro usage on windows
  Enable $ replacement in exif, ldap, pdo_pgsql and tidy
  See bug #67635
  NEWS
  NEWS
  improve previous, add message during configure
  Fixed bug #67635 php links to systemd libraries without using pkg-config
  Improve fix for #66608
  Fixed segfault with empty break
  New added opcodes don't need to be resloved
  Update NEWS
  Update NEWS
  Update NEWS
  Fixed bug #66827 Session raises E_NOTICE when session name variable is array
  implemented copy libs of core exts in phpize mode
  fix copy the ext dll into the prefix path in phpize mode
  fix default prefix in phpize mode
  fix file with zero size usage in phpize mode

Conflicts:
	Zend/zend_opcode.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/session/session.c
2014-07-22 15:42:17 +04:00
Anatol Belski
a6ecb873b9 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix nmake snap when ext name is different in target dll
2014-07-21 14:47:40 +02:00
Anatol Belski
6fcd8e5865 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix nmake snap when ext name is different in target dll
2014-07-21 14:46:57 +02:00
Anatol Belski
dc3a5d783f fix nmake snap when ext name is different in target dll 2014-07-21 14:45:49 +02:00
Xinchen Hui
9bef96d96e Merge branch 'PHP-5.5' into PHP-5.6 2014-07-19 13:12:36 +08:00
Anatol Belski
982342b057 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  implemented copy libs of core exts in phpize mode
2014-07-18 18:40:09 +02:00
Anatol Belski
c5ccaf1d04 implemented copy libs of core exts in phpize mode 2014-07-18 18:38:57 +02:00
Anatol Belski
f304fb848f Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix copy the ext dll into the prefix path in phpize mode
  fix default prefix in phpize mode
  fix file with zero size usage in phpize mode
2014-07-18 11:40:53 +02:00
Anatol Belski
35b077f53e fix copy the ext dll into the prefix path in phpize mode 2014-07-18 11:39:38 +02:00
Anatol Belski
8044d0680b fix default prefix in phpize mode 2014-07-18 11:36:44 +02:00
Anatol Belski
a8e0a623ec fix file with zero size usage in phpize mode 2014-07-18 11:35:32 +02:00
Xinchen Hui
110bf9c720 Merge remote-tracking branch 'origin/master' into phpng
Conflicts:
	Zend/zend_compile.h
	ext/openssl/xp_ssl.c
2014-07-18 16:25:43 +08:00
Anatol Belski
0662a0b068 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  implemented usage of the non core ext deps in phpize mode
2014-07-17 21:49:08 +02:00
Anatol Belski
b5324acd35 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  implemented usage of the non core ext deps in phpize mode
2014-07-17 21:48:46 +02:00
Anatol Belski
f0a1e410a3 implemented usage of the non core ext deps in phpize mode 2014-07-17 21:47:15 +02:00
Anatol Belski
9308df4f62 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  implemented force usage of generated .h and .js deps in phpize mode
2014-07-17 09:32:31 +02:00
Anatol Belski
1a2c3bd3ad Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  implemented force usage of generated .h and .js deps in phpize mode
2014-07-17 09:26:46 +02:00
Anatol Belski
b3c6089111 implemented force usage of generated .h and .js deps in phpize mode 2014-07-17 09:25:57 +02:00
Anatol Belski
f86177c96f Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  basic routines for phpize mode to
  This test depends on expose_php being on
  Test output relies on expose_php being on
  1.2 is a problematic float to print out Lower the default display precision for this test
  The test output is dependent on expose_php ini
2014-07-16 21:35:04 +02:00
Anatol Belski
7446c81aed Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  basic routines for phpize mode to
2014-07-16 21:34:19 +02:00
Anatol Belski
ce2ad0df18 basic routines for phpize mode to
- generate headers for non core ext defines
- generate js deps for non core exts
2014-07-16 21:33:07 +02:00
Dmitry Stogov
b4c2bd2277 Fixed compilation on Windows 2014-07-15 15:50:42 +04:00