delta/php-git.git/ext/spl, branch native-tls

second shot on removing TSRMLS_*

2014-12-14T13:07:59+00:00

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

Merge branch 'PHP-5.6'

2014-12-05T09:18:22+00:00

* PHP-5.6:
  Updated NEWS
  Updated NEWS
  Fixed #68479 - Added escape parameter to SplFileObject::fputcsv

Conflicts:
	ext/spl/spl_directory.c

Merge branch 'PHP-5.5' into PHP-5.6

2014-12-05T09:12:08+00:00

* PHP-5.5:
  Updated NEWS
  Fixed #68479 - Added escape parameter to SplFileObject::fputcsv

Fixed #68479 - Added escape parameter to SplFileObject::fputcsv

2014-12-05T09:10:10+00:00

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

2014-12-05T02:50:02+00:00

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

Merge branch 'PHP-5.6'

2014-12-03T23:22:54+00:00

* PHP-5.6:
  Fixed #65213 - cannot cast SplFileInfo to boolean

Conflicts:
	ext/spl/spl_directory.c

Merge branch 'PHP-5.5' into PHP-5.6

2014-12-03T23:21:13+00:00

* PHP-5.5:
  Fixed #65213 - cannot cast SplFileInfo to boolean

Fixed #65213 - cannot cast SplFileInfo to boolean

2014-12-03T23:17:33+00:00