php-src/main
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
..
streams proper dllexport 2014-11-18 15:38:35 +01:00
alloca.c - Fix outside-source-tree builds. Always include generated header files 2005-01-09 21:05:06 +00:00
build-defs.h.in s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
fopen_wrappers.c fix datatype mismatch warnings 2014-10-27 16:38:42 +01:00
fopen_wrappers.h s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
getopt.c Merge branch 'PHP-5.6' 2014-10-27 19:10:43 -07:00
internal_functions_nw.c s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
internal_functions_win32.c s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
internal_functions.c.in s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
main.c add missing type specifier 2014-11-18 13:19:50 +01:00
mergesort.c fix datatype mismatches 2014-10-27 16:38:46 +01:00
network.c fix datatype mismatch and unused var warning 2014-11-11 20:16:13 +01:00
output.c Merge remote-tracking branch 'origin/master' into native-tls 2014-11-18 21:18:52 +01:00
php_compat.h s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
php_content_types.c s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
php_content_types.h s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
php_getopt.h s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
php_globals.h force more static tsrmls cache usage 2014-10-07 09:09:46 +02:00
php_ini.c fix datatype mismatches and warns 2014-10-27 16:38:48 +01:00
php_ini.h s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
php_main.h Merge branch 'PHP-5.6' 2014-10-29 20:04:56 +01:00
php_memory_streams.h s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
php_network.h s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
php_open_temporary_file.c fix datatype mismatch warns 2014-10-27 16:38:51 +01:00
php_open_temporary_file.h s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
php_output.h Merge remote-tracking branch 'origin/master' into native-tls 2014-11-18 21:18:52 +01:00
php_reentrancy.h s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
php_scandir.c fix datatype mismatch 2014-10-28 17:24:50 +01:00
php_scandir.h s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
php_sprintf.c s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
php_stdint.h s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
php_streams.h Merge branch 'PHP-5.6' 2014-10-15 19:41:27 +02:00
php_syslog.h s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
php_ticks.c s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
php_ticks.h s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
php_variables.c fix datatype mismatch 2014-10-27 16:38:52 +01:00
php_variables.h s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
php_version.h 5.6.4 now 2014-10-28 16:00:19 +01:00
php.h reworked the patch, less new stuff but worky 2014-09-25 18:48:27 +02:00
reentrancy.c s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
rfc1867.c fix datatype mismatches 2014-10-27 16:38:53 +01:00
rfc1867.h s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
SAPI.c Merge remote-tracking branch 'origin/master' into native-tls 2014-11-18 21:18:52 +01:00
SAPI.h move SG to use global tsrmls pointer 2014-10-15 18:23:41 +02:00
snprintf.c fix datatype mismatches 2014-11-18 13:19:51 +01:00
snprintf.h Merge branch 'PHP-5.6' 2014-10-18 22:57:44 +02:00
spprintf.c fix datatype mismatch warning 2014-10-27 17:04:44 +01:00
spprintf.h s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
strlcat.c s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
strlcpy.c s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
win32_internal_function_disabled.h s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
win95nt.h adjust pid_t declaration so it doesn't conflict with apache one 2014-11-07 10:18:09 +01:00