delta/php-git.git/sapi/apache2handler, branch native-tls

Merge remote-tracking branch 'origin/master' into native-tls

2014-12-16T09:21:05+00:00

* origin/master:
  fix perm again...
  cleanup uneeded cast
  fix bad pointer cast in ext/phar, fix segfault and failed tests (bigendian)

Conflicts:
	ext/phar/func_interceptors.c
	ext/phar/phar_object.c
	sapi/apache2handler/sapi_apache2.c

cleanup uneeded cast

2014-12-16T09:06:32+00:00

Merge remote-tracking branch 'origin/master' into native-tls

2014-12-15T12:57:43+00:00

* origin/master:
  made the apache ini holders to be zend_bool
  Removed useless local variable
  Use simpler functions
  Fixed test
  small fixes to UPGRADING
  Reorder to save alignment size (of course, only for common used structs)

made the apache ini holders to be zend_bool

2014-12-15T12:49:46+00:00

since they're documented to be so and we spare 16 byte

first shot remove TSRMLS_* things

2014-12-13T22:06:14+00:00

Merge remote-tracking branch 'origin/master' into native-tls

2014-12-06T20:37:15+00:00

* 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
  ...

Fix zpp call in apache_getenv()

2014-12-06T11:38:56+00:00

Merge remote-tracking branch 'origin/master' into native-tls

2014-11-18T20:18:52+00:00

* 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

fix unsigned check

2014-11-18T12:19:48+00:00

don't define tsrm ls in SAPIs under linux

2014-10-15T14:55:47+00:00

as it's compiled statically with the core