Commit Graph

1461 Commits

Author SHA1 Message Date
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
Anatol Belski
bc33171ac6 improved system time function determination
It doesn't need to LoadLibrary and all that stuff every time, but
once on the first access. Also the functions which are not directly
used inlined now.
2014-12-23 13:00:30 +01:00
Anatol Belski
bdeb220f48 first shot remove TSRMLS_* things 2014-12-13 23:06:14 +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
4f3ac2cdbe Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (36 commits)
  NEWS
  adapt test for error message introduce in fix for #68463
  Fix bug #68463 listen.allowed_clients can silently result in no allowed access
  run a few request in this test
  fix test
  fix test
  added info about some other macro changes
  added note about toolset and phpize
  added note about the response files
  split msgfmt_format_intlcalendar_variant*.phpt for ICU 54.1
  split formatter_format*.phpt for ICP 54.1
  split dateformat_timezone_arg_variations*.phpt for ICU 54.1
  split dateformat_get_set_timezone_variant*.phpt for ICU 54.1
  fix icu version to test
  split ext/intl/tests/dateformat_get_set_calendar_variant*.phpt for 54.1
  split dateformat_formatObject_datetime_variant*.phpt for ICU 54.1
  split dateformat_formatObject_calendar_variant*.phpt for ICU 54.1
  split dateformat_create_cal_arg_variant2.phpt for ICU 53.1 and 54.1
  clone dateformat_calendars_variant3.phpt for ICU 54.1
  split collator_get_sort_key_variant3.phpt for icu 54.1
  ...
2014-11-20 15:20:18 +01:00
Veres Lajos
4b9535341a typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-19 20:23:00 +00: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
cf979ca6fe remove unused vars 2014-11-13 19:57:28 +01:00
Anatol Belski
0f7f800d8a added missing type specifier 2014-11-13 19:57:27 +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
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
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
Dmitry Stogov
32e477c98c Merge branch 'master' into phpng
* master: (40 commits)
  Bug #67609: TLS connections fail behind HTTP proxy
  Updated NEWS for #67594
  Updated NEWS for #67594
  Fix #67594 - invisible colon should be stripped off header name
  Updated NEWS for 34407
  Updated NEWS for 34407
  Updated NEWS for 34407
  Fix for bug #34407 - ucwords and title case
  fixed broken merged code
  Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
  fixed broken merged code
  Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
  Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
  Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
  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
  fix makefile in phpize mode
  fixe output_as_table() when no ext was enabled
  fix end of stream exception when generating makefile
  ...

Conflicts:
	ext/standard/http_fopen_wrapper.c
	ext/standard/string.c
	sapi/cli/php_cli_server.c
2014-07-14 11:44:53 +04: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
Anatol Belski
9f5cf7d41a fixe output_as_table() when no ext was enabled 2014-07-11 09:36:44 +02:00
Anatol Belski
63abaa6d69 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix end of stream exception when generating makefile
2014-07-10 22:35:23 +02:00
Anatol Belski
efcc789ef8 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix end of stream exception when generating makefile
2014-07-10 22:34:55 +02:00
Anatol Belski
02b661ecfc fix end of stream exception when generating makefile 2014-07-10 22:33:55 +02:00
Anatol Belski
552cfcc578 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  force ext_dep.js prepend to configure.js in phpize mode
  cleanup file headers.
  Do not kill children process in pre-fork mode when parent process quit.
  update to LSAPI 6.6
  Update LiteSpeed SAPI code to V6.4
  cleanup file headers.
  Do not kill children process in pre-fork mode when parent process quit.
  update to LSAPI 6.6
  Update LiteSpeed SAPI code to V6.4

Conflicts:
	sapi/litespeed/lsapi_main.c
	sapi/litespeed/lsapilib.c
2014-07-10 22:03:45 +02:00
Anatol Belski
cc67cf6322 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  force ext_dep.js prepend to configure.js in phpize mode
  cleanup file headers.
  Do not kill children process in pre-fork mode when parent process quit.
  update to LSAPI 6.6
  Update LiteSpeed SAPI code to V6.4
2014-07-10 21:51:32 +02:00
Anatol Belski
1f90dd3359 force ext_dep.js prepend to configure.js in phpize mode 2014-07-10 21:50:37 +02:00
Anatol Belski
71f4b1e4d9 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  turn off PGO in phpize mode
  Fixed typo in Makefile.frag
  Fixed typo in Makefile.frag
2014-07-10 19:37:12 +02:00
Anatol Belski
ec6b367722 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  turn off PGO in phpize mode
  Fixed typo in Makefile.frag
2014-07-10 19:36:04 +02:00
Anatol Belski
e2b0d97950 turn off PGO in phpize mode 2014-07-10 19:35:26 +02:00
Anatol Belski
a8076b9312 explicitly PHP_ANALYZER=no when no known keyword was passed 2014-07-10 15:20:34 +02:00
Dmitry Stogov
bce6a36c8a Merge branch 'master' into test
* master: (48 commits)
  change locale - looks like not everybody has sl_SI
  Fix bug #66921 - Wrong argument type hint for function intltz_from_date_time_zone
  fix format
  Fix bug #67052 (NumberFormatter::parse() resets LC_NUMERIC setting)
  Make sure the generator script also creates a newline at the end of file
  Add newline at end of file to prevent compilation warning
  Fix handling of session user module custom handlers.
  Reference bug report instead of github issue in NEWS file
  add more exts for Travis
  Update NEWS
  Fix phpdbg.1 man page installation when build != src directory
  BFN for bug #67551 (php://input temp file will be located in sys_temp_dir instead of upload_tmp_dir)
  reorder
  restore API compatibility
  finish
  refactor php_stream_temp_create{,_ex} and use it for the php://input stream
  refactor _php_stream_fopen_{temporary_,tmp}file()
  fix length overflow of HTTP_RAW_POST_DATA
  Update NEWS
  Fixed bug #67215 (php-cgi work with opcache, may be segmentation fault happen)
  ...

Conflicts:
	ext/opcache/zend_accelerator_util_funcs.c
	ext/session/mod_user.c
	ext/spl/spl_array.c
	ext/spl/spl_dllist.c
	ext/standard/file.c
	ext/standard/streamsfuncs.c
	ext/standard/string.c
	main/streams/memory.c
2014-07-07 19:21:23 +04:00
Anatol Belski
9e2d08923f Merge branch 'PHP-5.5' into PHP-5.6 2014-07-02 11:36:00 +02:00
Anatol Belski
131e60ce56 Merge branch 'PHP-5.4' into PHP-5.5 2014-07-02 11:35:42 +02:00
Anatol Belski
5efda71e54 bundle deplister.exe with releases 2014-07-02 11:34:37 +02:00