Commit Graph

675 Commits

Author SHA1 Message Date
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
Anatol Belski
88bb9fedc4 Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (111 commits)
  Fix zend_fcall_info_arg*() to use ZVAL_COPY
  Fixed #65213 - cannot cast SplFileInfo to boolean
  add initial install
  switch to C travis project instead of PHP
  use the generic TRAVIS environment var to check for travis (see http://docs.travis-ci.com/user/ci-environment/)
  fix TS build
  add config option to target codegen architectures
  updated NEWS
  updated NEWS
  Fixed bug #55541 errors spawn MessageBox, which blocks test automation
  Get rid of duplicate handlers (ZEND_ADD_SPEC_TMP_TMP and ZEND_ADD_SPEC_VAR_VAR are absolutely the same).
  Use zend_string* for op_array->arg_info[]->name and op_array->arg_info[]->class_name. For internal functions we still use char*.
  Fixed __debugInfo() support
  Update UPGRADING for the new variadic functions, and re-sort.
  Improved POST INC/DEC
  make sure that we don't truncate the stack trace and cause false test failures when the test is executed in a directory with long path
  Missed closed folder mark
  Revert "Unecessary assignment"
  Fixed improper memory release
  Unecessary assignment
  ...
2014-12-05 03:50:02 +01:00
Anatol Belski
00ac1ae53c add config option to target codegen architectures 2014-12-03 19:20:36 +01:00
Anatol Belski
ad1967dec5 add /nologo to ARFLAGS 2014-12-02 10:02:20 +01:00
Anatol Belski
f15463bf39 silence the lib.exe 2014-12-02 09:15:07 +01:00
Anatol Belski
67f1d2ae26 Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
  updated lib versions
  updated lib versions
2014-11-26 09:51:39 +01:00
Anatol Belski
6e56c13517 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated lib versions
  updated lib versions
2014-11-26 08:35:29 +01:00
Anatol Belski
fe92a811ed updated lib versions 2014-11-26 08:35:00 +01:00
Anatol Belski
1414f2c095 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated lib versions
2014-11-26 08:33:32 +01:00
Anatol Belski
68126a76b4 updated lib versions 2014-11-26 08:33:06 +01:00
Anatol Belski
c6bad96f30 Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (398 commits)
  NEWS
  add test for bug #68381
  Fixed bug #68381 Set FPM log level earlier during init
  proper dllexport
  move to size_t where zend_string is used internally
  fix some datatype mismatches
  return after the warning, to fix uninitialized salt usage
  fix datatype mismatches
  add missing type specifier
  fix datatype mismatches
  fix unsigned check
  "extern" shouldn't be used for definitions
  joined identical conditional blocks
  simplify fpm tests
  SEND_VAR_NO_REF optimization
  Add test for bug #68442
  Add various tests for FPM - covering recent bugs (68420, 68421, 68423, 68428) - for UDS - for ping and status URI - for multi pool and multi mode
  Include small MIT FastCGI client library from https://github.com/adoy/PHP-FastCGI-Client
  Get rid of zend_free_op structure (use zval* instead). Get rid of useless TSRMLS arguments.
  Add new FPM test for IPv4/IPv6
  ...

Conflicts:
	win32/build/config.w32
2014-11-18 21:18:52 +01:00
Anatol Belski
1ae7743a07 less spaces in the makefile generated commands 2014-11-14 17:39:43 +01:00
Anatol Belski
034a88135f separate LDFLAGS and ARFLAGS to fix the unknown opts warns 2014-11-14 17:39:42 +01:00
Anatol Belski
50825aa879 extend warn list to exclude 2014-11-13 19:57:31 +01:00
Anatol Belski
9b19f516a5 add a configure option to suppress uncritical warns with clang 2014-11-13 11:43:01 +01:00
Anatol Belski
b6c8349be0 pass vc++ version to clang, that will be forwarded to _MSC_VER 2014-11-13 11:20:09 +01:00
Anatol Belski
191fe09e33 HAVE_STRNLEN should be in all toolsets 2014-11-13 10:47:57 +01:00
Anatol Belski
8644f4624c set the vc++ next name 2014-11-13 08:18:40 +01:00
Anatol Belski
4d7a21d0f2 pre create the build dir
otherwise response file generation might fail
2014-11-12 19:06:09 +01:00
Anatol Belski
15f419a635 trim when adding flags, avoid multiple spaces 2014-11-12 17:57:18 +01:00
Anatol Belski
988112a2e1 use response files for exts and sapi linking 2014-11-12 17:57:17 +01:00
Anatol Belski
1acbcdeb27 generate response files for use by linker
Object dir path can under circumstances cause that the expanded
command line exceeds the length allowed by the OS. Linker can read
the object lists from a file which eliminates this issue.
2014-11-12 17:57:17 +01:00
Anatol Belski
79c61c71c2 generalize arch setup 2014-11-12 17:57:16 +01:00
Anatol Belski
524f854193 eliminate duplicated identical function definitions 2014-11-11 18:24:21 +01:00
Anatol Belski
9757d9adbf generalize --with-php-build option handling 2014-11-11 18:24:20 +01:00
Anatol Belski
c0db5cd93d refactor zts related config 2014-11-11 18:24:19 +01:00
Anatol Belski
6d215f8cee fix trailing slash 2014-11-11 00:51:21 +01:00
Anatol Belski
d509e79d70 further fixes to win build
- fixed pdb generation with vs
- made object-out-dir to use an absolute path, that fixes path issues
  with x86/x64 and nmake snap
2014-11-11 00:38:37 +01:00
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
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
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
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
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
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
4b3e198023 removed *.dsw and *.dsp files 2014-09-28 19:02:09 +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
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
cf0303e782 Replaces php5 with php7, without whitespace changes. 2014-09-20 10:01:44 +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
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
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
Xinchen Hui
235d0241d1 Merge branch 'PHP-5.5' into PHP-5.6 2014-07-25 10:52:41 +08: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
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
Anatol Belski
41009b40e0 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  added headers install to phpize mode
2014-07-14 09:53:34 +02:00
Anatol Belski
79b91e3c5a Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  added headers install to phpize mode
2014-07-14 09:53:16 +02:00
Anatol Belski
04821a1ee6 added headers install to phpize mode 2014-07-14 09:52:39 +02:00
Anatol Belski
c79a6a0613 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix makefile in phpize mode
2014-07-11 15:07:22 +02:00
Anatol Belski
b10ed89dac Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix makefile in phpize mode
2014-07-11 15:06:56 +02:00
Anatol Belski
ae313b6037 fix makefile in phpize mode
- extend LDFLAGS with dynamically generated ones
- prevend dynamically generated CFLAGS to be overridden by hardcoded ones
2014-07-11 15:05:01 +02:00
Anatol Belski
e0d6ed6b21 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fixe output_as_table() when no ext was enabled
2014-07-11 09:38:44 +02:00
Anatol Belski
f3d565f6ac Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fixe output_as_table() when no ext was enabled
2014-07-11 09:37:19 +02:00