php-src/main
Anatol Belski ba35b22bc4 Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (35 commits)
  Fixed bug #68398 msooxml matches too many archives
  Fix zpp call in apache_getenv()
  Drop unnecessary zval containers
  fixed test
  C89 compat
  add include for missing localeconv_r proto
  updated NEWS
  Fixed bug #65230 setting locale randomly broken
  Fix compilation error (ref #68424)
  Removed useless handlers
  Move checks for references into slow paths of operator functions. Remove duplicate opcode handlers.
  Revert unintentional docblock change
  Restored zip/oci8 PHP 4 code, add PHP 7 checks
  Note macro removal in UPGRADING.INTERNALS
  Removed ZEND_ENGINE_2 checks (and ZE1 code, it's been a decade!)
  Zend Engine 3
  Updated NEWS
  Updated NEWS
  Updated NEWS
  Start adding new attribute to control multi statements
  ...
2014-12-06 21:37:15 +01:00
..
streams Merge branch 'PHP-5.6' 2014-12-01 08:32:12 +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 Removed ZEND_ENGINE_2 checks (and ZE1 code, it's been a decade!) 2014-12-05 19:46:30 +00:00
internal_functions.c.in s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
main.c Merge branch 'PHP-5.6' 2014-12-03 16:49:13 +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-12-05 03:50:02 +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 2014-12-02 09:15:11 +01:00
php_ini.h fix datatype mismatches 2014-12-02 09:15:11 +01: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.5.21 now 2014-11-26 11:31:58 +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 Merge branch 'PHP-5.6' 2014-12-06 12:18:36 +01:00
snprintf.h typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-19 20:23:00 +00:00
spprintf.c Merge branch 'PHP-5.6' 2014-12-06 12:18:36 +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