Compare commits

...
Author SHA1 Message Date
Anatol Belski a72a43c86c some more replacements 2014-08-22 09:28:44 +02:00
Anatol Belski 1b40f4d7b1 yet more replaces 2014-08-18 10:35:12 +02:00
Anatol Belski 3a37100198 more replacements for ng 2014-08-17 21:15:35 +02:00
Anatol Belski c3c83bb078 Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
  Patches #67739
  PHP_INT_MIN and _MAX tests
  NEWS and UPGRADING
  Added PHP_INT_MIN

Conflicts:
	main/main.c
2014-08-04 10:34:07 +02:00
Anatol Belski 616275859e Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport: (51 commits)
  backport the fix for bug #67739
  fix macro
  Fix bug #67705 (extensive backtracking in rule regular expression)
  add test
  Fix bug #67705 (extensive backtracking in rule regular expression)
  Fix wrong lenght size
  Bug #51096 - Remove unnecessary ? for first/last day of
  Moved streams related functions to xp_ssl.c
  Remove duplicate NEWS
  Update NEWS
  Update NEWS
  Update NEWS
  BFN
  BFN
  Fixed bug #67715 (php-milter does not build and crashes randomly).
  We need to turn off any strict mode here for this warning to show up
  Disable restrictions regarding arrays in constants at run-time. For the discussion around it, see the thread on the mailing list: http://www.mail-archive.com/internals@lists.php.net/msg68245.html
  Revert "Fix bug #67064 in a BC safe way"
  Updated NEWS for #67693
  Updated NEWS for #67693
  ...
2014-08-04 10:28:03 +02:00
Anatol Belski 38a4b934ca Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  backport the fix for bug #67739
  Fix bug #67705 (extensive backtracking in rule regular expression)
  add test
  Fix bug #67705 (extensive backtracking in rule regular expression)
2014-08-04 10:04:02 +02:00
Anatol Belski eee03852b6 Merge branch 'PHP-5.6'
* PHP-5.6:
  backport the fix for bug #67739
2014-08-04 09:59:06 +02:00
Anatol Belski d730675be5 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  backport the fix for bug #67739
2014-08-04 09:58:47 +02:00
Anatol Belski 8eeacd3364 Merge branch 'pull-request/756' 2014-08-04 09:47:11 +02:00
Anatol Belski dccbb79445 fix macro 2014-08-04 09:28:36 +02:00
Anatol Belski 860f0ca1aa Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6: (46 commits)
  Fix wrong lenght size
  Bug #51096 - Remove unnecessary ? for first/last day of
  Moved streams related functions to xp_ssl.c
  Remove duplicate NEWS
  Update NEWS
  Update NEWS
  Update NEWS
  BFN
  BFN
  Fixed bug #67715 (php-milter does not build and crashes randomly).
  We need to turn off any strict mode here for this warning to show up
  Disable restrictions regarding arrays in constants at run-time. For the discussion around it, see the thread on the mailing list: http://www.mail-archive.com/internals@lists.php.net/msg68245.html
  Revert "Fix bug #67064 in a BC safe way"
  Updated NEWS for #67693
  Updated NEWS for #67693
  Fixed bug #67693 - incorrect push to the empty array
  add missing entry to NEWS
  add missing entries to NEWS
  add NEWS block for the next RC
  NEWS entry for #67713
  ...

Conflicts:
	Zend/zend_language_parser.y
	ext/odbc/php_odbc.c
	ext/openssl/openssl.c
	ext/spl/spl_directory.c
	ext/spl/spl_iterators.c
	ext/sqlite3/sqlite3.c
	ext/standard/array.c
2014-08-04 09:18:42 +02:00
Stanislav Malyshev fa42a513a4 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix bug #67705 (extensive backtracking in rule regular expression)
  add test
  Fix bug #67705 (extensive backtracking in rule regular expression)
2014-08-04 00:15:38 -07:00
Stanislav Malyshev 12d76b8cce Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  add test
  Fix bug #67705 (extensive backtracking in rule regular expression)

Conflicts:
	ext/fileinfo/data_file.c
	ext/fileinfo/libmagic/softmagic.c
	ext/fileinfo/magicdata.patch
2014-08-04 00:12:43 -07:00
Stanislav Malyshev 28786a2f82 Fix bug #67705 (extensive backtracking in rule regular expression) 2014-08-04 00:09:15 -07:00
Christian Wenz 513d48f2ef Patches #67739
Fixes #67739: Windows 8.1/Server 2012 R2 OS build number reported as 6.2 (instead of 6.3)
2014-08-01 22:38:18 +02:00
Andrea Faulds fe894c2154 PHP_INT_MIN and _MAX tests 2014-08-01 17:01:17 +01:00
Andrea Faulds a2bbc6f985 Merge branch 'PHP_INT_MIN' 2014-08-01 16:29:34 +01:00
Andrea Faulds d6cf8be094 NEWS and UPGRADING 2014-08-01 16:28:20 +01:00
Andrea Faulds 24d7fc2bbc Added PHP_INT_MIN 2014-08-01 14:29:50 +01:00
Andrey Hristov 1d609d2d26 Merge branch 'PHP-5.6' 2014-07-31 21:28:19 +03:00
Andrey Hristov f5deb18b20 Merge branch 'PHP-5.5' into PHP-5.6 2014-07-31 21:28:09 +03:00
Peter Cowburn d5542c4a17 Merge branch 'PHP-5.6'
* PHP-5.6:
  Bug #51096 - Remove unnecessary ? for first/last day of
2014-07-31 14:35:13 +01:00
Peter Cowburn 6a4f0b14eb Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Bug #51096 - Remove unnecessary ? for first/last day of
2014-07-31 14:34:50 +01:00
Tjerk Meesters a41a16c5cd Merge branch 'PHP-5.6'
* PHP-5.6:
  Moved streams related functions to xp_ssl.c
2014-07-31 12:18:19 +08:00
Tjerk Meesters 8f345a7148 Moved streams related functions to xp_ssl.c 2014-07-31 12:17:17 +08:00
Keyur Govande 33ce329f57 Merge branch 'PHP-5.6'
* PHP-5.6:
  Remove duplicate NEWS
  Update NEWS
  Update NEWS
  Update NEWS
2014-07-30 18:50:07 +00:00
Keyur Govande 4383ac04a0 Remove duplicate NEWS 2014-07-30 18:48:43 +00:00
Keyur Govande 33c4b9d5a6 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Update NEWS
  Update NEWS
2014-07-30 18:41:13 +00:00
Keyur Govande 752c40d2ec Update NEWS 2014-07-30 18:38:48 +00:00
Michael Wallner 03f56152e5 Merge branch 'PHP-5.6'
* PHP-5.6:
  BFN
  BFN
  Fixed bug #67715 (php-milter does not build and crashes randomly).
2014-07-30 20:14:40 +02:00
Michael Wallner b3b25e1b70 BFN 2014-07-30 20:14:03 +02:00
Michael Wallner ceadf783fe Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  BFN
  Fixed bug #67715 (php-milter does not build and crashes randomly).
2014-07-30 20:13:39 +02:00
Rasmus Lerdorf e7d921fd0b Merge commit '8b9719d'
* commit '8b9719d':
  We need to turn off any strict mode here for this warning to show up
2014-07-30 12:23:46 -04:00
Rasmus Lerdorf 7fe21ce0f3 Merge commit '8b9719d' into PHP-5.6
* commit '8b9719d':
  We need to turn off any strict mode here for this warning to show up
2014-07-30 12:23:36 -04:00
Bob Weinand 3c0adf2dcd Merge branch 'PHP-5.6' 2014-07-30 18:07:01 +02:00
Bob Weinand d5ddd2dbb2 Disable restrictions regarding arrays in constants at run-time.
For the discussion around it, see the thread on the mailing list:
http://www.mail-archive.com/internals@lists.php.net/msg68245.html
2014-07-30 17:57:07 +02:00
Bob Weinand 354ee12b73 Revert "Fix bug #67064 in a BC safe way"
This reverts commit 1a4a9eede5.

Conflicts:
	ext/standard/array.c
	ext/standard/tests/array/bug67064.phpt
2014-07-30 17:18:05 +02:00
Tjerk Meesters 0dc88c45b8 Merge branch 'PHP-5.6'
* PHP-5.6:
  Updated NEWS for #67693
  Fixed bug #67693 - incorrect push to the empty array
2014-07-30 18:28:23 +08:00
Tjerk Meesters f925892920 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Updated NEWS for #67693
  Fixed bug #67693 - incorrect push to the empty array
2014-07-30 18:27:29 +08:00
Ferenc Kovacs ff5a934f21 Merge branch 'PHP-5.6'
* PHP-5.6:
  add missing entry to NEWS
2014-07-30 11:47:29 +02:00
Ferenc Kovacs 8e13e50267 add missing entry to NEWS 2014-07-30 11:47:14 +02:00
Ferenc Kovacs 83c8cd591c Merge branch 'PHP-5.6'
* PHP-5.6:
  add missing entries to NEWS
2014-07-30 11:27:13 +02:00
Ferenc Kovacs d325a1c523 add missing entries to NEWS 2014-07-30 11:26:55 +02:00
Ferenc Kovacs 3c8cee0171 Merge branch 'PHP-5.6'
* PHP-5.6:
  add NEWS block for the next RC
2014-07-30 10:51:44 +02:00
Ferenc Kovacs 858c076810 add NEWS block for the next RC 2014-07-30 10:51:28 +02:00
Ferenc Kovacs f893b18544 Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS entry for #67713
  update the exception message to better match the actual check
  ReflectionClass::newInstanceWithoutConstructor() should be allowed to instantiate every class except those internal classes with a final __construct()
2014-07-30 10:46:31 +02:00
Ferenc Kovacs d649b785d6 NEWS entry for #67713 2014-07-30 10:45:35 +02:00
Ferenc Kovacs 89b54c2aa5 Merge branch 'newInstanceWithoutConstructor' into PHP-5.6
* newInstanceWithoutConstructor:
  update the exception message to better match the actual check
  ReflectionClass::newInstanceWithoutConstructor() should be allowed to instantiate every class except those internal classes with a final __construct()
2014-07-30 10:23:29 +02:00
Ferenc Kovacs d18b16244c update the exception message to better match the actual check 2014-07-30 10:16:01 +02:00
Ferenc Kovacs d586441d90 ReflectionClass::newInstanceWithoutConstructor() should be allowed to instantiate every class except those internal classes with a final __construct() 2014-07-30 10:08:56 +02:00
Dmitry Stogov 8ad3445713 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed usage after free
2014-07-30 10:40:32 +04:00
Dmitry Stogov 43e956a9a1 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed usage after free
2014-07-30 10:40:06 +04:00
Keyur Govande 0e04d542e9 Merge branch 'PHP-5.6'
* PHP-5.6:
  Undo inadvertent commit of php_version
  Corrected patch for bug #60616
2014-07-30 02:47:44 +00:00
Keyur Govande f0278589e1 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Undo inadvertent commit of php_version
  Corrected patch for bug #60616
2014-07-30 02:41:01 +00:00
Tjerk Meesters 0120a9ca4b Merge branch 'PHP-5.6'
* PHP-5.6:
  Wildcards should only be used in the first name component; fixed comment style
2014-07-29 19:15:20 +08:00
Tjerk Meesters a7dad26c4b Wildcards should only be used in the first name component; fixed comment style 2014-07-29 19:15:01 +08:00
Keyur Govande e7df0af6bd Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix bug #60616 (odbc_fetch_into returns junk at end of multi-byte char fields)
2014-07-28 23:17:23 +00:00
Keyur Govande 9720d92c67 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix bug #60616 (odbc_fetch_into returns junk at end of multi-byte char fields)
2014-07-28 23:16:52 +00:00
Stanislav Malyshev fcd195aa64 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix SOAP for uninitialzed object
2014-07-28 11:38:20 -07:00
Stanislav Malyshev 180db42a90 fix SOAP for uninitialzed object 2014-07-28 11:38:06 -07:00
Stanislav Malyshev f281a315f7 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix NEWS
  Fix missing type checks in various functions
2014-07-28 00:39:24 -07:00
Stanislav Malyshev 7f865ffdd8 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix NEWS
2014-07-28 00:39:00 -07:00
Stanislav Malyshev c41ca94824 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix missing type checks in various functions

Conflicts:
	ext/openssl/openssl.c
2014-07-28 00:37:32 -07:00
Stanislav Malyshev 47a12117c3 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix SPL objects initialization checks
2014-07-26 19:37:37 -07:00
Stanislav Malyshev 90a0d58af8 Fix SPL objects initialization checks 2014-07-26 18:59:16 -07:00
Stanislav Malyshev faaa0ffdc4 Merge branch 'PHP-5.6'
* PHP-5.6:
  Add object initialization checks for sqlite3 classes
2014-07-26 16:58:09 -07:00
Stanislav Malyshev 403eca4173 Add object initialization checks for sqlite3 classes 2014-07-26 16:57:45 -07:00
Ferenc Kovacs 03dcdf5742 Merge branch 'PHP-5.6'
* PHP-5.6:
  Revert "Fix bug #66568: the second arg for unserialize is optional." as we already reverted the introduction of the second arg.
2014-07-25 13:16:31 +02:00
Ferenc Kovacs a68ef0a117 Revert "Fix bug #66568: the second arg for unserialize is optional." as we already reverted the introduction of the second arg.
This reverts commit aefc8f22b3.

Conflicts:
	NEWS
2014-07-25 13:15:27 +02:00
Stanislav Malyshev 7abaac41fd Merge branch 'PHP-5.6'
* PHP-5.6:
  update NEWS
  Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting)
  Fixed Bug #67538 (SPL Iterators use-after-free)
2014-07-24 22:59:01 -07:00
Stanislav Malyshev 3345722354 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  update NEWS
  Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting)
  Fixed Bug #67538 (SPL Iterators use-after-free)
2014-07-24 22:58:29 -07:00
Xinchen Hui ec441ff4ed Merge branch 'PHP-5.6' 2014-07-25 10:52:57 +08:00
Xinchen Hui bad5502ca9 Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6 2014-07-25 10:52:46 +08:00
Xinchen Hui 235d0241d1 Merge branch 'PHP-5.5' into PHP-5.6 2014-07-25 10:52:41 +08:00
Johannes Schlüter 0ac3d8d4f4 Merge branch 'PHP-5.6' 2014-07-24 18:02:00 +02:00
Johannes Schlüter 8d1ec3814e Merge branch 'PHP-5.5' into PHP-5.6 2014-07-24 18:01:35 +02:00
Johannes Schlüter 6fdbb4601f Merge branch 'PHP-5.6' 2014-07-24 16:59:37 +02:00
Johannes Schlüter 210315d5a5 Merge branch 'PHP-5.5' into PHP-5.6 2014-07-24 16:58:50 +02:00
Tjerk Meesters 4b41009064 Merge branch 'PHP-5.6' 2014-07-24 14:40:30 +08:00
Tjerk Meesters aab23cf38e Updated NEWS for #67666 2014-07-24 14:39:18 +08:00
Tjerk Meesters 38e714ece5 Fixed #67666 - Subject altName doesn't match wildcards 2014-07-24 14:36:31 +08:00
Dmitry Stogov 8fb7c4dc08 Merge branch 'PHP-5.6'
* PHP-5.6:
  Removed second zval_copy_ctor()
2014-07-24 01:16:28 +04:00
Dmitry Stogov ea1d5dcacb Removed second zval_copy_ctor() 2014-07-24 01:16:00 +04:00
Dmitry Stogov 39740a33e5 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed crash on self-referencing constant expression (part of a constant AST)
2014-07-24 00:59:42 +04:00
Dmitry Stogov d909b6330e Fixed crash on self-referencing constant expression (part of a constant AST) 2014-07-24 00:37:15 +04:00
Dmitry Stogov 4c37e69957 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed support for constant arrays in context of "const" statement (Zend/tests/constant_expressions_arrays.phpt failed when opcache.protect_memort was set)
2014-07-23 22:49:46 +04:00
Dmitry Stogov c49a06168e Fixed support for constant arrays in context of "const" statement (Zend/tests/constant_expressions_arrays.phpt failed when opcache.protect_memort was set) 2014-07-23 22:47:58 +04:00
Anatol Belski 5cadd9d6d0 Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
2014-07-21 14:57:56 +02:00
Anatol Belski 222d59aeaa Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  fix nmake snap when ext name is different in target dll
2014-07-21 14:57:51 +02:00
Anatol Belski be8f557e77 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  fix nmake snap when ext name is different in target dll
2014-07-21 14:57:19 +02:00
Anatol Belski b39f98cf81 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix nmake snap when ext name is different in target dll
2014-07-21 14:48:06 +02: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 457f1a3ad5 Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
  This test depends on expose_php being on
  fixed broken merged code
  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
  cleanup file headers.
  Do not kill children process in pre-fork mode when parent process quit.
  update year & copyright
  Fix bug #67587: Redirection loop on nginx with FPM
  Fix still broken session test.  Only return true/false.
  Followup fix to custom session save handlers
  Fix handling of session user module custom handlers.
  Update info.c

Conflicts:
	ext/session/mod_user.c
	main/php_content_types.c
2014-07-21 11:35:22 +02:00
Anatol Belski 6ac9e106af Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport: (132 commits)
  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
  Update NEWS
  Fixed bug #66608 (Incorrect behavior with nested "finally" blocks)
  ...

Conflicts:
	main/php_content_types.c
2014-07-21 11:33:09 +02:00
Anatol Belski 6696cbcc9a Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  force atoll macro usage on windows
2014-07-21 10:07:39 +02:00
Anatol Belski 833e466983 Merge branch 'PHP-5.6'
* PHP-5.6:
  force atoll macro usage on windows
2014-07-21 10:01:48 +02:00
Anatol Belski f6d941e4b4 force atoll macro usage on windows 2014-07-21 09:52:52 +02:00
Anatol Belski 0ff7fb02e1 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6: (131 commits)
  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
  Update NEWS
  Fixed bug #66608 (Incorrect behavior with nested "finally" blocks)
  Enable build without atoll (e.g old AIX flavours)
  ...

Conflicts:
	Zend/zend_opcode.c
	ext/date/php_date.c
	ext/mysqli/mysqli.c
	ext/pgsql/pgsql.c
	ext/session/session.c
	ext/spl/spl_array.c
	ext/standard/http_fopen_wrapper.c
	ext/standard/string.c
	sapi/litespeed/lsapi_main.c
2014-07-21 09:26:43 +02:00
Lior Kaplan 128eda843f Merge branch 'PHP-5.6'
* PHP-5.6:
  Enable $ replacement in exif, ldap, pdo_pgsql and tidy
  Update NEWS
2014-07-21 01:50:51 +03:00
Lior Kaplan b131b03dc2 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Enable $ replacement in exif, ldap, pdo_pgsql and tidy
  Update NEWS
2014-07-21 01:49:31 +03:00
Remi Collet a9c8499d4b Merge branch 'PHP-5.6'
* PHP-5.6:
  See bug #67635
2014-07-20 11:16:09 +02:00
Remi Collet d55f23ea5a Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  See bug #67635
2014-07-20 11:15:59 +02:00
Remi Collet 6055a53d34 Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  NEWS
  improve previous, add message during configure
  Fixed bug #67635 php links to systemd libraries without using pkg-config
2014-07-19 18:47:32 +02:00
Remi Collet 0ec8f19975 NEWS 2014-07-19 18:47:14 +02:00
Remi Collet d5d16b6278 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  improve previous, add message during configure
  Fixed bug #67635 php links to systemd libraries without using pkg-config
2014-07-19 18:46:46 +02:00
Xinchen Hui 1c0e22f50c Merge branch 'PHP-5.6' 2014-07-19 17:19:57 +08:00
Xinchen Hui 1d2f232bd2 Merge branch 'PHP-5.5' into PHP-5.6 2014-07-19 17:19:39 +08:00
Xinchen Hui a3e8a10918 Merge branch 'PHP-5.6' 2014-07-19 13:12:56 +08:00
Xinchen Hui cd95347cbc Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6 2014-07-19 13:12:42 +08:00
Xinchen Hui 9bef96d96e Merge branch 'PHP-5.5' into PHP-5.6 2014-07-19 13:12:36 +08:00
Yasuo Ohgaki f19eb82f7c Update NEWS 2014-07-19 10:13:15 +09:00
Yasuo Ohgaki 5ed63b3bfc Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #66827 Session raises E_NOTICE when session name variable is array
2014-07-19 10:00:10 +09:00
Yasuo Ohgaki d0d5a1c444 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #66827 Session raises E_NOTICE when session name variable is array
2014-07-19 09:59:51 +09:00
Anatol Belski af676be066 Merge branch 'PHP-5.6'
* PHP-5.6:
  implemented copy libs of core exts in phpize mode
2014-07-18 18:41:31 +02:00
Anatol Belski 47e640164a Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  implemented copy libs of core exts in phpize mode
2014-07-18 18:40:58 +02:00
Rasmus Lerdorf f8f6bd7a08 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src:
  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
  Update NEWS
  Fixed bug #66608 (Incorrect behavior with nested "finally" blocks)
  Enable build without atoll (e.g old AIX flavours)
  Enable build without atoll (e.g old AIX flavours)
  implemented usage of the non core ext deps in phpize mode
  implemented force usage of generated .h and .js deps in phpize mode
  basic routines for phpize mode to
  Easier to read
  Add some trace info as well as update CLIENT_ flags
  Fix my name in the given credit
  Update NEWS for PR#723 merge
  Add ifdef on ecdh for single_ecdh_use
  fix C89 compat
  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-18 08:14:08 -07:00
Anatol Belski 78f2496f8c Merge branch 'PHP-5.6'
* PHP-5.6:
  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:43:43 +02:00
Anatol Belski f9d5d2abaa Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  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:42:24 +02:00
Xinchen Hui f6f621ef69 Merge branch 'PHP-5.6' 2014-07-18 15:51:24 +08:00
Xinchen Hui 0d01891799 Update NEWS 2014-07-18 15:51:10 +08:00
Xinchen Hui 550b3e4306 Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
2014-07-18 15:48:56 +08:00
Lior Kaplan 46dcd12d53 Merge branch 'PHP-5.6'
* PHP-5.6:
  Enable build without atoll (e.g old AIX flavours)
  Enable build without atoll (e.g old AIX flavours)
2014-07-17 23:11:33 +03:00
Lior Kaplan 84673485f5 Enable build without atoll (e.g old AIX flavours) 2014-07-17 23:10:08 +03:00
Lior Kaplan c186ce8fef Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Enable build without atoll (e.g old AIX flavours)
2014-07-17 23:09:54 +03:00
Anatol Belski 3690e973d2 Merge branch 'PHP-5.6'
* PHP-5.6:
  implemented usage of the non core ext deps in phpize mode
2014-07-17 21:49:23 +02: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 81c42db7b7 Merge branch 'PHP-5.6'
* PHP-5.6:
  implemented force usage of generated .h and .js deps in phpize mode
2014-07-17 09:32:44 +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 eb10f035fc Merge branch 'PHP-5.6'
* PHP-5.6:
  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:18 +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
Andrey Hristov 24381cdeb2 Merge branch 'PHP-5.6' 2014-07-16 19:50:41 +03:00
Andrey Hristov 23554aae19 Easier to read 2014-07-16 19:50:28 +03:00
Andrey Hristov 5d6805d498 Merge branch 'PHP-5.6'
Conflicts:
	NEWS
2014-07-16 19:25:31 +03:00
Andrey Hristov 06f5f65c94 Add some trace info as well as update CLIENT_ flags 2014-07-16 19:24:39 +03:00
Lior Kaplan ef95840550 Fix my name in the given credit 2014-07-16 17:45:23 +03:00
Daniel Lowrey a0cc25bbfb Merge branch 'PHP-5.6' 2014-07-16 00:15:05 -04:00
Daniel Lowrey 33de1dece8 Update NEWS for PR#723 merge 2014-07-16 00:14:22 -04:00
Lior Kaplan cbcbf73fe8 Add ifdef on ecdh for single_ecdh_use
Allows build with OpenSSL < 0.9.8
2014-07-16 00:10:29 +03:00
Anatol Belski 1fef4e87fc Merge branch 'PHP-5.6'
* PHP-5.6:
  fix C89 compat
  This test depends on expose_php being on
  The test output is dependent on expose_php ini
  1.2 is a problematic float to print out Lower the default display precision for this test
  Test output relies on expose_php being on
2014-07-14 20:28:23 +02:00
Anatol Belski 236365a016 fix C89 compat 2014-07-14 20:27:59 +02:00
Rasmus Lerdorf 935bc5795f This test depends on expose_php being on 2014-07-14 08:21:57 -07:00
Rasmus Lerdorf 40955e27f7 This test depends on expose_php being on 2014-07-14 08:21:27 -07:00
Rasmus Lerdorf 5d391be285 The test output is dependent on expose_php ini 2014-07-14 07:17:59 -07:00
Rasmus Lerdorf b270cc9284 1.2 is a problematic float to print out
Lower the default display precision for this test
2014-07-14 07:17:39 -07:00
Rasmus Lerdorf 8d359bbcca Test output relies on expose_php being on 2014-07-14 07:17:12 -07:00
Anatol Belski 61b91ee7db Merge branch 'PHP-5.6'
* PHP-5.6:
  added headers install to phpize mode
2014-07-14 09:53:47 +02: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
Daniel Lowrey 4bdb0120dc Merge branch 'PHP-5.6' 2014-07-12 10:57:30 -04:00
Daniel Lowrey f3bf887e6d Bug #67609: TLS connections fail behind HTTP proxy 2014-07-12 10:51:44 -04:00
Tjerk Meesters 3a9bdafeff Merge branch 'PHP-5.6' 2014-07-12 15:11:18 +08:00
Tjerk Meesters b3948b1d05 Updated NEWS for #67594 2014-07-12 15:11:05 +08:00
Tjerk Meesters 4e3d9a52ac Merge branch 'PHP-5.5' into PHP-5.6 2014-07-12 15:09:47 +08:00
Tjerk Meesters 7de82eaeef Merge branch 'PHP-5.6' 2014-07-12 11:15:03 +08:00
Tjerk Meesters c3f5e2a1f9 Updated NEWS for 34407 2014-07-12 11:14:18 +08:00
Tjerk Meesters 18feaf9416 Merge branch 'PHP-5.5' into PHP-5.6 2014-07-12 11:10:15 +08:00
George Wang e05fb6ee01 fixed broken merged code 2014-07-11 15:02:02 -04:00
George Wang 2d7625a1b8 Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index. 2014-07-11 15:00:36 -04:00
George Wang ca8c94c917 fixed broken merged code 2014-07-11 14:57:55 -04:00
George Wang 84373a69dc Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-07-11 14:40:54 -04:00
George Wang 79d8be35f9 Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index. 2014-07-11 14:38:18 -04:00
Rasmus Lerdorf cf23a2efc5 Test output relies on expose_php being on 2014-07-11 10:59:02 -07:00
Rasmus Lerdorf a6d27b80b3 1.2 is a problematic float to print out
Lower the default display precision for this test
2014-07-11 10:29:40 -07:00
Rasmus Lerdorf e6fae4ca4f The test output is dependent on expose_php ini 2014-07-11 09:12:32 -07:00
Anatol Belski 7eaac0f605 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix makefile in phpize mode
2014-07-11 15:07:39 +02: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 646f0f4e47 Merge branch 'PHP-5.6'
* PHP-5.6:
  fixe output_as_table() when no ext was enabled
2014-07-11 09:38:59 +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 efea4cc3e0 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix end of stream exception when generating makefile
2014-07-10 22:35:41 +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 2f1c11b3e2 Merge branch 'PHP-5.6'
* PHP-5.6:
  cleanup file headers.
  Do not kill children process in pre-fork mode when parent process quit.
  update to LSAPI 6.6
2014-07-10 22:17:46 +02:00
Anatol Belski fbc21af87b Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Conflicts:
	sapi/litespeed/lsapilib.h
2014-07-10 22:15:52 +02:00
Anatol Belski af994df812 Merge branch 'PHP-5.6'
* PHP-5.6:
  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
  update year & copyright

Conflicts:
	sapi/litespeed/lsapilib.h
2014-07-10 22:05:15 +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
George Wang 7f41a34c23 cleanup file headers. 2014-07-10 15:53:47 -04:00
George Wang ad7eae7512 Do not kill children process in pre-fork mode when parent process quit. 2014-07-10 15:53:20 -04:00
George Wang f0b7db6c4e update to LSAPI 6.6
Conflicts:
	sapi/litespeed/lsapi_main.c
2014-07-10 15:52:45 -04:00
George Wang cf78e8324e cleanup file headers. 2014-07-10 15:12:43 -04:00
George Wang 942d64c1c3 Do not kill children process in pre-fork mode when parent process quit. 2014-07-10 14:59:25 -04:00
George Wang dd29cfed0a update year & copyright
Conflicts:
	sapi/litespeed/lsapi_main.c
2014-07-10 14:18:08 -04:00
George Wang 232661bf88 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-07-10 14:14:38 -04:00
George Wang 72e14bfb40 update year & copyright 2014-07-10 14:14:11 -04:00
Anatol Belski e00a4b92a3 Merge branch 'PHP-5.6'
* PHP-5.6:
  turn off PGO in phpize mode
  Fixed typo in Makefile.frag
  Fixed typo in Makefile.frag
2014-07-10 19:37:36 +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 e40ecb937e Merge branch 'PHP-5.6'
* PHP-5.6:
  explicitly PHP_ANALYZER=no when no known keyword was passed
2014-07-10 15:21:24 +02:00
Anatol Belski a8076b9312 explicitly PHP_ANALYZER=no when no known keyword was passed 2014-07-10 15:20:34 +02:00
Stanislav Malyshev 25fe17bdcd Merge branch 'PHP-5.6'
* PHP-5.6:
  5.4.31
  fix unstable test
  5.5.16 now
2014-07-08 21:42:38 -07:00
Stanislav Malyshev f0f6d24bc8 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  5.4.31
  fix unstable test
  5.5.16 now
2014-07-08 21:42:20 -07:00
Stanislav Malyshev 3119b884db Merge branch 'PHP-5.6'
* PHP-5.6:
  update NEWS
2014-07-08 15:05:24 -07:00
Stanislav Malyshev 0ba74fccff update NEWS 2014-07-08 15:05:05 -07:00
Stanislav Malyshev b19c30c1fa Merge branch 'PHP-5.6'
* PHP-5.6:
  fix unstable test
2014-07-08 14:32:45 -07:00
Stanislav Malyshev 062f1482c3 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix unstable test
2014-07-08 14:32:27 -07:00
Stanislav Malyshev f559976be6 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix unstable test
2014-07-08 14:31:40 -07:00
Stanislav Malyshev 1632fbbd14 Merge branch 'pull-request/712'
* pull-request/712:
  Fix bug #67587: Redirection loop on nginx with FPM
2014-07-08 12:55:53 -07:00
Stanislav Malyshev ef2f12ec84 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix bug #67587: Redirection loop on nginx with FPM
  Fix bug #67587: Redirection loop on nginx with FPM
2014-07-08 12:55:35 -07:00
Stanislav Malyshev 35259e1d53 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix bug #67587: Redirection loop on nginx with FPM
2014-07-08 12:55:02 -07:00
Christian Weiske e65e013e15 Fix bug #67587: Redirection loop on nginx with FPM
Redirection will work correctly as long as PATH_INFO is available,
e.g. via the following nginx configuration:

    set $path_info $fastcgi_path_info;
    fastcgi_param PATH_INFO $path_info;
2014-07-08 12:54:57 -07:00
Christian Weiske e76d3cba96 Fix bug #67587: Redirection loop on nginx with FPM
Redirection will work correctly as long as PATH_INFO is available,
e.g. via the following nginx configuration:

    set $path_info $fastcgi_path_info;
    fastcgi_param PATH_INFO $path_info;
2014-07-08 19:03:26 +02:00
Anatol Belski 36644cc71e Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  updated NEWS
  updated NEWS
2014-07-08 10:08:40 +02:00
Anatol Belski b9ead7c67d Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated NEWS
  updated NEWS
2014-07-08 10:08:24 +02:00
Anatol Belski 0d80e6cba0 updated NEWS 2014-07-08 10:08:10 +02:00
Anatol Belski 5391c23511 Merge branch 'PHP-5.6'
* PHP-5.6:
  Backported the patch from bug #67407 into 5.5+
  Backported the patch from bug #67407 into 5.4
  NEWS
  NEWS
  Fix Bug #67530 	error_log=syslog ignored
2014-07-08 09:57:56 +02:00
Anatol Belski 8b3cc726be Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Backported the patch from bug #67407 into 5.5+
  Backported the patch from bug #67407 into 5.4
  NEWS
  NEWS
  Fix Bug #67530 	error_log=syslog ignored

Conflicts:
	sapi/fpm/fpm/fpm_stdio.c
2014-07-08 09:57:36 +02:00
Anatol Belski 4883a60bb3 Merge branch 'pull-request/691' 2014-07-08 09:48:59 +02:00
Remi Collet b26c97b1a2 Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  5.6 have fpm_globals.force_stderr
  Fix Bug #67530 	error_log=syslog ignored
2014-07-08 08:34:15 +02:00
Remi Collet 208ae5498d NEWS 2014-07-08 08:33:48 +02:00
Remi Collet 71a27605f4 5.6 have fpm_globals.force_stderr 2014-07-08 08:33:48 +02:00
Remi Collet 60fd4d445c Fix Bug #67530 error_log=syslog ignored
As for Bug #64915
Systemd use --nodaemonize but need to error_log to file or syslog to be honoured
2014-07-08 08:33:47 +02:00
Sara Golemon 6e9bc95f67 Fix still broken session test. Only return true/false. 2014-07-07 14:30:28 -07:00
Adam Harvey 1a43eac259 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
2014-07-07 20:49:00 +00:00
Adam Harvey 70e9d3e2f9 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
2014-07-07 20:45:01 +00:00
Sara Golemon 7c2489751c Followup fix to custom session save handlers
2d9885c introduced some regressions.  This addresses those.

  * Don't throw return type notice or session write failure when in an exception
  * Fix tests to properly return true/false since null is no longer falsy/successy
  * Rerecord a few tests to accomodate difference in raised warnings
2014-07-07 12:59:54 -07:00
Stanislav Malyshev 888fb3323e Merge branch 'PHP-5.6'
* PHP-5.6:
  create locales and re-add test
2014-07-07 10:42:36 -07:00
Stanislav Malyshev 41448bff7c Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  create locales and re-add test

Conflicts:
	.travis.yml
2014-07-07 10:42:13 -07:00
Stanislav Malyshev fc56aa6829 Merge branch 'PHP-5.6'
* PHP-5.6:
  rm test for now
2014-07-07 09:34:03 -07:00
Stanislav Malyshev 31b395ac68 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  rm test for now
2014-07-07 09:33:05 -07:00
Stanislav Malyshev f0499b86a8 Merge branch 'PHP-5.6'
* PHP-5.6:
  change locale - looks like not everybody has sl_SI
2014-07-07 01:38:04 -07:00
Stanislav Malyshev 432bb7abe5 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  change locale - looks like not everybody has sl_SI
2014-07-07 01:36:24 -07:00
Stanislav Malyshev 70c0410d3d Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix bug #66921 - Wrong argument type hint for function intltz_from_date_time_zone
  fix format
2014-07-07 00:50:15 -07:00
Stanislav Malyshev 04a227dd16 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix bug #66921 - Wrong argument type hint for function intltz_from_date_time_zone
  fix format
2014-07-07 00:50:07 -07:00
Stanislav Malyshev ff52eac5f0 Merge branch 'PHP-5.6'
* PHP-5.6:
  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
2014-07-07 00:38:50 -07:00
Stanislav Malyshev effb2b7a13 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  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
2014-07-07 00:38:38 -07:00
Stanislav Malyshev b3d8f4b24d Merge branch 'PHP-5.6'
* PHP-5.6:
  Reference bug report instead of github issue in NEWS file
2014-07-06 22:16:27 -07:00
Sara Golemon 2d9885c8cb Fix handling of session user module custom handlers.
According to the documentation, returning TRUE from
user based session handlers should indicate success,
while returning FALSE should indicate failure.

The existing logic relied on casting the return value
to an integer and returning that from the function.
However, the internal handlers use SUCCESS/FAILURE
where SUCCESS == 0, and FAILURE == -1, so the following
behavior map occurs:

  return false; => return 0; => return SUCCESS
  return true; => return 1; => return <undefined>

Since the session API checks against FAILURE,
both boolean responses wind up appearing like "not FAILURE".

This diff reasserts boolean responses to behave as
documented and introduces some special handling
for integer responses of 0 and -1 so that code can be
written for older and newer versions of PHP.
2014-07-06 09:40:35 -07:00
Bob Weinand 0378b4caac Reference bug report instead of github issue in NEWS file 2014-07-06 13:34:03 +02:00
Stanislav Malyshev 5b925824ed Merge branch 'PHP-5.6'
* PHP-5.6:
  add more exts for Travis
2014-07-05 22:34:57 -07:00
Stanislav Malyshev 7bb86f8a6b add more exts for Travis 2014-07-05 19:59:26 -07:00
Bob Weinand 2c525b0881 Merge branch 'PHP-5.6' 2014-07-06 01:21:24 +02:00
Bob Weinand 715aea43e4 Update NEWS 2014-07-06 01:20:46 +02:00
Bob Weinand 17658fa7b8 Merge sapi/phpdbg into PHP-5.6 2014-07-06 01:17:50 +02:00
Bob Weinand ba65286fa4 Merge pull request #104 from andytson/feature/rpm-build-fix
Fix phpdbg.1 man page installation when build != src directory
2014-07-06 01:16:03 +02:00
Andy Thompson 07d2272297 Fix phpdbg.1 man page installation when build != src directory 2014-07-05 13:05:05 +01:00
Michael Wallner f9fda21667 Merge branch 'PHP-5.6'
* PHP-5.6:
  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

Conflicts:
	main/php_content_types.c
2014-07-03 20:43:12 +02:00
Michael Wallner 88c1ce3203 BFN for bug #67551 (php://input temp file will be located in sys_temp_dir instead of upload_tmp_dir) 2014-07-03 20:40:41 +02:00
Michael Wallner 155b5d1725 reorder 2014-07-03 20:40:41 +02:00
Michael Wallner deee0011e1 restore API compatibility 2014-07-03 20:40:41 +02:00
Michael Wallner 438b6c5258 finish 2014-07-03 20:40:40 +02:00
Michael Wallner 40bcd909d8 refactor php_stream_temp_create{,_ex} and use it for the php://input stream 2014-07-03 20:40:40 +02:00
Michael Wallner 11e401ab59 refactor _php_stream_fopen_{temporary_,tmp}file() 2014-07-03 20:40:40 +02:00
Michael Wallner 04c6a5b377 fix length overflow of HTTP_RAW_POST_DATA 2014-07-03 20:40:40 +02:00
Xinchen Hui a99e7eeab9 Merge branch 'PHP-5.6' 2014-07-03 14:59:24 +08:00
Xinchen Hui 989cdabe25 Update NEWS 2014-07-03 14:59:14 +08:00
Xinchen Hui 4e16054b7a Merge branch 'PHP-5.5' into PHP-5.6 2014-07-03 14:58:53 +08:00
Xinchen Hui 4ef8a44359 Merge branch 'PHP-5.6' 2014-07-03 10:52:03 +08:00
Xinchen Hui 1f6b877f7a Fixed section 2014-07-03 10:51:24 +08:00
Xinchen Hui 1ffd32b952 Merge branch 'PHP-5.5' into PHP-5.6 2014-07-03 10:51:10 +08:00
Ferenc Kovacs a1c63413cd Merge branch 'PHP-5.6'
* PHP-5.6:
  also add Remi to the QA credits
  add Stas and Julient to the QA credits
2014-07-02 23:36:00 +02:00
Ferenc Kovacs 6ca71b451e also add Remi to the QA credits 2014-07-02 23:35:31 +02:00
Ferenc Kovacs 58598ead2c add Stas and Julient to the QA credits 2014-07-02 23:32:50 +02:00
Ferenc Kovacs f9b3494d99 Merge branch 'PHP-5.6'
* PHP-5.6:
  update the credits
2014-07-02 23:27:54 +02:00
Ferenc Kovacs 3be6f0dc79 update the credits 2014-07-02 23:26:41 +02:00
Nikita Popov 99b95f3eb2 Merge branch 'PHP-5.6' 2014-07-02 22:41:04 +02:00
Nikita Popov a91d1bb9a3 Merge branch 'PHP-5.5' into PHP-5.6 2014-07-02 22:40:45 +02:00
Ferenc Kovacs f574e69889 Merge branch 'PHP-5.6'
* PHP-5.6:
  adding a reproduce script for bug #49184
2014-07-02 22:39:19 +02:00
Ferenc Kovacs 1ef67b8486 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  adding a reproduce script for bug #49184
2014-07-02 22:38:53 +02:00
Nikita Popov 2d4d36d2a0 Merge branch 'PHP-5.6' 2014-07-02 22:35:19 +02:00
Nikita Popov 4827806b9e Merge branch 'PHP-5.5' into PHP-5.6 2014-07-02 22:35:00 +02:00
Adam Harvey 46055f8e99 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix ext/pgsql builds against libpq 7.3.
2014-07-02 12:30:51 -07:00
Adam Harvey c580d9b69c Fix ext/pgsql builds against libpq 7.3.
Fixes bug #67555 (Cannot build against libpq 7.3).
2014-07-02 12:30:06 -07:00
Nikita Popov ac552cccc1 Merge branch 'PHP-5.6' 2014-07-02 17:37:25 +02:00
Nikita Popov 1ea4b17af2 Merge branch 'PHP-5.5' into PHP-5.6 2014-07-02 17:36:27 +02:00
Bob Weinand 6b0beb9df1 Merge branch 'PHP-5.6' 2014-07-02 17:26:44 +02:00
Bob Weinand 1163a7ce24 Mark test as XFAIL until fixed 2014-07-02 17:25:47 +02:00
Bob Weinand c01dcd325d Merge branch 'PHP-5.6' 2014-07-02 12:44:30 +02:00
Bob Weinand 33699a4dab Messed up syntax of tests 2014-07-02 12:43:27 +02:00
Bob Weinand 0870cc8a7c Merge branch 'PHP-5.6' 2014-07-02 12:35:06 +02:00
Bob Weinand 09d1a8aaab Add tests for constant expression arrays
Adding one failing (!) test for now about circular constant references embedded in a constant AST, must be fixed before PHP 5.6 release.
2014-07-02 12:33:46 +02:00
Xinchen Hui 4cec7d479a Merge branch 'PHP-5.6' 2014-07-02 17:58:49 +08:00
Xinchen Hui 05cc46a96b Update NEWs 2014-07-02 17:58:37 +08:00
Xinchen Hui f48f311533 Merge branch 'PHP-5.5' into PHP-5.6 2014-07-02 17:58:11 +08:00
Anatol Belski 4a0f06955d Merge branch 'PHP-5.6' 2014-07-02 11:36:15 +02:00
Anatol Belski 9e2d08923f Merge branch 'PHP-5.5' into PHP-5.6 2014-07-02 11:36:00 +02:00
Anatol Belski df93242957 Merge branch 'PHP-5.6'
* PHP-5.6:
  backported the VC12 fix for ARG_MAX
2014-07-02 11:12:49 +02:00
Anatol Belski b69f369d3d Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  backported the VC12 fix for ARG_MAX
2014-07-02 11:12:32 +02:00
Anatol Belski e98d429cc3 Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master: (25 commits)
  Better fix for bug #67072 with more BC provisions
  Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
  Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
  Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
  Fix bug #67349: Locale::parseLocale Double Free
  Better fix for phpdbg + libedit - fix include - disable coloured prompt only with libedit
  Fix https://github.com/krakjoe/phpdbg/issues/91
  Update copyright year to 2014
  Add NEWS. This doesn't need UPGRADING (or an RFC), IMO.
  Fix broken test.
  Add a mime type map generation script and update the header.
  Move the mime type map out of php_cli_server.c for easier generation.
  Replace the CLI server's linear search for extensions with a hash table.
  fix test
  Fixed bug #67399 (putenv with empty variable may lead to crash)
  Remove superfluous echos.
  Remove usage of pointless COOKIE_SET_COOKIE constant.
  Test
  Added support for parsing ssl certificates using GeneralizedTime format.
  Fix align indentation
  ...

Conflicts:
	ext/standard/head.c
2014-07-02 10:30:36 +02:00
Anatol Belski 84876850ff Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport: (178 commits)
  fix integer overflow in {stream,file}_{get,put}_contents()
  add some missing NEWS entries
  NEWS block for 5.6.0RC3
  Fix ext/pgsql builds with libpq < 7.3.
  updated libs_version.txt
  updated libs_version.txt
  updated libmagic.patch in 5.6+
  updated libmagic.patch
  Fixed possible crash because of race conditions on modifying constants in shared memory
  remove the NEWS entry for the reverted fpm fix
  remove the NEWS entry for the reverted fpm fix
  remove the NEWS entry for the reverted fpm fix
  Revert "Fix Bug #67530 	error_log=syslog ignored"
  --enable-fpm for the travis build
  fix the last fpm NEWS entry, the other bug is related, but not the same what we fixed here
  NEWS
  NEWS
  Fix bug #67091: make install fails to install libphp5.so on FreeBSD 10.0
  adding NEWS entry for the fix for bug #65641
  Updated NEWS file for recent phpdbg fixes
  ...
2014-07-02 10:27:59 +02:00
Anatol Belski 96783bdfb7 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  fix integer overflow in {stream,file}_{get,put}_contents()
  add some missing NEWS entries
  NEWS block for 5.6.0RC3
  Fix ext/pgsql builds with libpq < 7.3.
  updated libs_version.txt
  updated libs_version.txt
  updated libmagic.patch in 5.6+
  updated libmagic.patch

Conflicts:
	ext/standard/file.c
	ext/standard/streamsfuncs.c
2014-07-02 10:22:09 +02:00
Michael Wallner 088eedfaa1 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix integer overflow in {stream,file}_{get,put}_contents()
2014-07-02 09:56:41 +02:00
Michael Wallner 122ee0a1cf Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix integer overflow in {stream,file}_{get,put}_contents()
2014-07-02 09:56:05 +02:00
Ferenc Kovacs ae312d1bca Merge branch 'PHP-5.6'
* PHP-5.6:
  add some missing NEWS entries
2014-07-02 02:19:12 +02:00
Ferenc Kovacs d5d95f8935 add some missing NEWS entries 2014-07-02 02:18:48 +02:00
Ferenc Kovacs 72a182aaa8 Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS block for 5.6.0RC3
2014-07-02 01:39:54 +02:00
Ferenc Kovacs 996fc57515 NEWS block for 5.6.0RC3 2014-07-02 01:39:26 +02:00
Adam Harvey 5a99565d0e Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix ext/pgsql builds with libpq < 7.3.
2014-07-01 13:26:28 -07:00
Adam Harvey d1adf55c15 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix ext/pgsql builds with libpq < 7.3.
2014-07-01 13:25:55 -07:00
Anatol Belski 444486c362 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated libs_version.txt
  updated libs_version.txt
2014-07-01 10:35:16 +02:00
Anatol Belski 765b0ee715 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated libs_version.txt
  updated libs_version.txt
2014-07-01 10:34:55 +02:00
Anatol Belski 1f66da2e75 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated libmagic.patch in 5.6+
  updated libmagic.patch
2014-07-01 10:29:14 +02:00
Anatol Belski 3fd792b3b9 updated libmagic.patch in 5.6+ 2014-07-01 10:28:43 +02:00
Anatol Belski 48746387b3 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated libmagic.patch
2014-07-01 10:28:20 +02:00
Anatol Belski 1a50c27f99 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6: (170 commits)
  Fixed possible crash because of race conditions on modifying constants in shared memory
  remove the NEWS entry for the reverted fpm fix
  remove the NEWS entry for the reverted fpm fix
  remove the NEWS entry for the reverted fpm fix
  Revert "Fix Bug #67530 	error_log=syslog ignored"
  --enable-fpm for the travis build
  fix the last fpm NEWS entry, the other bug is related, but not the same what we fixed here
  NEWS
  NEWS
  Fix bug #67091: make install fails to install libphp5.so on FreeBSD 10.0
  adding NEWS entry for the fix for bug #65641
  Updated NEWS file for recent phpdbg fixes
  Fixed issue krakjoe/phpdbg#94 - List behavior is inconsistent
  Fix issue krakjoe/phpdbg#97 - list now appends a newline if there is none The prompt should always ensure it is on a newline
  Fixed test
  Inform about back command existence in help - Fixes krakjoe/phpdbg#100 No way to list the current stack/frames
  Fix issue krakjoe/phpdbg#98 break if does not seem to work
  Fix issue krakjoe/phpdbg#99 register function has the same behavior as run
  Fix readline/libedit (Thanks to @remicollet)
  Replace incorrect `E` command with `ev` in watch help
  ...

Conflicts:
	Zend/zend_compile.c
	ext/standard/basic_functions.c
	ext/standard/http_fopen_wrapper.c
	ext/standard/var.c
	ext/tokenizer/tokenizer_data.c
	sapi/phpdbg/phpdbg_list.c
2014-07-01 09:10:36 +02:00
Dmitry Stogov 8c9b3e664c Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed possible crash because of race conditions on modifying constants in shared memory
2014-07-01 00:17:55 +04:00
Dmitry Stogov 2330be5641 Fixed possible crash because of race conditions on modifying constants in shared memory 2014-07-01 00:13:34 +04:00
Ferenc Kovacs 2d26a7cf62 Merge branch 'PHP-5.6'
* PHP-5.6:
  remove the NEWS entry for the reverted fpm fix
  remove the NEWS entry for the reverted fpm fix
  remove the NEWS entry for the reverted fpm fix
  Revert "Fix Bug #67530 	error_log=syslog ignored"
2014-06-30 18:39:31 +02:00
Ferenc Kovacs 023d53fea5 remove the NEWS entry for the reverted fpm fix 2014-06-30 18:39:06 +02:00
Ferenc Kovacs d810c2139f Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  remove the NEWS entry for the reverted fpm fix
  remove the NEWS entry for the reverted fpm fix
  Revert "Fix Bug #67530 	error_log=syslog ignored"
2014-06-30 18:38:54 +02:00
Ferenc Kovacs 62b45983f7 Merge branch 'PHP-5.6'
* PHP-5.6:
  --enable-fpm for the travis build
2014-06-30 12:31:25 +02:00
Ferenc Kovacs 3ec93ee19f Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  --enable-fpm for the travis build
2014-06-30 12:30:49 +02:00
Ferenc Kovacs d9dbca8546 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix the last fpm NEWS entry, the other bug is related, but not the same what we fixed here
2014-06-30 02:32:46 +02:00
Ferenc Kovacs 6d8d5e9310 fix the last fpm NEWS entry, the other bug is related, but not the same what we fixed here 2014-06-30 02:32:06 +02:00
Ferenc Kovacs 6858be2e74 Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  NEWS
  Fix bug #67091: make install fails to install libphp5.so on FreeBSD 10.0
2014-06-30 01:35:19 +02:00
Ferenc Kovacs e7c88637c2 NEWS 2014-06-30 01:35:02 +02:00
Ferenc Kovacs d1fb869e78 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  Fix bug #67091: make install fails to install libphp5.so on FreeBSD 10.0
2014-06-30 01:34:47 +02:00
Ferenc Kovacs c73e1f80f5 Merge branch 'PHP-5.6'
* PHP-5.6:
  adding NEWS entry for the fix for bug #65641
  Fix SetHandler proxy:fcgi:// incompatibilities
2014-06-30 01:03:29 +02:00
Ferenc Kovacs 19e5852ad8 adding NEWS entry for the fix for bug #65641 2014-06-30 01:02:22 +02:00
Ferenc Kovacs d96de86b5b Merge branch 'pull-request/694' into PHP-5.6
* pull-request/694:
  Fix SetHandler proxy:fcgi:// incompatibilities
2014-06-30 00:51:59 +02:00
Felipe Pena 82f0b934a9 - CS 2014-06-29 09:57:57 -03:00
Bob Weinand ee6bab61eb Merge branch 'PHP-5.6' 2014-06-29 13:01:11 +02:00
Bob Weinand b1e32a4f7a Updated NEWS file for recent phpdbg fixes 2014-06-29 12:54:33 +02:00
Bob Weinand 1dd3bab1df Merge sapi/phpdbg into PHP-5.6 2014-06-29 12:49:10 +02:00
Bob Weinand 58c69746e5 Fixed issue krakjoe/phpdbg#94 - List behavior is inconsistent 2014-06-29 12:43:51 +02:00
Bob Weinand 4fde0c258e Fix issue krakjoe/phpdbg#97 - list now appends a newline if there is none
The prompt should always ensure it is on a newline
2014-06-29 12:18:39 +02:00
Xinchen Hui fa3243a40a Merge remote branch 'origin/PHP-5.6' 2014-06-29 18:06:44 +08:00
Xinchen Hui 959a006d61 Fixed test 2014-06-29 18:00:31 +08:00
Bob Weinand d298425323 Inform about back command existence in help - Fixes krakjoe/phpdbg#100
No way to list the current stack/frames
2014-06-29 11:55:42 +02:00
Bob Weinand 16ae792988 Fix issue krakjoe/phpdbg#98
break if does not seem to work
2014-06-29 11:42:40 +02:00
Bob Weinand ef77d84061 Merge pull request #102 from dshafik/fix-96
Fix typo in `finish` help
2014-06-29 11:28:44 +02:00
Bob Weinand debc20df80 Merge pull request #101 from dshafik/fix-95
Replace incorrect `E` command with `ev` in watch help
2014-06-29 11:28:33 +02:00
Bob Weinand 986a89ae1b Fix issue krakjoe/phpdbg#99
register function has the same behavior as run
2014-06-29 11:26:27 +02:00
Bob Weinand 219beac36b Fix readline/libedit (Thanks to @remicollet) 2014-06-29 11:26:03 +02:00
Davey Shafik 2e66754408 Replace incorrect E command with ev in watch help
Fixes #95
2014-06-29 04:44:02 -04:00
Davey Shafik 4ac8966030 Fix typo in finish help
Fixes #96
2014-06-29 04:32:01 -04:00
Ferenc Kovacs 6dc56dd8e8 Merge branch 'PHP-5.6'
* PHP-5.6:
  removing the format added by mistake, props to Solar Designer for spotting this.
2014-06-27 16:30:30 +02:00
Ferenc Kovacs 99967ac075 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  removing the format added by mistake, props to Solar Designer for spotting this.
2014-06-27 16:29:35 +02:00
Remi Collet 6fa814cfc3 Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fix Bug #67531 	syslog cannot be set in pool configuration
  Fix Bug #67530 	error_log=syslog ignored
2014-06-27 09:51:52 +02:00
Remi Collet f201d061ba NEWS 2014-06-27 09:51:34 +02:00
Remi Collet 37aa57cd1b Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  NEWS
  Fix Bug #67531 	syslog cannot be set in pool configuration
  Fix Bug #67530 	error_log=syslog ignored
2014-06-27 09:51:15 +02:00
Stanislav Malyshev da7c6b6713 Merge branch 'PHP-5.6'
* PHP-5.6:
  update the date
  better explanation
  more extensive note on unserialize() change
  more extensive note on unserialize() change
2014-06-26 21:18:22 -07:00
Stanislav Malyshev 1255aa9130 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  update the date
  better explanation
2014-06-26 21:18:06 -07:00
Stanislav Malyshev 1d81a1c354 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  more extensive note on unserialize() change
  more extensive note on unserialize() change
2014-06-26 10:40:36 -07:00
Bob Weinand 0b06c8f82b Merge branch 'PHP-5.6' 2014-06-25 13:57:19 +02:00
Bob Weinand 09b2510df6 Merge sapi/phpdbg into PHP-5.6 2014-06-25 13:56:45 +02:00
Bob Weinand 858b45d4ad Merge branch 'master' of https://github.com/oerdnj/phpdbg into master
Rewritten author line and included instructions to make install the man page
2014-06-25 13:31:24 +02:00
Stanislav Malyshev b304a56685 Merge branch 'PHP-5.6'
* PHP-5.6:
  remove bug67072_2 test for 5.6+ since we'd have cleaner solution
  Fix test - because of big #67397 we don't allow overlong locales anymore
2014-06-24 11:24:40 -07:00
Stanislav Malyshev 78c3ca105b remove bug67072_2 test for 5.6+ since we'd have cleaner solution 2014-06-24 11:24:07 -07:00
Stanislav Malyshev b4c046d156 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix test - because of big #67397 we don't allow overlong locales anymore
2014-06-24 11:23:48 -07:00
Stanislav Malyshev d4454ac31b Merge branch 'PHp-5.6'
* PHp-5.6:
  Better fix for bug #67072 with more BC provisions
  Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
  Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
  Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
  Fix bug #67349: Locale::parseLocale Double Free
  update NEWS
  5.4.30
  Better fix for bug #67072 with more BC provisions
  Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
  update CVE
  Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
  Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
  Fix bug #67349: Locale::parseLocale Double Free
  add CVEs
  Fix potential segfault in dns_get_record()
  Fix bug #66127 (Segmentation fault with ArrayObject unset)
  5.4.30 rc1

Conflicts:
	ext/intl/locale/locale_methods.c
2014-06-24 10:33:40 -07:00
Stanislav Malyshev 66cdd8fd76 Better fix for bug #67072 with more BC provisions 2014-06-24 10:32:33 -07:00
Stanislav Malyshev 3804c0d00f Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability 2014-06-24 10:32:12 -07:00
Stanislav Malyshev a374dfab56 Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion 2014-06-24 10:32:11 -07:00
Stanislav Malyshev 2a29add9e4 Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1)) 2014-06-24 10:32:11 -07:00
Stanislav Malyshev 5ecee6ebce Fix bug #67349: Locale::parseLocale Double Free 2014-06-24 10:31:55 -07:00
Stanislav Malyshev 03b3013ca9 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  update NEWS
  5.4.30
  Better fix for bug #67072 with more BC provisions
  Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability
  update CVE
  Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
  Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1))
  Fix bug #67349: Locale::parseLocale Double Free
  add CVEs
  Fix potential segfault in dns_get_record()
  Fix bug #66127 (Segmentation fault with ArrayObject unset)
  5.4.30 rc1
2014-06-24 10:30:56 -07:00
Stanislav Malyshev cfe06eb2b1 Better fix for bug #67072 with more BC provisions 2014-06-24 10:30:03 -07:00
Stanislav Malyshev 84f9fe0fdc Fix bug #67498 - phpinfo() Type Confusion Information Leak Vulnerability 2014-06-24 10:29:26 -07:00
Stanislav Malyshev b03993dde9 Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion 2014-06-24 10:29:26 -07:00
Stanislav Malyshev f48b8f3339 Fix bug #67397 (Buffer overflow in locale_get_display_name->uloc_getDisplayName (libicu 4.8.1)) 2014-06-24 10:29:25 -07:00
Stanislav Malyshev 844a046945 Fix bug #67349: Locale::parseLocale Double Free 2014-06-24 10:29:09 -07:00
Xinchen Hui 18bde665f5 Merge branch 'PHP-5.6' 2014-06-24 13:53:43 +08:00
Xinchen Hui 9d49492fd6 Fixed bug #67368 (Memory leak with immediately dereferenced array in class constant) 2014-06-24 13:53:05 +08:00
Stanislav Malyshev 52cdbc5c10 Merge branch 'PHP-5.6'
* PHP-5.6:
  Better fix for bug #67072 with more BC provisions
  Better fix for bug #67072 with more BC provisions
2014-06-23 22:15:21 -07:00
Stanislav Malyshev 6b8cef7847 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Better fix for bug #67072 with more BC provisions
  Better fix for bug #67072 with more BC provisions

Conflicts:
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
2014-06-23 22:15:01 -07:00
Ondřej Surý 62b6cdbbd7 Add initial manual page for phpdbg.1 2014-06-23 11:35:42 +02:00
Remi Collet 70e29fc24c Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  Better fix for phpdbg + libedit - fix include - disable coloured prompt only with libedit
  Fix https://github.com/krakjoe/phpdbg/issues/91
2014-06-23 10:39:22 +02:00
Remi Collet b3ef019b62 NEWS 2014-06-23 10:39:06 +02:00
Remi Collet 0da5d94a6c Better fix for phpdbg + libedit
- fix include
- disable coloured prompt only with libedit
2014-06-23 10:21:19 +02:00
Remi Collet 0febafcfbe Fix https://github.com/krakjoe/phpdbg/issues/91
Enable edit feature when build with libedit.

Notice: coloured prompt only enable with READLINE
2014-06-23 10:21:19 +02:00
Remi Collet a52b927bf3 Merge branch 'PHP-5.6'
* PHP-5.6:
  Better fix for phpdbg + libedit - fix include - disable coloured prompt only with libedit
  Fix https://github.com/krakjoe/phpdbg/issues/91
2014-06-23 10:18:55 +02:00
Remi Collet 98d41dfc9d Better fix for phpdbg + libedit
- fix include
- disable coloured prompt only with libedit
2014-06-23 10:17:43 +02:00
Ferenc Kovacs f5defa1cf2 Merge branch 'PHP-5.6'
* PHP-5.6:
  testcase for 67468 (only for debug build, as I could not create a stable segfault without loading other exts like pgsql)
  mention 67468 fix in NEWS
  Fix Bug #67468  Segfault in highlight_file()/highlight_string() when pgsql.so module is loaded
2014-06-23 10:14:08 +02:00
Ferenc Kovacs 53158f2c32 testcase for 67468 (only for debug build, as I could not create a stable segfault without loading other exts like pgsql) 2014-06-23 10:10:17 +02:00
Ferenc Kovacs 3058b87783 mention 67468 fix in NEWS 2014-06-23 10:08:32 +02:00
Remi Collet 86bafec836 Fix https://github.com/krakjoe/phpdbg/issues/91
Enable edit feature when build with libedit.

Notice: coloured prompt only enable with READLINE
2014-06-23 10:04:40 +02:00
Andreas Ferber c5e6c2a5f5 Fix Bug #67468 Segfault in highlight_file()/highlight_string() when pgsql.so module is loaded
str_efree() must be used in zend_highlight() and zend_indent() to free
string data assigned to a zval to account for interned strings.
2014-06-23 09:51:44 +02:00
Dmitry Stogov 687fa7d63d Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed MarinaDB support
2014-06-20 14:01:22 +04:00
Dmitry Stogov f08a5bfadc Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed MarinaDB support
2014-06-20 13:58:26 +04:00
Remi Collet ae9db5d0a2 Merge branch 'PHP-5.6'
* PHP-5.6:
  skip this test which fails without network
2014-06-20 06:45:36 +02:00
Remi Collet e9c9169e05 skip this test which fails without network 2014-06-20 06:45:16 +02:00
Ferenc Kovacs 7c20edaade Merge branch 'PHP-5.6'
* PHP-5.6:
  add missing entry to NEWS
2014-06-19 02:29:42 +02:00
Ferenc Kovacs 2f43bc73b6 add missing entry to NEWS 2014-06-19 02:29:27 +02:00
Ferenc Kovacs deb650f182 Merge branch 'PHP-5.6'
* PHP-5.6:
  add missing entry to NEWS
2014-06-19 02:18:52 +02:00
Ferenc Kovacs 00677cd771 add missing entry to NEWS 2014-06-19 02:18:26 +02:00
Ferenc Kovacs 8bca4f0c32 Merge branch 'PHP-5.6'
* PHP-5.6:
  add NEWS block for 5.6.0RC2
2014-06-19 01:35:19 +02:00
Ferenc Kovacs dd9f81dd47 add NEWS block for 5.6.0RC2 2014-06-19 01:34:25 +02:00
Andrey Hristov 2eb42c953d Merge branch 'PHP-5.6'
Conflicts:
	NEWS
2014-06-18 21:54:26 +03:00
Andrey Hristov a886a0cf93 Add support for gb18030/MySQL 5.7 2014-06-18 21:53:34 +03:00
Andrey Hristov 6dd0e8e0fc Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-06-18 18:32:51 +03:00
Andrey Hristov af94a01ebe Merge branch 'master' of git.php.net:php-src 2014-06-18 18:31:07 +03:00
Andrey Hristov 29cef140ed Merge branch 'PHP-5.6' 2014-06-18 18:30:49 +03:00
Andrey Hristov f201bf2305 Fix another problem with MySQL 5.7 2014-06-18 18:30:37 +03:00
Remi Collet e3b74cb168 Merge branch 'PHP-5.6'
* PHP-5.6:
  new test, missing in ea466a3
2014-06-18 16:00:07 +02:00
Remi Collet bf7fed7e41 new test, missing in ea466a3 2014-06-18 15:59:45 +02:00
Andrey Hristov ea1632d697 Merge branch 'PHP-5.6' 2014-06-18 16:45:12 +03:00
Andrey Hristov 23f77050eb Merge branch 'PHP-5.5' into PHP-5.6 2014-06-18 16:42:42 +03:00
Lior Kaplan eba7c77685 Update copyright year to 2014 2014-06-18 00:22:16 +03:00
Lior Kaplan 9d047bb138 Merge branch 'PHP-5.6'
* PHP-5.6:
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
2014-06-18 00:21:20 +03:00
Lior Kaplan b0b47a2064 Update copyright year to 2014 2014-06-18 00:18:47 +03:00
Lior Kaplan 9f727692b6 Update copyright year to 2014
Align with online version at http://www.php.net/license/3_01.txt
2014-06-18 00:16:23 +03:00
Lior Kaplan 1222f51ebd Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
2014-06-18 00:14:18 +03:00
Remi Collet a012c2befa Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  Fix Request #67453 Allow to unserialize empty data.
2014-06-17 09:41:30 +02:00
Remi Collet ba34f0c2e8 NEWS 2014-06-17 09:41:10 +02:00
Remi Collet ea466a316f Fix Request #67453 Allow to unserialize empty data.
SplDoublyLinkedList, SplObjectStorage and ArrayObject have empty
constructor (no arg), so it make sense to allow to unserialize empty
data.

This allow the hack (used in various place, including PHPUnit) to
instanciate class without call to constructor to work.
2014-06-17 09:38:54 +02:00
Lior Kaplan 6e0a9b4588 Merge branch 'PHP-5.6'
* PHP-5.6:
  Update copyright year to 2014
  Update copyright year for re2c generated files
  Update copyright year to 2014
  Update copyright year for re2c files as well
2014-06-16 23:36:39 +03:00
Lior Kaplan b538816b0b Update copyright year to 2014 2014-06-16 23:34:50 +03:00
Lior Kaplan 11b18347d8 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Update copyright year for re2c generated files
  Update copyright year to 2014
  Update copyright year for re2c files as well
2014-06-16 23:32:10 +03:00
Bob Weinand b4d61c335b Merge branch 'PHP-5.6' 2014-06-16 11:20:05 +02:00
Bob Weinand 3c2b42ac41 Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
	Zend/zend_compile.c
2014-06-16 11:18:45 +02:00
Remi Collet ced7f0ea12 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix failed test
2014-06-16 10:52:39 +02:00
Remi Collet 6788f14f5e fix failed test 2014-06-16 10:52:26 +02:00
Remi Collet 6b9fa109e0 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix test on modern distro where old unsecure algo are disabled in openssl config. Testing recent algo should be enough to check this function.
2014-06-16 09:44:58 +02:00
Remi Collet fc36277eb6 Fix test on modern distro where old unsecure algo are disabled in openssl config.
Testing recent algo should be enough to check this function.
2014-06-16 09:42:55 +02:00
Bob Weinand 8668f205ca Merge branch 'PHP-5.6' 2014-06-16 00:43:31 +02:00
Bob Weinand 7cef3a57ad Merge branch 'PHP-5.5' into PHP-5.6 2014-06-16 00:42:50 +02:00
Bob Weinand 02bea01f3d Merge branch 'PHP-5.6' 2014-06-15 23:56:14 +02:00
Bob Weinand 0913c15092 Merge branch 'PHP-5.5' into PHP-5.6 2014-06-15 23:55:44 +02:00
Bob Weinand 143cc3f0da Merge branch 'PHP-5.6' 2014-06-15 23:16:21 +02:00
Bob Weinand f92143f740 Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
	NEWS
	Zend/zend_compile.c
2014-06-15 23:06:15 +02:00
Bob Weinand 05d7facb40 Update NEWS 2014-06-15 15:50:36 +02:00
Bob Weinand 1d71600394 Merge branch 'PHP-5.6' 2014-06-15 15:47:44 +02:00
Bob Weinand f677889a9a Merge sapi/phpdbg into PHP-5.6 2014-06-15 15:47:14 +02:00
Stanislav Malyshev 693535084d Merge branch 'PHP-5.6'
* PHP-5.6:
  update NEWS
  update NEWS
  update NEWS
2014-06-15 01:08:16 -07:00
Stanislav Malyshev da3ef175b9 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  update NEWS
  update NEWS
2014-06-15 01:07:48 -07:00
Stanislav Malyshev b303f19cff update NEWS 2014-06-15 01:07:39 -07:00
kovacs.ferenc e9c2e7d6e6 fix bugsnet #67212: phpdbg uses non-standard TIOCGWINSZ 2014-06-14 23:48:24 +02:00
kovacs.ferenc fbb7bdc21e change the default terminal width from 100 to 80, as that is the most common value 2014-06-14 23:48:24 +02:00
Derick Rethans b1a708b28c Merge branch 'PHP-5.6' 2014-06-13 23:26:50 +01:00
Derick Rethans a06dabb5e9 Merge branch 'PHP-5.5' into PHP-5.6 2014-06-13 23:26:47 +01:00
Matteo Beccati 7d2bcbe20c Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix bug #67433 SIGSEGV when using count() on an object implementing Countable
2014-06-13 13:14:52 +02:00
Matteo Beccati df5551ba4f Fix bug #67433 SIGSEGV when using count() on an object implementing Countable 2014-06-13 13:14:12 +02:00
krakjoe ab353c0a55 remove all references 2014-06-13 07:35:11 +01:00
Adam Harvey 64f85d5afa Merge branch 'PHP-5.6'
* PHP-5.6:
  Follow 308 Permanent Redirect responses.
2014-06-12 18:19:11 -07:00
Adam Harvey 84f339546a Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Follow 308 Permanent Redirect responses.
2014-06-12 18:17:18 -07:00
Adam Harvey dd57ceb1de Merge branch 'PHP-5.6'
* PHP-5.6:
  Add 308 and 426 to the HTTP response code map in the CLI server.
2014-06-12 17:57:55 -07:00
Adam Harvey e082199d8e Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Add 308 and 426 to the HTTP response code map in the CLI server.
2014-06-12 17:57:36 -07:00
Adam Harvey a92e3eb0fe Merge branch 'PHP-5.6'
* PHP-5.6:
  Keep 308-399 HTTP response codes when header('Location:') is called.
2014-06-12 17:42:29 -07:00
Adam Harvey 82231b5d89 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Keep 308-399 HTTP response codes when header('Location:') is called.
2014-06-12 17:40:51 -07:00
David Zülke db537b1f3f Fix SetHandler proxy:fcgi:// incompatibilities
Apache 2.4.10+ will allow the following:

```
<FilesMatch \.php$>
SetHandler proxy:fcgi://localhost:9000
</FilesMatch>
```

This is much easier than using `ProxyPassMatch` (which prevents rewriting and other stuff) and rewrites (which are a bag of hurt because when combined with user-land `.htaccess` rewrites, there's always rewrite loops, prefix breakage etc (I've tried, for weeks).

It's basically the future of using Apache (via `mod_proxy_fcgi`) together with PHP-FPM. It's also available for older versions as a standalone module, very easy to install: https://gist.github.com/progandy/6ed4eeea60f6277c3e39

However, the two bits of code this commit deletes interfere with that. They both cover CGI-only mode and were copied from that SAPI into the FPM source. See e.g. https://bugs.php.net/bug.php?id=47042

The first deleted part mangled `SCRIPT_NAME` if something like

```
RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule (.*) index.php/$1 [L]
```

is used (i.e. rewriting to `PATH_INFO`. The second part drops `PATH_INFO` if there was a `REDIRECT_URL` (with CGI mode, `SCRIPT_FILENAME` in Apache is the path to the PHP binary, and `PATH_INFO` contains the name of the script to run).

Clearly, neither applies in the case of FPM, so both are safe to delete.
2014-06-12 21:45:22 +02:00
Bob Weinand d337fb0b62 Make run-tests.php PHP-5.4 compatible 2014-06-12 18:49:02 +03:00
Andrea Faulds 2b5d25d1fc Merge branch 'httponly-cookies' of https://github.com/mj/php-src 2014-06-12 10:03:14 +01:00
Adam Harvey b853f99abf Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS entry for Fix potential segfault in dns_get_record()
  NEWS entry for "Fix potential segfault in dns_get_record()"
  NEWS entry for Fix potential segfault in dns_get_record(
  5.5.15 now
2014-06-11 21:44:07 +00:00
Adam Harvey af26a28ac0 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS entry for "Fix potential segfault in dns_get_record()"
  NEWS entry for Fix potential segfault in dns_get_record(
  5.5.15 now

Conflicts:
	configure.in
	main/php_version.h
2014-06-11 21:43:39 +00:00
Sara Golemon 1ba338624b NEWS entry for Fix potential segfault in dns_get_record() 2014-06-11 14:24:50 -07:00
Bob Weinand 65c2001acd Fixed order in travis script 2014-06-12 00:18:47 +03:00
Bob Weinand 181323eecd Check for all phpdbg compitble php versions 2014-06-11 23:08:55 +02:00
Sara Golemon b34d7849ed Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix potential segfault in dns_get_record()
2014-06-11 13:53:59 -07:00
Sara Golemon e2ef56f760 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix potential segfault in dns_get_record()
2014-06-11 13:51:53 -07:00
Bob Weinand 3d48c7e5ec Fix issue #89 — Compile failure in PHP 5.4
zend_hash_get_current_key_zval_ex isn't defined in PHP 5.4. (used in phpdbg_watch.c)
2014-06-11 23:35:12 +03:00
Ferenc Kovacs ec974c4397 Merge branch 'PHP-5.6'
* PHP-5.6:
  Revert "Add optional second arg to unserialize()"
2014-06-11 14:59:39 +02:00
Ferenc Kovacs c38ab260fe Revert "Add optional second arg to unserialize()"
This reverts commit cfd1045822.
2014-06-11 14:43:09 +02:00
Stanislav Malyshev 6953d33d30 Merge branch 'PHP-5.6'
* PHP-5.6:
  update NEWS
2014-06-10 23:25:01 -07:00
Stanislav Malyshev ff74b9b2fc Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  update NEWS
2014-06-10 23:24:36 -07:00
Stanislav Malyshev 6c81b14b2d Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix bug #66127 (Segmentation fault with ArrayObject unset)
  5.4.31 next
2014-06-10 23:21:17 -07:00
Stanislav Malyshev 2ed66ed21c Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix bug #66127 (Segmentation fault with ArrayObject unset)
  5.4.31 next
2014-06-10 23:20:07 -07:00
Adam Harvey 61279dca69 Add NEWS. This doesn't need UPGRADING (or an RFC), IMO. 2014-06-11 00:31:04 +00:00
Adam Harvey f79f3ac184 Fix broken test. 2014-06-11 00:22:13 +00:00
Adam Harvey c12f832479 Add a mime type map generation script and update the header. 2014-06-11 00:19:49 +00:00
Adam Harvey 8c59ae345e Move the mime type map out of php_cli_server.c for easier generation. 2014-06-11 00:18:33 +00:00
Adam Harvey faa34f24e3 Replace the CLI server's linear search for extensions with a hash table.
This doesn't make a statistically significant performance impact either way
today, but gives us more scope to grow the MIME type list.
2014-06-10 23:57:42 +00:00
Stanislav Malyshev ac6c86b7dc fix test 2014-06-10 14:25:49 -07:00
Xinchen Hui d461afc3a2 Merge branch 'PHP-5.6' 2014-06-10 21:58:31 +08:00
Xinchen Hui ebe6854dbc Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
	Zend/zend_execute_API.c
2014-06-10 21:58:16 +08:00
Remi Collet 0b6676ef87 Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fixed Bug #67413 	fileinfo: cdf_read_property_info insufficient boundary chec
2014-06-10 14:36:38 +02:00
Remi Collet e72ab79196 NEWS 2014-06-10 14:36:31 +02:00
Remi Collet 0a7e131128 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #67413 	fileinfo: cdf_read_property_info insufficient boundary chec
2014-06-10 14:36:02 +02:00
Remi Collet ed28d84b9a Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Bug #67412 	fileinfo: cdf_count_chain insufficient boundary check
2014-06-10 14:24:28 +02:00
Remi Collet fde5790fd6 NEWS 2014-06-10 14:24:22 +02:00
Remi Collet 9ee147e6ff Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  NEWS
  Bug #67412 	fileinfo: cdf_count_chain insufficient boundary check
2014-06-10 14:24:07 +02:00
Remi Collet 59383273eb Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fixed Bug #67411 	fileinfo: cdf_check_stream_offset insufficient boundary check
2014-06-10 14:17:06 +02:00
Remi Collet b999947dcd NEWS 2014-06-10 14:16:58 +02:00
Remi Collet 1d6286c049 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #67411 	fileinfo: cdf_check_stream_offset insufficient boundary check
2014-06-10 14:16:39 +02:00
Remi Collet 8cd184f14a Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size
2014-06-10 14:05:44 +02:00
Remi Collet 7f8fa470f1 NEWS 2014-06-10 14:05:34 +02:00
Remi Collet 5e7cb43890 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #67410 fileinfo: mconvert incorrect handling of truncated pascal string size
2014-06-10 14:05:02 +02:00
Christian Wenz 60cc43a279 Update info.c
Fixes #67407: Windows 8.1/Server 2012 R2 reported as Windows 8/Server 2012
2014-06-10 10:42:23 +02:00
Remi Collet 39885d0819 Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  NEWS
  Fixed bug #67406 built-in web-server segfaults on startup
2014-06-10 10:39:10 +02:00
Remi Collet e2493a3a08 fix merge from php 5.5 (already fixed, differently) 2014-06-10 10:38:39 +02:00
Bob Weinand 60d89e47b2 Add line in run-tests.php help 2014-06-09 15:38:38 +02:00
Ferenc Kovacs ab074b408a Merge branch 'PHP-5.6'
* PHP-5.6:
  enable phpdbg for the travis build, and also run the testsuite for it
2014-06-09 15:30:49 +02:00
Ferenc Kovacs 5ec5c80dc4 enable phpdbg for the travis build, and also run the testsuite for it 2014-06-09 15:30:09 +02:00
Bob Weinand f0a9905759 Merge branch 'PHP-5.6' 2014-06-09 10:07:36 +02:00
Bob Weinand 6adc30028c Merge sapi/phpdbg into PHP-5.6 2014-06-09 10:06:29 +02:00
Bob Weinand 158b03fdef Finish fixing phpdbg on ZTS build 2014-06-09 09:49:21 +02:00
Stanislav Malyshev 857618161f Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #67399 (putenv with empty variable may lead to crash)
  Fixed bug #67399 (putenv with empty variable may lead to crash)
  Fixed bug #67399 (putenv with empty variable may lead to crash)
2014-06-08 23:10:52 -07:00
Stanislav Malyshev b060880c87 Fixed bug #67399 (putenv with empty variable may lead to crash) 2014-06-08 23:10:44 -07:00
Stanislav Malyshev be133d4eeb Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #67399 (putenv with empty variable may lead to crash)
  Fixed bug #67399 (putenv with empty variable may lead to crash)
2014-06-08 23:10:11 -07:00
Stanislav Malyshev 336b5f59b6 Fixed bug #67399 (putenv with empty variable may lead to crash) 2014-06-08 23:10:04 -07:00
Matteo Beccati 106b6faa7a Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191
2014-06-09 07:07:28 +02:00
Matteo Beccati 6eaadc0228 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191
2014-06-09 07:07:17 +02:00
Stanislav Malyshev d3eac6399b Merge branch 'PHP-5.6'
* PHP-5.6:
  update news
  add news
  Bug 49898 __getCookies() method implementation
2014-06-08 19:47:59 -07:00
Stanislav Malyshev df03bcf135 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  add news
  Bug 49898 __getCookies() method implementation
2014-06-08 19:47:38 -07:00
Stanislav Malyshev 706324bf48 update news 2014-06-08 19:47:14 -07:00
Stanislav Malyshev 317dec0740 Merge remote-tracking branch 'github/pr/669'
* github/pr/669:
  Removed another cvsclean file
  Removed cvsclean and svnclean tools
2014-06-08 19:29:44 -07:00
Stanislav Malyshev 94b4748175 Merge branch 'PHP-5.6'
* PHP-5.6:
  Removed another cvsclean file
  Removed cvsclean and svnclean tools
2014-06-08 19:29:26 -07:00
Sobak 00c362c1f6 Removed another cvsclean file 2014-06-08 19:28:06 -07:00
Sobak 244c289f9c Removed cvsclean and svnclean tools 2014-06-08 19:27:58 -07:00
Stanislav Malyshev c568a8e610 Merge remote-tracking branch 'github/pr/462'
* github/pr/462:
  Bug 64744 Show the type of the non-object for more descriptive errors
2014-06-08 19:19:36 -07:00
Stanislav Malyshev 9fceb05fcf Merge branch 'PHP-5.6'
* PHP-5.6:
  Bug 64744 Show the type of the non-object for more descriptive errors
2014-06-08 19:18:09 -07:00
Boro Sitnikovski cfccdc6362 Bug 64744
Show the type of the non-object for more descriptive errors
2014-06-08 19:14:58 -07:00
Stanislav Malyshev 659eeee164 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix order
  fix order
  add news
2014-06-08 19:05:10 -07:00
Stanislav Malyshev d2783fbf6c Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix order
  fix order
2014-06-08 19:04:47 -07:00
Stanislav Malyshev 1607ff8b9e add news 2014-06-08 19:03:31 -07:00
Stanislav Malyshev a17734fb04 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix bug 666222
  Fix bug 666222
2014-06-08 19:02:51 -07:00
Stanislav Malyshev 8f527fbf14 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix bug 666222
  Fix bug 666222
2014-06-08 19:02:24 -07:00
Stanislav Malyshev 7e1e40209a Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed identation on file
  Fix align indentation
2014-06-08 15:54:49 -07:00
Stanislav Malyshev 19edbc9720 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed identation on file
  Fix align indentation
2014-06-08 15:54:32 -07:00
Bob Weinand 144077edb8 Fix segfault in tests with lexer
There's still a bug in parsing commands
2014-06-09 00:38:06 +02:00
Bob Weinand 7cfe696371 Fix ZTS build 2014-06-09 00:02:10 +02:00
Stanislav Malyshev 224f369a03 Merge remote-tracking branch 'github/pr/671'
* github/pr/671:
  Fix align indentation
  Fixed identation on file
2014-06-08 14:29:03 -07:00
Stanislav Malyshev 6b4835d3e3 Merge branch 'pull-request/676'
* pull-request/676:
  Added support for parsing ssl certificates using GeneralizedTime format.
2014-06-08 14:20:30 -07:00
Stanislav Malyshev f0462db11a Merge branch 'PHP-5.6'
* PHP-5.6:
  Added support for parsing ssl certificates using GeneralizedTime format.
2014-06-08 14:20:07 -07:00
Stanislav Malyshev 3d9f922c03 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Added support for parsing ssl certificates using GeneralizedTime format.
2014-06-08 14:19:50 -07:00
krakjoe 0490850957 remove phpdbg directory from source tree on travis 2014-06-08 22:16:06 +01:00
Stanislav Malyshev f22f665b47 Merge remote-tracking branch 'github/pr/677'
* github/pr/677:
  Test
  Fix grammar #2683
2014-06-08 14:02:20 -07:00
Stanislav Malyshev ee417600bc Merge branch 'pull-request/687'
* pull-request/687:
  Remove superfluous echos.
2014-06-08 13:53:40 -07:00
Stanislav Malyshev fce97414bc Merge branch 'PHP-5.6'
* PHP-5.6:
  Remove superfluous echos.
2014-06-08 13:53:27 -07:00
Stanislav Malyshev e35945490f Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Remove superfluous echos.
2014-06-08 13:53:01 -07:00
Bob Weinand 4c79fe6afa Updated parser & leer to be usable with re2c
Fixes some weird temporary compilation errors too
2014-06-08 20:34:30 +00:00
Jeff Welch ea543893d0 Remove superfluous echos. 2014-06-08 04:09:14 -04:00
Ferenc Kovacs 2b36a2747d Merge branch 'PHP-5.6'
* PHP-5.6:
  use ./tokenizer_data_gen.sh to for adding T_POW & T_POW_EQUAL
2014-06-08 00:18:33 +02:00
Ferenc Kovacs 1e2a4a67dd use ./tokenizer_data_gen.sh to for adding T_POW & T_POW_EQUAL 2014-06-08 00:01:01 +02:00
Ferenc Kovacs caf34bf189 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix bug #67392: token_name() does not return name for T_POW and T_POW_EQUAL token
2014-06-07 15:29:29 +02:00
Ferenc Kovacs 016b1f089e Fix bug #67392: token_name() does not return name for T_POW and T_POW_EQUAL token 2014-06-07 15:27:54 +02:00
Remi Collet 3ef71630b1 Merge branch 'PHP-5.6'
* PHP-5.6:
  move NEWS entry in the right place
2014-06-06 17:19:57 +02:00
Remi Collet bcef1beb8f move NEWS entry in the right place 2014-06-06 17:19:35 +02:00
Nikita Popov 2adda06544 Merge branch 'PHP-5.6' 2014-06-06 17:13:08 +02:00
Nikita Popov 6d1885342c Fix bug #67392: dtrace breaks argument unpack 2014-06-06 17:09:49 +02:00
Remi Collet acf85d89ba Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fix bug #67390 insecure temporary file use in the configure script
2014-06-06 14:19:28 +02:00
Remi Collet 50b980f547 NEWS 2014-06-06 14:19:21 +02:00
Remi Collet cc6c7dd8ff Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  NEWS
  Fix bug #67390 insecure temporary file use in the configure script
2014-06-06 14:19:05 +02:00
Anatol Belski 0e7bf92129 Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
  restore correct behavior of DateTime
  fix test use invalid code
  Fixed startup segfault in non-debug builds Fixes issue #87
  PHP 5.4/5.5 compability in phpdbg_watch.c
  fix gcov data with some locales (again)

Conflicts:
	ext/date/php_date.c
2014-06-06 09:06:48 +02:00
Anatol Belski df0794469d Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport: (35 commits)
  drop exec perm on doc files
  fix test for 5.4/5.5
  add test for previous fix
  NEWS
  NEWS
  NEWS
  Fix regression introduce in fix for bug #67118
  update news
  update NEWS
  Fix tests
  Fix possible segfault depending on memory location...
  fix gcov data with some locales (again)
  fix gcov data with some locales (again)
  Update NEWS
  Fixed startup segfault in non-debug builds Fixes issue #87
  Fixed regression introduced by patch for bug #67072
  Fixed bug #67329 fileinfo: NULL pointer deference flaw by processing certain CDF files
  (re)add cve number in NEWS, from 5.4.29
  NEWS
  NEWS
  ...
2014-06-06 09:04:37 +02:00
Anatol Belski d4cfc15514 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6: (24 commits)
  drop exec perm on doc files
  fix test for 5.4/5.5
  add test for previous fix
  NEWS
  NEWS
  NEWS
  Fix regression introduce in fix for bug #67118
  update news
  update NEWS
  Fix tests
  Fix possible segfault depending on memory location...
  fix gcov data with some locales (again)
  fix gcov data with some locales (again)
  Update NEWS
  Fixed startup segfault in non-debug builds Fixes issue #87
  Fixed regression introduced by patch for bug #67072
  Fixed bug #67329 fileinfo: NULL pointer deference flaw by processing certain CDF files
  (re)add cve number in NEWS, from 5.4.29
  NEWS
  NEWS
  ...

Conflicts:
	ext/date/php_date.c
2014-06-06 08:59:05 +02:00
Remi Collet e16097626a Merge branch 'PHP-5.6'
* PHP-5.6:
  drop exec perm on doc files
2014-06-05 17:46:21 +02:00
Remi Collet 6a5d5d1db4 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  drop exec perm on doc files
2014-06-05 17:45:59 +02:00
Remi Collet ce3eae4c36 fix test for 5.4/5.5 2014-06-05 17:36:20 +02:00
Remi Collet b16950b5d3 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix test for 5.4/5.5
2014-06-05 17:34:32 +02:00
Remi Collet f11f7f5601 restore correct behavior of DateTime 2014-06-05 14:04:44 +02:00
Remi Collet f1ef7018f0 fix test use invalid code 2014-06-05 14:01:20 +02:00
Remi Collet aafbf93841 Merge branch 'PHP-5.6'
* PHP-5.6:
  add test for previous fix
2014-06-05 14:00:40 +02:00
Remi Collet 218df7e058 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  add test for previous fix
2014-06-05 14:00:29 +02:00
Remi Collet 2890284096 Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fix regression introduce in fix for bug #67118
2014-06-05 13:47:14 +02:00
Remi Collet ce22c03a72 NEWS 2014-06-05 13:46:55 +02:00
Remi Collet 2b3f4cc29e Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  NEWS
  Fix regression introduce in fix for bug #67118
2014-06-05 13:46:41 +02:00
Stanislav Malyshev e8e907279e Merge branch 'PHP-5.6'
* PHP-5.6:
  update news
  update NEWS
  fix gcov data with some locales (again)
2014-06-04 01:11:40 -07:00
Stanislav Malyshev 3d969932bf Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  update news
  update NEWS
  fix gcov data with some locales (again)
2014-06-04 01:11:07 -07:00
Bob Weinand 1e85b9e86b Merge branch 'PHP-5.6'
Conflicts:
	sapi/phpdbg/phpdbg.c
2014-06-04 02:20:35 +02:00
Bob Weinand 848df6fcbe Merge sapi/phpdbg into PHP-5.6 2014-06-04 02:18:39 +02:00
Bob Weinand 7b9367971d Fix tests 2014-06-04 02:15:50 +02:00
Bob Weinand 79519f7e30 Fix possible segfault depending on memory location... 2014-06-04 02:15:34 +02:00
Bob Weinand a1b0ae4247 Fixed startup segfault in non-debug builds
Fixes issue #87
2014-06-03 21:24:55 +00:00
Bob Weinand 241211975e PHP 5.4/5.5 compability in phpdbg_watch.c 2014-06-03 21:24:45 +00:00
Nuno Lopes 2766926e29 fix gcov data with some locales (again) 2014-06-03 17:21:45 -04:00
Nuno Lopes 082f79de55 fix gcov data with some locales (again) 2014-06-03 17:21:20 -04:00
Bob Weinand 13421c55ff Update NEWS 2014-06-03 21:18:24 +00:00
Bob Weinand 466cd2aa7d Merge sapi/phpdbg into PHP-5.6 2014-06-03 21:15:02 +00:00
Bob Weinand 467b19a948 Fixed startup segfault in non-debug builds
Fixes issue #87
2014-06-03 21:03:42 +00:00
Anatol Belski 94d1014dc7 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed regression introduced by patch for bug #67072
2014-06-03 20:52:30 +02:00
Anatol Belski b416537917 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed regression introduced by patch for bug #67072
2014-06-03 20:51:51 +02:00
Anatol Belski 2cdcf3e877 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #67329 fileinfo: NULL pointer deference flaw by processing certain CDF files
2014-06-03 11:38:19 +02:00
Anatol Belski f3f22ff5c6 Fixed bug #67329 fileinfo: NULL pointer deference flaw by processing certain CDF files 2014-06-03 11:37:20 +02:00
Remi Collet ec19c906bb Merge branch 'PHP-5.6'
* PHP-5.6:
  (re)add cve number in NEWS, from 5.4.29
2014-06-03 11:28:54 +02:00
Remi Collet 9e16493e72 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  (re)add cve number in NEWS, from 5.4.29
2014-06-03 11:28:43 +02:00
Remi Collet 7a00e8890b Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fix bug #67326	fileinfo: cdf_read_short_sector insufficient boundary check
2014-06-03 11:10:08 +02:00
Remi Collet 0e25448e6b NEWS 2014-06-03 11:09:52 +02:00
Remi Collet e61f7727d4 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  NEWS
  Fix bug #67326	fileinfo: cdf_read_short_sector insufficient boundary check
2014-06-03 11:09:29 +02:00
Ferenc Kovacs 3fba1d308c Merge branch 'PHP-5.6'
* PHP-5.6:
  add NEWS block for 5.6.0RC1
2014-06-03 10:28:23 +02:00
Ferenc Kovacs 6538dab85f add NEWS block for 5.6.0RC1 2014-06-03 10:27:42 +02:00
Anatol Belski 4dc952b190 fix macro 2014-06-02 08:45:32 +02:00
Anatol Belski 5cd607d1a7 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  Update NEWs
  Update NEWs
  Fixed bug #67359 (Segfault in recursiveDirectoryIterator)
  Check for zero-length keys in spl_array_skip_protected and don't skip them.
  added CVEs in NEWS
  updated libmagic.patch for 5.6+
  updated libmagic.patch for 5.4+
  update NEWS
  Fix bug #67249: printf out-of-bounds read
  5.5.13 release date

Conflicts:
	ext/standard/formatted_print.c
2014-06-02 08:42:24 +02:00
Xinchen Hui d196ac6a48 Merge branch 'PHP-5.6' 2014-06-01 19:42:53 +08:00
Xinchen Hui f41ab36e5c Update NEWs 2014-06-01 19:42:39 +08:00
Xinchen Hui c4e7c7d50e Merge branch 'PHP-5.5' into PHP-5.6 2014-06-01 19:42:20 +08:00
Adam Harvey f4a235c541 Merge branch 'PHP-5.6'
* PHP-5.6:
  Check for zero-length keys in spl_array_skip_protected and don't skip them.
  added CVEs in NEWS
2014-05-29 17:57:54 +00:00
Adam Harvey b8042acdde Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Check for zero-length keys in spl_array_skip_protected and don't skip them.
  added CVEs in NEWS
2014-05-29 17:56:32 +00:00
Anatol Belski 412feff4be Merge branch 'PHP-5.6'
* PHP-5.6:
  updated libmagic.patch for 5.6+
  updated libmagic.patch for 5.4+
2014-05-27 22:40:17 +02:00
Anatol Belski fb991bd7fd updated libmagic.patch for 5.6+ 2014-05-27 22:39:54 +02:00
Anatol Belski e844055761 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated libmagic.patch for 5.4+
2014-05-27 22:38:30 +02:00
Stanislav Malyshev cca9f376f4 Merge branch 'PHP-5.6'
* PHP-5.6:
  update NEWS
  Fix bug #67249: printf out-of-bounds read
  5.5.13 release date
2014-05-27 12:12:22 -07:00
Stanislav Malyshev 13a3826687 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  update NEWS
  Fix bug #67249: printf out-of-bounds read
  5.5.13 release date
2014-05-27 12:11:59 -07:00
Anatol Belski 112bf7331f Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
  fix my last commit with some locales
2014-05-27 12:25:41 +02:00
Anatol Belski fa59cc202f Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  fix zpp
  fix zpp
  Escape non-printable characters in the junit XML output
  Fixed broken XML junit output due to escaping of CDATA sections
  Fix #50444: PDO-ODBC changes for 64-bit
  update NEWS
  backport this piece from 5.6, related to the #66307 fix
  Fixed bug #66307 Fileinfo crashes with powerpoint files
  Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance degradation)
  Fix bug #67327: fileinfo: CDF infinite loop in nelements DoS
  fix my last commit with some locales
  fix my last commit with some locales
  Update NEWs and add a test
2014-05-27 12:25:31 +02:00
Anatol Belski 4796204a4c Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  Escape non-printable characters in the junit XML output
  Fixed broken XML junit output due to escaping of CDATA sections
  Fix #50444: PDO-ODBC changes for 64-bit
  update NEWS
  backport this piece from 5.6, related to the #66307 fix
  Fixed bug #66307 Fileinfo crashes with powerpoint files
  Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance degradation)
  Fix bug #67327: fileinfo: CDF infinite loop in nelements DoS
  fix my last commit with some locales
  fix my last commit with some locales
  Update NEWs and add a test
2014-05-27 12:24:23 +02:00
Anatol Belski 9c20452ee0 fix zpp 2014-05-27 12:23:48 +02:00
Anatol Belski 638466a641 fix zpp 2014-05-27 12:22:15 +02:00
Matteo Beccati b85990fd8f Merge branch 'PHP-5.6'
* PHP-5.6:
  Escape non-printable characters in the junit XML output
2014-05-27 12:04:32 +02:00
Matteo Beccati eb2bd85004 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Escape non-printable characters in the junit XML output
2014-05-27 12:04:26 +02:00
Matteo Beccati 40fd85821b Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed broken XML junit output due to escaping of CDATA sections
2014-05-27 11:07:52 +02:00
Matteo Beccati cc3a1af62a Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed broken XML junit output due to escaping of CDATA sections
2014-05-27 11:07:32 +02:00
Stanislav Malyshev 1887f9cce4 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix #50444: PDO-ODBC changes for 64-bit
2014-05-26 22:18:32 -07:00
Stanislav Malyshev 49662be30b Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix #50444: PDO-ODBC changes for 64-bit
2014-05-26 22:18:08 -07:00
Stanislav Malyshev 43faeaa621 Merge branch 'PHP-5.6'
* PHP-5.6:
  update NEWS
  backport this piece from 5.6, related to the #66307 fix
  Fixed bug #66307 Fileinfo crashes with powerpoint files
  Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance degradation)
  Fix bug #67327: fileinfo: CDF infinite loop in nelements DoS
  fix my last commit with some locales
  fix my last commit with some locales
2014-05-26 18:11:38 -07:00
Stanislav Malyshev 4c64bb27b1 update NEWS 2014-05-26 18:11:07 -07:00
Stanislav Malyshev bc87ba8ee6 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  backport this piece from 5.6, related to the #66307 fix
  Fixed bug #66307 Fileinfo crashes with powerpoint files
  Fix bug #67328 (fileinfo: numerous file_printf calls resulting in performance degradation)
  Fix bug #67327: fileinfo: CDF infinite loop in nelements DoS
  fix my last commit with some locales
2014-05-26 18:06:58 -07:00
Nuno Lopes bdae3d2548 fix my last commit with some locales 2014-05-26 15:08:28 -04:00
Nuno Lopes f105e1589d fix my last commit with some locales 2014-05-26 15:08:00 -04:00
Xinchen Hui cdacf4c90a Merge branch 'PHP-5.6' 2014-05-26 15:40:57 +08:00
Xinchen Hui b0b0be176f Merge branch 'PHP-5.5' into PHP-5.6 2014-05-26 15:40:50 +08:00
Anatol Belski 567f5e5247 Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
  Added tests for ZipArchive::addGlob() and ZipArchive::addPattern()
  gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
  fix test
2014-05-26 08:51:32 +02:00
Anatol Belski a4a5e34ed9 Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport: (29 commits)
  Fixed issue #183 (TMP_VAR is not only used once)
  Fix broken Junit output with --disable-cgi
  Added folder mark
  Further test fixes for the fdb2709 breakage.
  Fix broken test caused by fdb2709.
  Fix run-tests.php with Valgrind >= 3.10.0.
  Add microseconds to the serialised form of DateTime objects.
  Improved test for bug #62479
  fix typo in ODBC code
  Support for __debugInfo (Joe Watkins)
  Optimize ZEND_POW (Rouven Weßling)
  gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
  gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
  Prevent recursion in ZF2 Parameters class
  5.5.14 now
  adding NEWS block for beta4
  5.4.30 next
  enable email notifications
  update NEWS
  update NEWS
  ...

Conflicts:
	ext/opcache/ZendAccelerator.h
	ext/spl/spl_array.c
2014-05-26 08:39:06 +02:00
Anatol Belski 317e8058e0 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  Fixed issue #183 (TMP_VAR is not only used once)
  Fix broken Junit output with --disable-cgi
  Added folder mark
2014-05-26 08:31:21 +02:00
Dmitry Stogov 347b430a03 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed issue #183 (TMP_VAR is not only used once)
2014-05-26 10:12:36 +04:00
Dmitry Stogov 24a86dbb6f Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed issue #183 (TMP_VAR is not only used once)
2014-05-26 10:12:10 +04:00
Matteo Beccati 2c8ce5ba17 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix broken Junit output with --disable-cgi
2014-05-25 00:08:56 +02:00
Matteo Beccati 370256ad4b Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix broken Junit output with --disable-cgi
2014-05-25 00:08:41 +02:00
Xinchen Hui dc8a53d4ba Merge branch 'PHP-5.6' 2014-05-24 21:11:26 +08:00
Xinchen Hui 666197b8cc Added folder mark 2014-05-24 21:11:13 +08:00
Anatol Belski 1d28acb437 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  Further test fixes for the fdb2709 breakage.
  Fix broken test caused by fdb2709.
  Fix run-tests.php with Valgrind >= 3.10.0.
  Add microseconds to the serialised form of DateTime objects.
  Improved test for bug #62479
2014-05-24 13:58:35 +02:00
Xinchen Hui 9b730bf4bf Merge branch 'new-tests' of https://github.com/SammyK/php-src 2014-05-24 15:43:37 +08:00
Adam Harvey bbdbb6f7eb Merge branch 'PHP-5.6'
* PHP-5.6:
  Further test fixes for the fdb2709 breakage.
  Fix broken test caused by fdb2709.
2014-05-23 15:23:55 +00:00
Adam Harvey 80a2716b56 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Further test fixes for the fdb2709 breakage.
  Fix broken test caused by fdb2709.
2014-05-23 15:23:15 +00:00
Sammy Kaye Powers e2bbe95310 Added tests for ZipArchive::addGlob() and ZipArchive::addPattern() 2014-05-23 05:51:13 +00:00
Adam Harvey 93a98202d0 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix run-tests.php with Valgrind >= 3.10.0.
2014-05-22 22:43:39 +00:00
Adam Harvey 34900eb289 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix run-tests.php with Valgrind >= 3.10.0.
2014-05-22 22:37:57 +00:00
Adam Harvey 16a44b993f Merge branch 'PHP-5.6'
* PHP-5.6:
  Add microseconds to the serialised form of DateTime objects.
2014-05-21 15:06:30 -05:00
Adam Harvey 549331a925 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Add microseconds to the serialised form of DateTime objects.
2014-05-21 15:05:08 -05:00
Matteo Beccati bb7638adbb Merge branch 'PHP-5.6'
* PHP-5.6:
  Improved test for bug #62479
2014-05-21 18:59:31 +02:00
Matteo Beccati b41ad9bfcb Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Improved test for bug #62479
2014-05-21 18:59:14 +02:00
Anatol Belski ce8f7cb794 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  fix typo in ODBC code
  Support for __debugInfo (Joe Watkins)
  Optimize ZEND_POW (Rouven Weßling)
  gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
  gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
  Prevent recursion in ZF2 Parameters class
  5.5.14 now
  Fix bug #67060: use default mode of 660
2014-05-19 09:44:18 +02:00
Stanislav Malyshev 134d38118c Merge branch 'PHP-5.6'
* PHP-5.6:
  fix typo in ODBC code
  gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
  5.5.14 now
  Fix bug #67060: use default mode of 660
2014-05-18 23:47:14 -07:00
Stanislav Malyshev 7df1e42d8a Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix typo in ODBC code
  gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
  5.5.14 now
  Fix bug #67060: use default mode of 660

Conflicts:
	configure.in
	main/php_version.h
2014-05-18 23:46:30 -07:00
Dmitry Stogov 91c475fc00 Merge branch 'PHP-5.6'
* PHP-5.6:
  Support for __debugInfo (Joe Watkins)
2014-05-18 20:56:34 +04:00
Dmitry Stogov 1d1fdfb51d Support for __debugInfo (Joe Watkins) 2014-05-18 20:55:40 +04:00
Dmitry Stogov 0019b512ff Merge branch 'PHP-5.6'
* PHP-5.6:
  Optimize ZEND_POW (Rouven Weßling)
  gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir

Conflicts:
	ext/opcache/ZendAccelerator.h
2014-05-18 20:51:37 +04:00
Dmitry Stogov 3fff53fc57 Optimize ZEND_POW (Rouven Weßling) 2014-05-18 20:48:16 +04:00
Nuno Lopes 1759905a23 gcov: tentative fix for broken coverage data after fix for opcache coverage
slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
2014-05-18 11:23:21 -04:00
Nuno Lopes 4f8a84b2e7 gcov: tentative fix for broken coverage data after fix for opcache coverage
slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
2014-05-18 11:21:05 -04:00
Tjerk Meesters 6aac353acc Merge branch 'PHP-5.6'
Conflicts:
	ext/spl/spl_array.c
2014-05-18 22:51:36 +08:00
Bob Weinand 17039ed362 PHP 5.4/5.5 compability in phpdbg_watch.c 2014-05-18 11:38:55 +02:00
Martin Jansen 068bf645e1 Remove usage of pointless COOKIE_SET_COOKIE constant. 2014-05-18 10:45:31 +02:00
Tjerk Meesters d4295eb26a Prevent recursion in ZF2 Parameters class 2014-05-16 16:49:47 +08:00
zborboa-google ec7eccaaae Test 2014-05-14 13:11:51 -07:00
Anatol Belski 4fb177b916 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  adding NEWS block for beta4
2014-05-14 13:02:08 +02:00
Ferenc Kovacs 886fafc34f Merge branch 'PHP-5.6'
* PHP-5.6:
  adding NEWS block for beta4
2014-05-14 09:14:57 +02:00
Ferenc Kovacs 7b9c1b6576 adding NEWS block for beta4 2014-05-14 09:14:04 +02:00
Anatol Belski 1ddecc9d12 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6: (32 commits)
  5.4.30 next
  enable email notifications
  update NEWS
  update NEWS
  update NEWS
  - Updated to version 2014.3 (2014c)
  fix test - output can be chunked
  fix test
  Fixed test for commit 997be125eb
  Add bug fix to NEWS
  Update UPGRADING according to bug fix
  improve CURL tests to allow testing without separate server
  Fixed bug #67199	mb_regex_encoding mishmash
  fix bug #67253: timelib_meridian_with_check out-of-bounds read
  Fix bug #67252: convert_uudecode out-of-bounds read
  Fix bug #67251 - date_parse_from_format out-of-bounds read
  Fix bug #67250 (iptcparse out-of-bounds read)
  Fix bug #67248 (imageaffinematrixget missing check of parameters)
  Fix bug #67247	spl_fixedarray_resize integer overflow
  fix news
  ...

Conflicts:
	ext/gd/gd.c
	ext/standard/iptc.c
2014-05-14 08:21:12 +02:00
Stanislav Malyshev 5b9f7ee147 Merge branch 'PHP-5.6'
* PHP-5.6:
  5.4.30 next
2014-05-13 22:22:13 -07:00
Stanislav Malyshev 5a169310f0 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  5.4.30 next
2014-05-13 22:22:03 -07:00
Stanislav Malyshev 4fd19c0397 Merge branch 'PHP-5.6'
* PHP-5.6:
  enable email notifications
2014-05-13 17:15:09 -07:00
Stanislav Malyshev 3a90a8b888 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  enable email notifications
2014-05-13 17:14:56 -07:00
Stanislav Malyshev fedb908b58 Merge branch 'PHP-5.6'
* PHP-5.6:
  update NEWS
  update NEWS
  update NEWS
2014-05-13 17:09:30 -07:00
Stanislav Malyshev de20e2224b update NEWS 2014-05-13 17:09:16 -07:00
Stanislav Malyshev 7a14a460cf Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  update NEWS
  update NEWS
2014-05-13 17:08:22 -07:00
Stanislav Malyshev 3c107d6434 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix bug #67253: timelib_meridian_with_check out-of-bounds read
  Fix bug #67252: convert_uudecode out-of-bounds read
  Fix bug #67251 - date_parse_from_format out-of-bounds read
  Fix bug #67250 (iptcparse out-of-bounds read)
2014-05-13 17:04:44 -07:00
Stanislav Malyshev 292b2fd3b3 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix bug #67253: timelib_meridian_with_check out-of-bounds read
  Fix bug #67252: convert_uudecode out-of-bounds read
  Fix bug #67251 - date_parse_from_format out-of-bounds read
  Fix bug #67250 (iptcparse out-of-bounds read)
2014-05-13 17:03:50 -07:00
Paul Oehler f148026017 Added support for parsing ssl certificates using GeneralizedTime format.
fix bug #65698
fix bug #66636
2014-05-13 18:32:15 -04:00
Derick Rethans 7ee66c51e6 Merge branch 'PHP-5.6' 2014-05-13 16:37:07 +01:00
Derick Rethans db42f83c2e Merge branch 'PHP-5.5' into PHP-5.6 2014-05-13 16:37:05 +01:00
Stanislav Malyshev c7abe84d94 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix test - output can be chunked
  fix test

Conflicts:
	ext/curl/tests/curl_basic_006.phpt
2014-05-12 10:58:18 -07:00
Stanislav Malyshev 2152e2f127 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix test - output can be chunked

Conflicts:
	ext/curl/tests/curl_basic_006.phpt
2014-05-12 10:56:03 -07:00
Jefersson Nathan dd2005535c Fix align indentation 2014-05-12 13:37:47 -03:00
Stanislav Malyshev db35409136 fix test 2014-05-12 01:40:39 -07:00
Stanislav Malyshev 9c27063a65 fix test 2014-05-12 01:27:18 -07:00
Anatol Belski 63f57b5901 Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master: (29 commits)
  Fixed test for commit 997be125eb
  Add bug fix to NEWS
  Update UPGRADING according to bug fix
  fix test
  improve CURL tests to allow testing without separate server
  improve CURL tests to allow testing without separate server
  Fixed bug #67199	mb_regex_encoding mishmash
  Fix bug #67248 (imageaffinematrixget missing check of parameters)
  Fix bug #67247	spl_fixedarray_resize integer overflow
  fix news
  add tests stuff to README
  Updated NEWS
  Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245) Linux apparently does not like memcpy in overlapping regions...
  - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
  - Move checking
  - Fixed missing NULL check in SimpleXMLElement::xpath()
  - Fixed missing NULL check
  updated NEWS
  Bug #67238 Ungreedy and min/max quantifier bug in PCRE 8.34 upstream
  oops, 5.4 and 5.5 use malloc in TSRM
  ...

Conflicts:
	ext/gd/gd.c
2014-05-12 09:59:02 +02:00
Anatol Belski 1c5b635281 Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  Allow crypto_method context value in stream_socket_enable_crypto()
2014-05-12 09:56:35 +02:00
Anatol Belski a582692720 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  Allow crypto_method context value in stream_socket_enable_crypto()

Conflicts:
	ext/standard/streamsfuncs.c
2014-05-12 08:55:10 +02:00
Yasuo Ohgaki 072bbe95ea Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed test for commit 997be125eb
2014-05-12 15:38:40 +09:00
Yasuo Ohgaki 00cacc6048 Fixed test for commit 997be125eb 2014-05-12 15:35:16 +09:00
Yasuo Ohgaki eb1278cb5d Add bug fix to NEWS 2014-05-12 15:35:16 +09:00
Yasuo Ohgaki 2f9766fd02 Update UPGRADING according to bug fix 2014-05-12 15:35:16 +09:00
Stanislav Malyshev 97b203c93f fix test 2014-05-11 23:20:33 -07:00
Stanislav Malyshev 41b655d9cd improve CURL tests to allow testing without separate server 2014-05-11 23:04:09 -07:00
Stanislav Malyshev 89798f57d4 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  improve CURL tests to allow testing without separate server
2014-05-11 23:03:21 -07:00
Yasuo Ohgaki a33a817f0e Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #67199	mb_regex_encoding mishmash
2014-05-12 13:34:43 +09:00
Yasuo Ohgaki 997be125eb Fixed bug #67199 mb_regex_encoding mishmash 2014-05-12 13:33:53 +09:00
Stanislav Malyshev eaa39c9388 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix bug #67248 (imageaffinematrixget missing check of parameters)
  Fix bug #67247	spl_fixedarray_resize integer overflow
  fix news
  add tests stuff to README
  Updated NEWS
  Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245) Linux apparently does not like memcpy in overlapping regions...
2014-05-11 18:57:39 -07:00
Stanislav Malyshev f2fdeba19d Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix bug #67248 (imageaffinematrixget missing check of parameters)
  Fix bug #67247	spl_fixedarray_resize integer overflow
  fix news
  add tests stuff to README
  Updated NEWS
  Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245) Linux apparently does not like memcpy in overlapping regions...
2014-05-11 18:56:32 -07:00
Felipe Pena 2ed2283932 Merge branch 'PHP-5.6'
* PHP-5.6:
  - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
2014-05-11 09:46:47 -03:00
Felipe Pena 9d8a00337d Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
2014-05-11 09:46:38 -03:00
Felipe Pena bd88e8dfd2 Merge branch 'PHP-5.6'
* PHP-5.6:
  - Move checking
2014-05-10 11:55:51 -03:00
Felipe Pena ece7421864 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  - Move checking
2014-05-10 11:55:48 -03:00
Felipe Pena b09529ec1a Merge branch 'PHP-5.6'
* PHP-5.6:
  - Fixed missing NULL check in SimpleXMLElement::xpath()
2014-05-10 11:53:59 -03:00
Felipe Pena c54b9f7b72 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  - Fixed missing NULL check in SimpleXMLElement::xpath()
2014-05-10 11:53:54 -03:00
Felipe Pena 4308cf30ba Merge branch 'PHP-5.6'
* PHP-5.6:
  - Fixed missing NULL check
2014-05-10 11:40:04 -03:00
Felipe Pena edbd6c7cc0 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  - Fixed missing NULL check
2014-05-10 11:39:47 -03:00
Sobak 9db82df076 Removed another cvsclean file 2014-05-10 13:30:54 +02:00
Sobak 21642861b2 Removed cvsclean and svnclean tools 2014-05-10 13:16:48 +02:00
Anatol Belski 7ac7069e99 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  Bug #67238 Ungreedy and min/max quantifier bug in PCRE 8.34 upstream
2014-05-09 22:18:07 +02:00
Anatol Belski 398ff21923 updated NEWS 2014-05-09 22:17:22 +02:00
Anatol Belski c925c7a5b6 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Bug #67238 Ungreedy and min/max quantifier bug in PCRE 8.34 upstream
2014-05-09 22:16:42 +02:00
Stanislav Malyshev 281bde7701 Merge branch 'PHP-5.6'
* PHP-5.6:
  oops, 5.4 and 5.5 use malloc in TSRM
2014-05-08 02:04:50 -07:00
Stanislav Malyshev a3f09eb323 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  oops, 5.4 and 5.5 use malloc in TSRM
2014-05-08 02:04:11 -07:00
Stanislav Malyshev 607b0f99bf Merge branch 'PHP-5.6'
* PHP-5.6:
  make release tags not fail Travis CI
2014-05-08 01:12:06 -07:00
Stanislav Malyshev aa1a25e303 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  make release tags not fail Travis CI
2014-05-08 01:11:44 -07:00
Stanislav Malyshev cfe9596260 make release tags not fail Travis CI 2014-05-08 01:08:55 -07:00
Stanislav Malyshev 79bdc75cb3 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix memory leak in TSRM
2014-05-08 01:01:34 -07:00
Stanislav Malyshev 0c709cc2dc Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix memory leak in TSRM
2014-05-08 01:01:15 -07:00
Stanislav Malyshev da4cd8edb0 Fix memory leak in TSRM 2014-05-07 13:28:03 -07:00
Daniel Lowrey b637946a23 Merge branch 'PHP-5.6'
* PHP-5.6:
  Allow crypto_method context value in stream_socket_enable_crypto()
2014-05-07 08:13:31 -06:00
Daniel Lowrey 27f5957e9f Bug #67224: stream_socket_enable_crypto()
- Allow crypto_method context value in stream_socket_enable_crypto()
- As of 5.6.x stream crypto type may be specified in the SSL context,
  making the $crypto_type parameter to stream_socket_enable_crypto()
  optional. This commit checks for a crypto type in the context prior
  to erroring out.
- Update NEWS/UPGRADING
2014-05-07 08:05:29 -06:00
Anatol Belski fe09b5b0b6 Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  Fixed test (it requires ext/hash)
  Fixed tests (they might fail from time to time because of session GC)
  NEWS
  XFAIL-- for bug #67198
  remove useless indirection
  fix bug #67198 (php://input regression)
  rename a constant - old name to new name
  test for bug #67198
  Fix author name on the #63228 patch.
2014-05-07 15:01:44 +02:00
Anatol Belski ede2963963 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  Fixed test (it requires ext/hash)
  Fixed tests (they might fail from time to time because of session GC)
  NEWS
  XFAIL-- for bug #67198
  remove useless indirection
  fix bug #67198 (php://input regression)
  rename a constant - old name to new name
  test for bug #67198
  Fix author name on the #63228 patch.

Conflicts:
	ext/standard/php_fopen_wrapper.c
2014-05-07 15:00:18 +02:00
Ferenc Kovacs 64162cd3c2 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed test (it requires ext/hash)

Conflicts:
	ext/session/tests/031.phpt
2014-05-07 01:03:31 +02:00
Ferenc Kovacs f63ca453e0 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed test (it requires ext/hash)
2014-05-07 01:00:01 +02:00
Ferenc Kovacs 0cd679fb17 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed tests (they might fail from time to time because of session GC)
  Fix author name on the #63228 patch.
2014-05-07 00:39:57 +02:00
Ferenc Kovacs d2f283884f Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed tests (they might fail from time to time because of session GC)
  Fix author name on the #63228 patch.
2014-05-07 00:38:57 +02:00
Martin Jansen 71ad601dee Fix typo 2014-05-06 22:08:52 +02:00
Martin Jansen c5f9a231d5 Streamlining of cookie handling in ext/session and setcookie
Up until now the session cookie used "HttpOnly" to indicate cookies
only available through HTTP while setcookie() used "httponly".  The
relevant RFC 6265 claims that case does not matter for this token,
but only explicitely mentions "HttpOnly".  Thus this seems like a
logical choice when streamlining the code.

Also the setcookie implementation now uses the same string constants
as the session extension for other tokens like Max-Age or the domain
attribute.

This change poses a slight risk of backwards incompatibility in places
where people deliberately ignore chapter 5.2.5 of RFC 6265 and perform
case-sensitive checks for the HttpOnly attribute.
2014-05-06 22:00:59 +02:00
Martin Jansen c0f4e270a8 This test requires the hash extension. 2014-05-06 21:34:10 +02:00
Michael Wallner 4609f202f0 Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
2014-05-06 12:39:34 +02:00
Michael Wallner 78cb0c1dbc NEWS 2014-05-06 12:39:23 +02:00
Michael Wallner 950bd5e20a Merge branch 'PHP-5.6'
* PHP-5.6:
  XFAIL-- for bug #67198
  remove useless indirection
  fix bug #67198 (php://input regression)
2014-05-06 12:36:55 +02:00
Michael Wallner 416cc83f4e XFAIL-- for bug #67198 2014-05-06 12:22:09 +02:00
Michael Wallner 333638b0d3 remove useless indirection
the stream was initialized within the ops
in a prior version of the slim_post_data patch
2014-05-06 12:22:08 +02:00
Michael Wallner 86b6bfb9b7 fix bug #67198 (php://input regression) 2014-05-06 12:22:08 +02:00
Michael Wallner 66c177c770 XFAIL-- for bug #67198 2014-05-06 12:21:43 +02:00
Michael Wallner 5bdfa4d1c6 remove useless indirection
the stream was initialized within the ops
in a prior version of the slim_post_data patch
2014-05-06 12:21:43 +02:00
Michael Wallner 7308d47c4b fix bug #67198 (php://input regression) 2014-05-06 12:21:43 +02:00
Andrey Hristov 4df71647b6 Merge branch 'PHP-5.6' 2014-05-06 12:17:29 +03:00
Andrey Hristov 1a293e6bd9 rename a constant - old name to new name 2014-05-06 11:36:03 +03:00
Ferenc Kovacs 875c48ae67 Merge branch 'PHP-5.6'
* PHP-5.6:
  test for bug #67198
2014-05-05 16:25:38 +02:00
Ferenc Kovacs 94231ac454 test for bug #67198 2014-05-05 16:25:15 +02:00
Anatol Belski 19b6e2cc9a Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport: (32 commits)
  fixed ZEND_DEBUG usage
  updated libmagic.patch
  added missing stdint header, bug #66907
  fix macros
  /me blushes, really hard
  only build and test nts non-debug and ts debug builds as discussed at https://github.com/php/php-src/pull/654
  Fix mysqli build when building against libmysqlclient.
  Fix author name on the #63228 patch.
  Fixed bug #67169: []= after_array_splice incorrect
  Revert "show leaks in their own group" using valgrind would be a bit too much for travis I guess.
  show leaks in their own group
  Use the right path for the suggested PHP invocation in ext_skel.
  Changed to more understandable NEWS message
  one heading is enough
  add new NEWS block for alpha3
  XFAIL the leaking multibyte tests, we should really get to the bottom of this
  Fixed numbering in UPGRADING file
  Updated NEWS for fixed phpdbg issue #85
  Added stdion/stdout/stderr constsnts and their php:// wrappers Fixes issue #85
  Added stdion/stdout/stderr constsnts and their php:// wrappers Fixes issue #85
  ...
2014-05-05 08:59:08 +02:00
Anatol Belski bc92917e73 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  fixed ZEND_DEBUG usage
  updated libmagic.patch
  added missing stdint header, bug #66907
2014-05-05 08:29:35 +02:00
Anatol Belski 149568f4da Merge branch 'PHP-5.6'
* PHP-5.6:
  fixed ZEND_DEBUG usage
2014-05-05 00:51:40 +02:00
Anatol Belski 0d5121a3c7 fixed ZEND_DEBUG usage 2014-05-05 00:50:51 +02:00
Anatol Belski 53b4d2feea Merge branch 'PHP-5.6'
* PHP-5.6:
  updated libmagic.patch
2014-05-04 21:34:36 +02:00
Anatol Belski 06ae920165 updated libmagic.patch 2014-05-04 21:34:17 +02:00
Anatol Belski fe7853137b Merge branch 'PHP-5.6'
* PHP-5.6:
  added missing stdint header, bug #66907
2014-05-04 21:27:37 +02:00
Anatol Belski 031cafd4e2 added missing stdint header, bug #66907 2014-05-04 21:26:53 +02:00
Anatol Belski 5168611127 fix macros 2014-05-04 21:15:35 +02:00
Anatol Belski 2044884812 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6: (28 commits)
  /me blushes, really hard
  only build and test nts non-debug and ts debug builds as discussed at https://github.com/php/php-src/pull/654
  Fix mysqli build when building against libmysqlclient.
  Fix author name on the #63228 patch.
  Fixed bug #67169: []= after_array_splice incorrect
  Revert "show leaks in their own group" using valgrind would be a bit too much for travis I guess.
  show leaks in their own group
  Use the right path for the suggested PHP invocation in ext_skel.
  Changed to more understandable NEWS message
  one heading is enough
  add new NEWS block for alpha3
  XFAIL the leaking multibyte tests, we should really get to the bottom of this
  Fixed numbering in UPGRADING file
  Updated NEWS for fixed phpdbg issue #85
  Added stdion/stdout/stderr constsnts and their php:// wrappers Fixes issue #85
  Added stdion/stdout/stderr constsnts and their php:// wrappers Fixes issue #85
  add missing NEWS entry to the correct release where it was added
  5.5.12 was released yesterday
  add missing NEWS entry to the correct release where it was added
  Updated NEWS entry for phpdbg
  ...

Conflicts:
	ext/curl/interface.c
2014-05-04 21:12:47 +02:00
Bob Weinand f66449a467 Merge branch 'PHP-5.6' 2014-05-03 11:41:33 +02:00
Bob Weinand 003ba74d99 Merge sapi/phpdbg into PHP-5.6 2014-05-03 11:40:25 +02:00
krakjoe c8d8e851fa /me blushes, really hard 2014-05-03 10:37:11 +01:00
Ferenc Kovacs a6a1785e23 Merge branch 'PHP-5.5'
* PHP-5.5:
  only build and test nts non-debug and ts debug builds as discussed at https://github.com/php/php-src/pull/654
2014-05-03 02:51:46 +02:00
Ferenc Kovacs c29a72d17f Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  only build and test nts non-debug and ts debug builds as discussed at https://github.com/php/php-src/pull/654
2014-05-03 02:51:02 +02:00
Adam Harvey 2f1148ae8a Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix mysqli build when building against libmysqlclient.
2014-05-02 14:34:48 -07:00
Adam Harvey 06a03bbfa6 Fix mysqli build when building against libmysqlclient. 2014-05-02 14:33:52 -07:00
Adam Harvey 62d72d9105 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix author name on the #63228 patch.
2014-05-02 10:26:18 -07:00
Adam Harvey fbb0c4b800 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix author name on the #63228 patch.
2014-05-02 10:25:42 -07:00
Nikita Popov 46bcaf1b28 Merge branch 'PHP-5.6' 2014-05-02 12:52:44 +02:00
Nikita Popov 69b5ee61d0 Fixed bug #67169: []= after_array_splice incorrect
This fixes a regression I introduced in beta 1.
2014-05-02 12:49:51 +02:00
Ferenc Kovacs db3b70673f Merge branch 'PHP-5.6'
* PHP-5.6:
  Revert "show leaks in their own group" using valgrind would be a bit too much for travis I guess.
2014-05-02 09:50:40 +02:00
Ferenc Kovacs cc2e89d4e1 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Revert "show leaks in their own group" using valgrind would be a bit too much for travis I guess.
2014-05-02 09:50:25 +02:00
Ferenc Kovacs 3ca7bc089b Merge branch 'PHP-5.6'
* PHP-5.6:
  show leaks in their own group
2014-05-02 09:33:31 +02:00
Ferenc Kovacs a7437db776 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  show leaks in their own group
2014-05-02 09:33:08 +02:00
Adam Harvey aacc49191c Merge branch 'PHP-5.6'
* PHP-5.6:
  Use the right path for the suggested PHP invocation in ext_skel.
  Changed to more understandable NEWS message
  one heading is enough
2014-05-01 11:23:48 -07:00
Adam Harvey d5712d6ba4 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Use the right path for the suggested PHP invocation in ext_skel.
2014-05-01 11:23:14 -07:00
Bob Weinand f99449c309 Changed to more understandable NEWS message 2014-05-01 17:10:00 +02:00
Ferenc Kovacs 0a73853798 one heading is enough 2014-05-01 16:38:06 +02:00
Ferenc Kovacs f8f5d311cb Merge branch 'PHP-5.6'
* PHP-5.6:
  add new NEWS block for alpha3
2014-05-01 16:25:38 +02:00
Ferenc Kovacs 75640d0d85 add new NEWS block for alpha3 2014-05-01 16:24:49 +02:00
Ferenc Kovacs 562a845dcc Merge branch 'PHP-5.6'
* PHP-5.6:
  XFAIL the leaking multibyte tests, we should really get to the bottom of this
2014-05-01 12:50:28 +02:00
Ferenc Kovacs 95325e5c5d XFAIL the leaking multibyte tests, we should really get to the bottom of this 2014-05-01 12:49:57 +02:00
Bob Weinand e0b9e5249c Merge branch 'PHP-5.6' 2014-05-01 12:30:46 +02:00
Bob Weinand d27b76a779 Fixed numbering in UPGRADING file 2014-05-01 12:27:38 +02:00
Bob Weinand 3695bf27f8 Merge branch 'PHP-5.6' 2014-05-01 11:47:28 +02:00
Bob Weinand 5d13b7f191 Updated NEWS for fixed phpdbg issue #85 2014-05-01 11:46:35 +02:00
Bob Weinand 3ad8616aff Added stdion/stdout/stderr constsnts and their php:// wrappers
Fixes issue #85
2014-05-01 11:43:46 +02:00
Bob Weinand 191e3a0210 Merge sapi/phpdbg 2014-05-01 11:41:49 +02:00
Bob Weinand bcf85252e2 Added stdion/stdout/stderr constsnts and their php:// wrappers
Fixes issue #85
2014-05-01 11:38:08 +02:00
Ferenc Kovacs 94f279258d Merge branch 'PHP-5.6'
* PHP-5.6:
  add missing NEWS entry to the correct release where it was added
  5.5.12 was released yesterday
  add missing NEWS entry to the correct release where it was added
  add missing NEWS entry to the correct release where it was added
2014-05-01 10:57:12 +02:00
Ferenc Kovacs a67d4d33c2 add missing NEWS entry to the correct release where it was added 2014-05-01 10:56:39 +02:00
Ferenc Kovacs 3da5ef47ca Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  5.5.12 was released yesterday
  add missing NEWS entry to the correct release where it was added
  add missing NEWS entry to the correct release where it was added
2014-05-01 10:56:21 +02:00
Bob Weinand ae8010a0f4 Merge branch 'PHP-5.6' 2014-05-01 10:51:45 +02:00
Bob Weinand 5ba657ce89 Updated NEWS entry for phpdbg 2014-05-01 10:50:41 +02:00
Ferenc Kovacs 8b2fdb496d Merge branch 'PHP-5.6'
* PHP-5.6:
  add some missing NEWS entries
2014-05-01 10:44:31 +02:00
Ferenc Kovacs f090ddeac7 add some missing NEWS entries 2014-05-01 10:43:34 +02:00
Michael Wallner e7e44d7d56 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix test locality inconsitency
2014-04-30 13:03:12 +02:00
Michael Wallner 42fbb952d7 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix test locality inconsitency
2014-04-30 13:02:43 +02:00
Michael Wallner 8c559c7d8d Merge branch 'PHP-5.6'
* PHP-5.6:
  BFN
  fix bug #64247 (CURLOPT_INFILE doesn't allow reset)
2014-04-30 09:29:53 +02:00
Michael Wallner aaad7ead55 BFN 2014-04-30 09:29:37 +02:00
Michael Wallner 407612083f Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix bug #64247 (CURLOPT_INFILE doesn't allow reset)
2014-04-30 09:28:21 +02:00
Ferenc Kovacs 50396e6c10 Merge remote-tracking branch 'origin/PHP-5.6'
* origin/PHP-5.6:
  Added further notice about removal of IS_CONSTANT_INDEX/ARRAY macros
  separate travis jobs for debug and non-debug builds
  separate travis jobs for TS and NTS builds
  put this test back to XFAIL, as it was before, since it is still leaking memory
2014-04-30 00:08:38 +02:00
Ferenc Kovacs 98fcee48f9 Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6
* origin/PHP-5.5:
  separate travis jobs for debug and non-debug builds
  separate travis jobs for TS and NTS builds
  put this test back to XFAIL, as it was before, since it is still leaking memory

Conflicts:
	ext/mbstring/tests/zend_multibyte-08.phpt
2014-04-30 00:07:49 +02:00
Anatol Belski 3491ef6cdc Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
2014-04-29 23:53:00 +02:00
Anatol Belski 908c364248 Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  Added further notice about removal of IS_CONSTANT_INDEX/ARRAY macros
  Fix bug #67060: use default mode of 660
  updated NEWS
  updated NEWS
  Fixed bug #66431 Special Character via COM Interface (CP_UTF8)
  Cleanup ZEND_MODULE_API_NO => 20050922
  Fix crashes in GMP serialize/unserialize
  enable gmp for tests
  C89 compat
2014-04-29 23:52:49 +02:00
Anatol Belski ba19cc7b45 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  Added further notice about removal of IS_CONSTANT_INDEX/ARRAY macros
  Fix bug #67060: use default mode of 660
2014-04-29 23:49:56 +02:00
Bob Weinand 82ecdcdb63 Added further notice about removal of IS_CONSTANT_INDEX/ARRAY macros 2014-04-29 20:43:58 +02:00
Stanislav Malyshev f2a3be9627 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix bug #67060: use default mode of 660
2014-04-29 09:17:10 -07:00
Stanislav Malyshev c397fcc35f Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix bug #67060: use default mode of 660
2014-04-29 09:16:24 -07:00
Anatol Belski 0f42656fed Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  updated NEWS
  updated NEWS
  Fixed bug #66431 Special Character via COM Interface (CP_UTF8)
  Cleanup ZEND_MODULE_API_NO => 20050922
  Fix crashes in GMP serialize/unserialize
  enable gmp for tests
  C89 compat

Conflicts:
	ext/com_dotnet/com_variant.c
2014-04-29 14:05:57 +02:00
Anatol Belski 8928611b0e Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  updated NEWS
  Fixed bug #66431 Special Character via COM Interface (CP_UTF8)
2014-04-29 13:47:38 +02:00
Anatol Belski 6d20c5bea8 updated NEWS 2014-04-29 13:47:09 +02:00
Anatol Belski 3023257ff0 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated NEWS
  Fixed bug #66431 Special Character via COM Interface (CP_UTF8)
2014-04-29 13:46:38 +02:00
Popa Adrian Marius 6de915205c Merge branch 'PHP-5.6' of https://git.php.net/push/php-src into PHP-5.6
* 'PHP-5.6' of https://git.php.net/push/php-src:
  Fix crashes in GMP serialize/unserialize
  enable gmp for tests
2014-04-28 12:15:16 +03:00
Popa Adrian Marius 005f589dc4 Merge branch 'master' of https://git.php.net/push/php-src
* 'master' of https://git.php.net/push/php-src:
  Fix crashes in GMP serialize/unserialize
  enable gmp for tests
2014-04-28 12:14:39 +03:00
Popa Adrian Marius 7c58c5cc90 Merge branch 'PHP-5.6'
* PHP-5.6:
  Cleanup ZEND_MODULE_API_NO => 20050922
2014-04-28 12:14:12 +03:00
Popa Adrian Marius 0edf1d4fe6 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Cleanup ZEND_MODULE_API_NO => 20050922
2014-04-28 12:14:01 +03:00
Stanislav Malyshev 8c5ea5624b Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix crashes in GMP serialize/unserialize
  enable gmp for tests
2014-04-28 01:23:39 -07:00
Stanislav Malyshev c18ae51aeb Fix crashes in GMP serialize/unserialize 2014-04-28 01:22:02 -07:00
Stanislav Malyshev 3842417289 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  enable gmp for tests
2014-04-28 00:57:47 -07:00
Anatol Belski 705909aa48 Merge branch 'PHP-5.6'
* PHP-5.6:
  C89 compat
2014-04-27 18:02:07 +02:00
Anatol Belski 3b6bf6eec8 Merge remote-tracking branch 'phpdbg/master' into PHP-5.6
* phpdbg/master:
  C89 compat
2014-04-27 18:01:26 +02:00
Anatol Belski 4aa80db758 C89 compat 2014-04-27 17:57:38 +02:00
Anatol Belski 92a73b042f Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
  Fix #66908: php-fpm reload leaks epoll_create() file descriptor
  fix file descriptor leak of epollfd
  Fix a compiler warning in php_rand.h
  Fix #50444: PDO-ODBC changes for 64-bit
2014-04-26 01:27:13 +02:00
Anatol Belski 2b6be48685 Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport: (168 commits)
  some more after merge fixes
  fixed macro names
  removed /EHa as __try/__catch syntax is used anyway
  fix ZEND_DEBUG usage
  fixed test
  updated NEWS
  updated NEWS
  Fixed bug #67118 DateTime constructor crash with invalid data
  update NEWS
  update NEWS
  add a test case previously broken by a bad fix
  Revert "Fixed bug #64604"
  updated libmagic.patch for 5.6+
  updated libmagic.patch
  backport this piece from 5.6, related to the #66307 fix
  updated NEWS
  Fixed bug #66307 Fileinfo crashes with powerpoint files
  fix CFLAGS_PHPDBGS and some formatting
  use a portable strndup implementation
  fixed C89 compat
  ...
2014-04-26 01:26:55 +02:00
Anatol Belski 047a39c946 some more after merge fixes 2014-04-26 00:42:22 +02:00
Anatol Belski e88c8cbb7b fixed macro names 2014-04-26 00:40:58 +02:00
Anatol Belski 14b9658a38 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  removed /EHa as __try/__catch syntax is used anyway
  fix ZEND_DEBUG usage
  fix CFLAGS_PHPDBGS and some formatting
2014-04-26 00:40:16 +02:00
Anatol Belski 5dbe7c98e4 Merge branch 'PHP-5.6'
* PHP-5.6:
  removed /EHa as __try/__catch syntax is used anyway
  fix ZEND_DEBUG usage
  fix CFLAGS_PHPDBGS and some formatting
2014-04-26 00:17:09 +02:00
Anatol Belski a10dc3aa4f Merge remote-tracking branch 'phpdbg/master' into PHP-5.6
* phpdbg/master:
  removed /EHa as __try/__catch syntax is used anyway
  fix ZEND_DEBUG usage
  fix CFLAGS_PHPDBGS and some formatting
2014-04-26 00:15:32 +02:00
Anatol Belski c8617d82cc removed /EHa as __try/__catch syntax is used anyway
see http://msdn.microsoft.com/en-us/library/1deeycx5.aspx
2014-04-26 00:07:13 +02:00
Anatol Belski cdb775906d fix ZEND_DEBUG usage 2014-04-25 22:33:28 +02:00
Anatol Belski 36a0950b39 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6: (158 commits)
  fixed test
  updated NEWS
  updated NEWS
  Fixed bug #67118 DateTime constructor crash with invalid data
  update NEWS
  update NEWS
  add a test case previously broken by a bad fix
  Revert "Fixed bug #64604"
  updated libmagic.patch for 5.6+
  updated libmagic.patch
  backport this piece from 5.6, related to the #66307 fix
  updated NEWS
  Fixed bug #66307 Fileinfo crashes with powerpoint files
  use a portable strndup implementation
  fixed C89 compat
  prepare config.w32
  fix dll export
  add parser files to dist
  Fix accepting ill-formed UTF-8 characters
  sapi/litespeed/lsapi_main.c: Fix bug #63228
  ...

Conflicts:
	ext/date/php_date.c
	sapi/phpdbg/phpdbg_bp.c
	sapi/phpdbg/phpdbg_frame.c
	sapi/phpdbg/phpdbg_help.c
	sapi/phpdbg/phpdbg_list.c
	sapi/phpdbg/phpdbg_prompt.c
2014-04-25 19:49:10 +02:00
Anatol Belski e5b8fd2cc7 Merge branch 'PHP-5.6'
* PHP-5.6:
  fixed test
2014-04-25 17:40:46 +02:00
Anatol Belski 70fdb21d93 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fixed test
2014-04-25 17:40:33 +02:00
Anatol Belski f5c0cc64ed Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  updated NEWS
  Fixed bug #67118 DateTime constructor crash with invalid data
2014-04-25 17:27:35 +02:00
Anatol Belski 38248e445d updated NEWS 2014-04-25 17:27:07 +02:00
Anatol Belski 6448916535 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated NEWS
  Fixed bug #67118 DateTime constructor crash with invalid data
2014-04-25 17:26:20 +02:00
Stanislav Malyshev b82d077f98 Merge branch 'PHP-5.6'
* PHP-5.6:
  update NEWS
  update NEWS
  add a test case previously broken by a bad fix
  Revert "Fixed bug #64604"
2014-04-25 00:07:12 -07:00
Stanislav Malyshev 5ddee799d2 update NEWS 2014-04-25 00:00:49 -07:00
Stanislav Malyshev 1bad4aa355 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  update NEWS
  add a test case previously broken by a bad fix
  Revert "Fixed bug #64604"
2014-04-25 00:00:20 -07:00
Anatol Belski ad22add191 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated libmagic.patch for 5.6+
  updated libmagic.patch
2014-04-24 20:16:29 +02:00
Anatol Belski 5c34146104 updated libmagic.patch for 5.6+ 2014-04-24 20:16:06 +02:00
Anatol Belski 305c025cdd Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated libmagic.patch
2014-04-24 20:15:01 +02:00
Anatol Belski a9d714f874 Merge branch 'PHP-5.6'
* PHP-5.6:
  backport this piece from 5.6, related to the #66307 fix
2014-04-24 19:53:20 +02:00
Anatol Belski 8f43032ea4 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  backport this piece from 5.6, related to the #66307 fix
2014-04-24 19:52:53 +02:00
Anatol Belski 78eeefb946 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  Fixed bug #66307 Fileinfo crashes with powerpoint files
2014-04-24 19:36:20 +02:00
Anatol Belski 0c381e19ad updated NEWS 2014-04-24 19:35:52 +02:00
Anatol Belski 74ce9da5dc Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #66307 Fileinfo crashes with powerpoint files

Conflicts:
	ext/fileinfo/libmagic/readcdf.c
2014-04-24 19:33:54 +02:00
Anatol Belski 4350c89428 fix CFLAGS_PHPDBGS and some formatting 2014-04-24 13:15:16 +02:00
Anatol Belski ceec2152a6 Merge branch 'PHP-5.6'
* PHP-5.6:
  use a portable strndup implementation
  fixed C89 compat
  prepare config.w32
  add parser files to dist
2014-04-24 11:07:08 +02:00
Anatol Belski cd2641973c Merge remote-tracking branch 'phpdbg/master' into PHP-5.6 2014-04-24 11:05:52 +02:00
Anatol Belski 3e6a387454 use a portable strndup implementation 2014-04-24 11:01:54 +02:00
Anatol Belski 165994043a fixed C89 compat 2014-04-24 11:00:36 +02:00
Anatol Belski 5da403264f prepare config.w32 2014-04-24 10:58:30 +02:00
Anatol Belski 60f976a45e Merge branch 'PHP-5.6'
* PHP-5.6:
  fix dll export
2014-04-24 10:53:31 +02:00
Anatol Belski 9280e25534 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix dll export
2014-04-24 10:52:59 +02:00
krakjoe f1493e0069 add parser files to dist 2014-04-24 08:09:35 +01:00
Stanislav Malyshev c0c452d1e0 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix accepting ill-formed UTF-8 characters
2014-04-22 16:59:11 -07:00
Stanislav Malyshev ab8065e4ec Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix accepting ill-formed UTF-8 characters
2014-04-22 16:57:47 -07:00
Felipe Pena fd96831f68 Merge branch 'PHP-5.6'
* PHP-5.6:
  sapi/litespeed/lsapi_main.c: Fix bug #63228
2014-04-22 10:49:18 -03:00
George Wang 742f4704a9 sapi/litespeed/lsapi_main.c: Fix bug #63228
Fix compiling error at line 606 (error: format not a string
literal and no format arguments [-Werror=format-security]
2014-04-22 10:48:14 -03:00
Bob Weinand 70fc31b8be Merge branch 'PHP-5.6' 2014-04-22 00:21:34 +02:00
Bob Weinand 4784d99866 Added autogenerated phpdbg parser files to .gitignore 2014-04-22 00:19:38 +02:00
Bob Weinand 823ddab3f3 Merge branch 'PHP-5.6' 2014-04-21 23:32:57 +02:00
Bob Weinand 708af5fd8e Merge sapi/phpdbg into PHP-5.6 2014-04-21 23:30:08 +02:00
Bob Weinand 447ec05f31 Fixed infinite loop when quitting (sometimes) 2014-04-21 23:14:06 +02:00
krakjoe c1e12316f1 fixup help, behaviour of step command when not executing 2014-04-21 22:00:21 +01:00
krakjoe e9668d4ce8 buffer input to repeat commands 2014-04-21 21:43:19 +01:00
krakjoe bb0f0347dd Merge branch 'master' of https://github.com/krakjoe/phpdbg 2014-04-21 21:28:02 +01:00
krakjoe 0873f2bfb4 remove -e option in favour of taking script from argv[] 2014-04-21 21:24:41 +01:00
Anatol Belski 70707a58c9 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  Allow valid multi-byte utf-8 characters to be allowed as file names in phar archives.
  Fix #50444: PDO-ODBC changes for 64-bit
  Fix a compiler warning in php_rand.h
  Fix #66908: php-fpm reload leaks epoll_create() file descriptor
  Fix bug #65701: Do not use cache for file file copy
2014-04-21 08:57:18 +02:00
Stanislav Malyshev 57ca493c95 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix bug #64498: Allow valid multi-byte utf-8 characters to be allowed as file names in phar archives.
2014-04-20 17:24:24 -07:00
Stanislav Malyshev 32d5f269a0 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Allow valid multi-byte utf-8 characters to be allowed as file names in phar archives.
2014-04-20 17:23:52 -07:00
Stanislav Malyshev 1ff58c10c9 Merge branch 'pull-request/603'
* pull-request/603:
  Fix #50444: PDO-ODBC changes for 64-bit
2014-04-20 16:50:01 -07:00
Stanislav Malyshev e680b098e3 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix #50444: PDO-ODBC changes for 64-bit
2014-04-20 16:49:40 -07:00
Andrew Kehrig 186ffcb72c Fix #50444: PDO-ODBC changes for 64-bit
This bug is also referenced in
[#61777](https://bugs.php.net/bug.php?id=61777) and is still present in
the latest stable release of the 5.5 branch. I see two tickets exist for
this problem already, and I'm just submitting these changes via github
as a reminder that this is a serious problem for anyone using PDO_ODBC
on the x64 builds.
2014-04-20 16:49:15 -07:00
Stanislav Malyshev fc35b548d3 Merge branch 'pull-request/605'
* pull-request/605:
  Fix a compiler warning in php_rand.h
2014-04-20 16:37:42 -07:00
Stanislav Malyshev 821cc39882 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix a compiler warning in php_rand.h
2014-04-20 16:36:55 -07:00
Stanislav Malyshev 5272d6c896 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix a compiler warning in php_rand.h
2014-04-20 16:36:36 -07:00
Stanislav Malyshev 60c54f016f Merge branch 'pull-request/627'
* pull-request/627:
  Fix #66908: php-fpm reload leaks epoll_create() file descriptor
  fix file descriptor leak of epollfd
2014-04-20 16:25:37 -07:00
Stanislav Malyshev 185e5c0327 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix #66908: php-fpm reload leaks epoll_create() file descriptor
2014-04-20 16:25:25 -07:00
Stanislav Malyshev 0df431482f Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix #66908: php-fpm reload leaks epoll_create() file descriptor
2014-04-20 16:25:03 -07:00
Stanislav Malyshev dd9c80e44b Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix bug #65701: Do not use cache for file file copy
2014-04-20 15:27:55 -07:00
Stanislav Malyshev 774f16318b Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix bug #65701: Do not use cache for file file copy
2014-04-20 15:27:39 -07:00
Anatol Belski f3e56c8c9e Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
  Fixed test case for 5328d42
  These links to ~helly don't work anymore.
2014-04-20 20:39:39 +02:00
Anatol Belski 7c6ac6be55 Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport: (23 commits)
  updated libs versions
  added some notes about the win build system
  UPGRADING note about bug #67072
  UPGRADING note about bug #67072
  UPGRADING note about bug #67072
  refixed the test related to bug #67072
  Improved the fix for bug #67072, thanks Nikita
  Fixed test case for 5328d42
  These links to ~helly don't work anymore.
  updated NEWS
  updated NEWS
  Fixed bug #67072 Echoing unserialized "SplFileObject" crash
  updated UPGRADING
  updated UPGRADING
  correct the bug #67081 fix
  updated NEWS
  updated NEWS
  Fixed bug #67081 DOMDocumentType->internalSubset returns entire DOCTYPE tag, not only the subset
  updated NEWS
  Fixed bug #67079 Missing MIME types for XML/XSL files
  ...
2014-04-20 20:39:29 +02:00
Anatol Belski 3eaf40c3fc Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  updated libs versions
  added some notes about the win build system
  UPGRADING note about bug #67072
  UPGRADING note about bug #67072
  UPGRADING note about bug #67072
  refixed the test related to bug #67072
  Improved the fix for bug #67072, thanks Nikita
  Fixed test case for 5328d42
  These links to ~helly don't work anymore.
  updated NEWS
  updated NEWS
  Fixed bug #67072 Echoing unserialized "SplFileObject" crash
  updated UPGRADING
  updated UPGRADING
  correct the bug #67081 fix
  updated NEWS
  updated NEWS
  Fixed bug #67081 DOMDocumentType->internalSubset returns entire DOCTYPE tag, not only the subset
2014-04-20 20:30:54 +02:00
Bob Weinand 577c6ed0ce Fixed stepping 2014-04-20 20:20:59 +02:00
Bob Weinand 422dc49c0d Merge branch 'master' of https://github.com/krakjoe/phpdbg
Conflicts:
	phpdbg_help.c
	phpdbg_prompt.c
2014-04-20 19:55:44 +02:00
krakjoe f96feea00c step by line and opcode modes preserved, set stepping added, help updated 2014-04-20 18:46:35 +01:00
krakjoe 373b9ecd05 rename next to continue, cleanup help 2014-04-20 17:10:52 +01:00
Bob Weinand 56293fc0dd Update help 2014-04-20 16:55:49 +02:00
Bob Weinand e097919f16 Stepping is now line by line with gdb style command 2014-04-20 16:47:24 +02:00
Bob Weinand d21d5c98a5 Fixed potential bug in run command 2014-04-20 13:28:11 +02:00
Bob Weinand 5a7497904e Breakpoints now hit only once if line was not switched 2014-04-20 13:25:28 +02:00
Bob Weinand 508c379428 Added error on compile failure in exec cmd 2014-04-20 12:54:50 +02:00
krakjoe fd74024a49 remove compile command 2014-04-19 21:22:09 +01:00
krakjoe 89868dd4d9 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2014-04-19 21:09:10 +01:00
krakjoe 11c707d836 auto compile when execution context set 2014-04-19 21:08:54 +01:00
Anatol Belski 0cdc57b3cf Merge branch 'PHP-5.6'
* PHP-5.6:
  updated libs versions
2014-04-18 16:09:02 +02:00
Anatol Belski 1bca3ecacc updated libs versions 2014-04-18 16:08:42 +02:00
Anatol Belski 2bb7f3adfc Merge branch 'PHP-5.6'
* PHP-5.6:
  added some notes about the win build system
2014-04-18 16:05:11 +02:00
Anatol Belski 620d7207ef added some notes about the win build system 2014-04-18 16:04:15 +02:00
Anatol Belski 5745a513c7 Merge branch 'PHP-5.6'
* PHP-5.6:
  UPGRADING note about bug #67072
  UPGRADING note about bug #67072
  UPGRADING note about bug #67072
2014-04-18 15:55:12 +02:00
Anatol Belski b93d040dc5 UPGRADING note about bug #67072 2014-04-18 15:54:49 +02:00
Anatol Belski f09f7f22d8 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  UPGRADING note about bug #67072
  UPGRADING note about bug #67072
2014-04-18 15:54:17 +02:00
Anatol Belski f5f1abdc29 Merge branch 'PHP-5.6'
* PHP-5.6:
  refixed the test related to bug #67072
  Improved the fix for bug #67072, thanks Nikita
2014-04-18 15:17:39 +02:00
Anatol Belski cfd20c90a5 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  refixed the test related to bug #67072
  Improved the fix for bug #67072, thanks Nikita
2014-04-18 15:17:12 +02:00
Stanislav Malyshev c2b20c467f Merge branch 'pull-request/646'
* pull-request/646:
  Fixed test case for 5328d42
2014-04-17 17:37:17 -07:00
Stanislav Malyshev 3405d799f8 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed test case for 5328d42
2014-04-17 17:37:05 -07:00
Stanislav Malyshev ce4c78dd07 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed test case for 5328d42
2014-04-17 17:36:26 -07:00
Tjerk Meesters bb565de5cc Fixed test case for 5328d42 2014-04-18 08:29:32 +08:00
Bob Weinand 1bc0dbba7b Merge branch 'PHP-5.6' 2014-04-17 17:37:31 +02:00
Bob Weinand c02003e6b8 Merge branch 'PHP-5.5' into PHP-5.6 2014-04-17 17:23:05 +02:00
Levi Morrison 0193895bb4 These links to ~helly don't work anymore. 2014-04-17 08:46:38 -06:00
Anatol Belski a381cc3c40 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  updated NEWS
  Fixed bug #67072 Echoing unserialized "SplFileObject" crash
2014-04-17 11:08:45 +02:00
Anatol Belski 00bef4b1c7 updated NEWS 2014-04-17 11:08:27 +02:00
Anatol Belski f9a1eab435 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated NEWS
  Fixed bug #67072 Echoing unserialized "SplFileObject" crash
2014-04-17 11:07:22 +02:00
Bob Weinand a0ee96289b Commented out a few PHPDBG_IS_QUITTING checks to fix bug
If it does not work, please revert...
2014-04-16 20:55:41 +02:00
Bob Weinand 58c3f7e699 command tokens just available at the beginning now 2014-04-16 20:55:29 +02:00
Bob Weinand 2ab2b74af3 Also check for length to not segfault 2014-04-16 20:55:02 +02:00
Anatol Belski 7d9e161fa7 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated UPGRADING
  updated UPGRADING
2014-04-16 20:49:35 +02:00
Anatol Belski 542a7aceb1 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated UPGRADING
2014-04-16 20:49:21 +02:00
Anatol Belski 05dac1d0a5 updated UPGRADING 2014-04-16 20:48:31 +02:00
Anatol Belski 3456b73656 Merge branch 'PHP-5.6'
* PHP-5.6:
  correct the bug #67081 fix
2014-04-16 15:08:46 +02:00
Anatol Belski 9d39177943 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  correct the bug #67081 fix
2014-04-16 15:08:34 +02:00
Anatol Belski 8a985edfb2 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  updated NEWS
  Fixed bug #67081 DOMDocumentType->internalSubset returns entire DOCTYPE tag, not only the subset
2014-04-16 14:16:56 +02:00
Anatol Belski e74a03fa43 updated NEWS 2014-04-16 14:16:36 +02:00
Anatol Belski 801d312507 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated NEWS
  Fixed bug #67081 DOMDocumentType->internalSubset returns entire DOCTYPE tag, not only the subset
2014-04-16 14:15:52 +02:00
Bob Weinand b1a22ae6dc Updated version number to 0.4.0
Made run accept any input and lexer re2c compatible
2014-04-16 13:56:26 +02:00
Bob Weinand 7ab1c07a51 Fixed bug: ev output was buffered instead of directly displayed 2014-04-16 11:40:29 +02:00
Anatol Belski 6162a993dd Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  updated NEWS
  Fixed bug #67079 Missing MIME types for XML/XSL files
  5.4.29 is next
  Fixed bug #66907 Solaris 10 is missing strcasestr and needs substitute
  5.5.12RC1 setup
2014-04-16 10:48:48 +02:00
Anatol Belski 0ffdcfe756 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  Fixed bug #67079 Missing MIME types for XML/XSL files
2014-04-16 09:50:24 +02:00
Anatol Belski d0e10dbde0 updated NEWS 2014-04-16 09:49:48 +02:00
Anatol Belski b4c238c8cf Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #67079 Missing MIME types for XML/XSL files
2014-04-16 09:48:31 +02:00
Stanislav Malyshev 59d50b5fb0 Merge branch 'PHP-5.6'
* PHP-5.6:
  5.4.29 is next
  5.5.12RC1 setup
2014-04-15 17:18:24 -07:00
Stanislav Malyshev ea8370c29a Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  5.4.29 is next
  5.5.12RC1 setup

Conflicts:
	configure.in
	main/php_version.h
2014-04-15 17:17:39 -07:00
Anatol Belski b7d376c1e5 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #66907 Solaris 10 is missing strcasestr and needs substitute
2014-04-15 10:29:32 -07:00
Anatol Belski aaf197180a Fixed bug #66907 Solaris 10 is missing strcasestr and needs substitute 2014-04-15 10:26:49 -07:00
Bob Weinand a981e3a1d2 Fixed refcount removing if specified 2014-04-15 19:20:01 +02:00
Bob Weinand 0e8637441c Fixed segfault when input == NULL 2014-04-15 15:52:46 +00:00
Anatol Belski 5f79883497 fixed signatures 2014-04-15 08:22:36 -07:00
Anatol Belski c0faf60be0 Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  fixed signatures
2014-04-15 17:20:01 +02:00
Anatol Belski e396a3539c Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
  Fix #66942: openssl_seal() memory leak
  ws fix
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks
  Fix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec
  Fixed bug 64604
2014-04-15 14:11:13 +02:00
Anatol Belski b504468d78 Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport: (58 commits)
  fix datatypes
  fix zpp
  fixed prototype
  fix test - doesn't seem to produce warning
  Fix test - on CI somebody could create a process in the meantime
  fix windows build
  Fix #66942: openssl_seal() memory leak
  ws fix
  Fix #66942: openssl_seal() memory leak
  ws fix
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks
  fix crash in MINFO when no mysqlnd plugins are loaded
  Add test
  backported some ext/intl tests from 5.6 into 5.4
  test fixes for ICU 53.1
  ...

Conflicts:
	ext/mysqlnd/mysqlnd_result.c
2014-04-15 14:10:50 +02:00
Anatol Belski 5e750feb21 fix datatypes 2014-04-15 14:01:50 +02:00
Anatol Belski 6e10627d54 fix zpp 2014-04-15 11:34:59 +02:00
Anatol Belski bc2b0d8ba3 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  fix test - doesn't seem to produce warning
  Fix test - on CI somebody could create a process in the meantime
  fix windows build
  Fix #66942: openssl_seal() memory leak
  ws fix
  Fix #66942: openssl_seal() memory leak
  ws fix
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks
  Add test

Conflicts:
	ext/openssl/openssl.c
2014-04-15 10:23:51 +02:00
Anatol Belski 4be58a12d8 fixed prototype 2014-04-15 09:59:01 +02:00
Anatol Belski f166237626 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6: (41 commits)
  fix crash in MINFO when no mysqlnd plugins are loaded
  backported some ext/intl tests from 5.6 into 5.4
  test fixes for ICU 53.1
  Fixed bug #67033 Remove reference to Windows 95
  fix NEWS
  Fixed bug #64604
  Fix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec
  Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in php-fpm.conf
  Fix windows build
  Fix bug #66721
  fix apr_psprintf format string from e0df4e3dba
  Fixed bug #67024 - getimagesize should recognize BMP files with negative height
  Bug #66840: Fix broken build when extension built separately
  Reverted to 5a0da281e5 Discussion: http://news.php.net/php.cvs/76836
  Forgot title in phpt for bug #67064
  Updated NEWS
  Fix bug #67064 in a BC safe way You can use an optional parameter now when implementing the Countable interface to get the $mode passed to count().
  Added UPGRAING notice for bug #66015 in BC break section
  Add new zend_hash_* APIs to UPGRADING.INTERNALS
  Add str_* macros to UPGRADING.INTERNALS
  ...

Conflicts:
	Zend/zend_compile.c
	Zend/zend_execute_API.c
	Zend/zend_language_parser.y
	ext/mysqli/mysqli.c
	ext/mysqlnd/mysqlnd.c
	ext/mysqlnd/mysqlnd.h
	ext/mysqlnd/mysqlnd_ps.c
	ext/mysqlnd/mysqlnd_result.c
	ext/mysqlnd/mysqlnd_result.h
	ext/mysqlnd/mysqlnd_structs.h
	ext/mysqlnd/mysqlnd_wireprotocol.c
	ext/mysqlnd/mysqlnd_wireprotocol.h
	ext/opcache/zend_accelerator_util_funcs.c
	ext/spl/spl_observer.c
	ext/standard/array.c
2014-04-15 09:53:02 +02:00
Stanislav Malyshev 0ae2328c44 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix test - doesn't seem to produce warning
  Fix test - on CI somebody could create a process in the meantime
2014-04-14 15:48:33 -07:00
Stanislav Malyshev bfbb409b32 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix test - on CI somebody could create a process in the meantime
2014-04-14 15:47:53 -07:00
Stanislav Malyshev 173cd183c9 fix test - doesn't seem to produce warning 2014-04-14 15:47:06 -07:00
Anatol Belski 46070e956c Merge branch 'PHP-5.6'
* PHP-5.6:
  fix windows build
2014-04-14 23:35:51 +02:00
Anatol Belski 634e6b61d9 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix windows build
2014-04-14 23:34:50 +02:00
Stanislav Malyshev 4db11ff081 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix #66942: openssl_seal() memory leak
  ws fix
  Fix #66942: openssl_seal() memory leak
  ws fix
2014-04-14 13:38:44 -07:00
Chuan Ma 8d05a777ad Fix #66942: openssl_seal() memory leak
Fix #66952: memory leak in openssl_open()
2014-04-14 13:38:32 -07:00
Stanislav Malyshev fae8ed8ae9 ws fix 2014-04-14 13:37:58 -07:00
Stanislav Malyshev 6adc84a701 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix #66942: openssl_seal() memory leak
  ws fix
2014-04-14 13:37:10 -07:00
Chuan Ma f413a77b3d Fix #66942: openssl_seal() memory leak
Fix #66952: memory leak in openssl_open()
2014-04-14 13:36:17 -07:00
Stanislav Malyshev 99b01fb3d7 ws fix 2014-04-14 13:35:59 -07:00
Andrey Hristov 84fcc44083 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-04-14 23:11:16 +03:00
Andrey Hristov f1c70fbbd6 Merge branch 'master' of git.php.net:php-src 2014-04-14 23:11:01 +03:00
Stanislav Malyshev 8bf77370e9 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks
2014-04-14 10:53:09 -07:00
Stanislav Malyshev 9af0756dd5 Fix null byte in LDAP bindings 2014-04-14 10:53:08 -07:00
Stanislav Malyshev fb96a62b7d Fix bug #66171: better handling of symlinks 2014-04-14 10:53:07 -07:00
Stanislav Malyshev 1bd3841132 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks
  Fix null byte in LDAP bindings
  Fix bug #66171: better handling of symlinks
2014-04-14 10:51:34 -07:00
Stanislav Malyshev 59900dd37f Fix null byte in LDAP bindings 2014-04-14 10:51:32 -07:00
Stanislav Malyshev 41569b1029 Fix bug #66171: better handling of symlinks 2014-04-14 10:51:31 -07:00
Bob Weinand 9b05f5d132 Made refcount info switchable by set refcount on/off. Default: off 2014-04-14 19:37:31 +02:00
Anatol Belski a35723f6e1 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix crash in MINFO when no mysqlnd plugins are loaded
2014-04-14 17:45:18 +02:00
Anatol Belski 9e76e87ca9 fix crash in MINFO when no mysqlnd plugins are loaded 2014-04-14 17:44:47 +02:00
Anatol Belski edc4aca826 Merge branch 'PHP-5.6'
* PHP-5.6:
  backported some ext/intl tests from 5.6 into 5.4
2014-04-14 16:45:18 +02:00
Andrey Hristov 0705bfc3a3 Merge branch 'PHP-5.6' 2014-04-14 17:44:21 +03:00
Andrey Hristov ce99f292de Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
	ext/mysqli/tests/mysqli_change_user_old.phpt
2014-04-14 17:44:13 +03:00
Anatol Belski 2b28fd9ab0 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  backported some ext/intl tests from 5.6 into 5.4
2014-04-14 16:42:51 +02:00
Bob Weinand 2dad85ae61 Return SUCCESS and do not confuse use with errors 2014-04-14 16:26:27 +02:00
Bob Weinand 8c22352e88 Added $this and superglobals support for watchpoints 2014-04-14 15:47:36 +02:00
Anatol Belski 333af6fe34 Merge branch 'PHP-5.6'
* PHP-5.6:
  test fixes for ICU 53.1
2014-04-14 15:35:01 +02:00
Anatol Belski d483e1daca test fixes for ICU 53.1 2014-04-14 15:34:32 +02:00
Bob Weinand fdd9bc2050 Clean up information on watchpoint breaks 2014-04-14 10:46:52 +02:00
Anatol Belski fca5889963 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #67033 Remove reference to Windows 95
2014-04-14 09:34:02 +02:00
Anatol Belski e3abcf7826 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #67033 Remove reference to Windows 95
2014-04-14 09:33:49 +02:00
Stanislav Malyshev 1155b62ba4 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix NEWS
2014-04-13 20:17:30 -07:00
Stanislav Malyshev cfe24a7be2 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix NEWS
2014-04-13 20:17:14 -07:00
Stanislav Malyshev 3970b9d7dd Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix #66021 (Blank line inside empty array/object)
2014-04-13 18:56:26 -07:00
Stanislav Malyshev 7c9209a0d1 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix #66021 (Blank line inside empty array/object)
2014-04-13 18:56:16 -07:00
Stanislav Malyshev 9f9f378c88 Merge branch 'pull-request/533'
* pull-request/533:
  Fixed bug 64604
2014-04-13 18:39:58 -07:00
Stanislav Malyshev 0a13f8168d Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #64604
2014-04-13 18:39:28 -07:00
Stanislav Malyshev 0d4c28f2e1 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #64604
2014-04-13 18:39:17 -07:00
Stanislav Malyshev aa3cc443c3 Merge branch 'pull-request/578'
* pull-request/578:
  Fix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec
2014-04-13 18:15:55 -07:00
Stanislav Malyshev 85d05b5654 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec
2014-04-13 18:14:10 -07:00
Stanislav Malyshev 1ef0bd2633 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec
2014-04-13 18:13:52 -07:00
Stanislav Malyshev d3b433bb15 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in php-fpm.conf
2014-04-13 17:33:02 -07:00
Stanislav Malyshev c1d5937f7f Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in php-fpm.conf
2014-04-13 17:32:42 -07:00
Stanislav Malyshev 3a3a05d2e8 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix windows build
2014-04-13 17:04:25 -07:00
Stanislav Malyshev 04a11b850a Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix windows build
2014-04-13 17:04:00 -07:00
Stanislav Malyshev 11bdb85d30 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix bug #66721
2014-04-13 15:56:02 -07:00
Stanislav Malyshev d3c4292db7 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix bug #66721
2014-04-13 15:55:45 -07:00
Stanislav Malyshev 9fb92eed83 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix apr_psprintf format string from e0df4e3dba
  Fixed bug #67024 - getimagesize should recognize BMP files with negative height
2014-04-13 15:40:21 -07:00
Stanislav Malyshev 1be29a404a Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix apr_psprintf format string from e0df4e3dba
2014-04-13 15:39:32 -07:00
Stanislav Malyshev 3aab84c100 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #67024 - getimagesize should recognize BMP files with negative height
2014-04-13 15:25:58 -07:00
Bob Weinand 12844292b8 Merge branch 'PHP-5.6' 2014-04-14 00:10:25 +02:00
Bob Weinand a93e734f81 Merge branch 'PHP-5.5' into PHP-5.6 2014-04-14 00:08:36 +02:00
Daniel Lowrey f1aa39c1af Merge branch 'PHP-5.6'
* PHP-5.6:
  Bug #66840: Fix broken build when extension built separately
2014-04-13 15:19:23 -06:00
Daniel Lowrey 0e023e9784 Bug #66840: Fix broken build when extension built separately 2014-04-13 15:17:50 -06:00
Bob Weinand e8728b4999 Merge branch 'PHP-5.6' 2014-04-13 19:41:27 +02:00
Bob Weinand 3636a91adc Merge branch 'PHP-5.5' into PHP-5.6 2014-04-13 19:40:39 +02:00
Bob Weinand ef214aa3c0 Merge branch 'PHP-5.6' 2014-04-13 19:28:32 +02:00
Bob Weinand fb99409f89 Merge branch 'PHP-5.5' into PHP-5.6 2014-04-13 19:27:43 +02:00
krakjoe 774a879e65 tidy help 2014-04-13 16:58:45 +01:00
Bob Weinand 2f54e68ade CR CR etc. in help 2014-04-13 17:55:18 +02:00
Bob Weinand f53e438933 Added information about $var parameter in watchpoints 2014-04-13 17:48:35 +02:00
Bob Weinand eae91d9de7 Added help 2014-04-13 17:34:27 +02:00
krakjoe ce7097fb60 less strange! 2014-04-13 14:43:34 +01:00
Bob Weinand 286dd4dc71 Remove some dead code... 2014-04-13 13:33:07 +02:00
krakjoe faa7e3264e fix compat with lexer stuff 2014-04-13 11:42:47 +01:00
krakjoe 5c69f3dd8b Merge branch 'master' of https://github.com/krakjoe/phpdbg into watchpoints_recursive 2014-04-13 11:32:43 +01:00
krakjoe c2c4a5bd25 fix build 2014-04-13 11:32:35 +01:00
krakjoe 1b2f12159b fix command structure 2014-04-13 11:17:04 +01:00
krakjoe 42355fb9bf Merge branch 'master' of https://github.com/krakjoe/phpdbg into watchpoints_recursive
Conflicts:
	config.m4
	phpdbg.c
	phpdbg_prompt.c
2014-04-13 11:07:38 +01:00
Bob Weinand d86c297659 Merge branch 'PHP-5.6' 2014-04-13 11:42:30 +02:00
Bob Weinand a3eafe535f Added UPGRAING notice for bug #66015 in BC break section 2014-04-13 11:38:52 +02:00
Nikita Popov 099c070f18 Merge branch 'PHP-5.6' 2014-04-13 10:49:38 +02:00
Nikita Popov fb5d5d9700 Add new zend_hash_* APIs to UPGRADING.INTERNALS 2014-04-13 10:49:14 +02:00
Nikita Popov 57b88ba6ea Add str_* macros to UPGRADING.INTERNALS 2014-04-13 10:49:14 +02:00
Ferenc Kovacs c459805cb2 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix bug #66660: use str_efree instead of efree to handle interned empty strings correctly
2014-04-13 10:48:42 +02:00
Ferenc Kovacs 20036525e2 Fix bug #66660: use str_efree instead of efree to handle interned empty strings correctly 2014-04-13 10:45:46 +02:00
krakjoe b8a4a4c700 squish warnings 2014-04-13 09:07:15 +01:00
krakjoe 0dc9be6f1e cleanup 2014-04-13 08:48:59 +01:00
krakjoe 8c23b038cd fix moar 2014-04-13 08:43:19 +01:00
krakjoe 4387723ef7 fix argc/argv 2014-04-13 08:34:16 +01:00
krakjoe 65984df220 merge master 2014-04-13 08:09:53 +01:00
krakjoe ef86b57f3b Merge branch 'master' of https://github.com/krakjoe/phpdbg into lexer
Conflicts:
	phpdbg_prompt.c
2014-04-13 08:06:42 +01:00
krakjoe 2fde2ada50 fix addr parameters 2014-04-13 08:06:21 +01:00
Matteo Beccati 0175bbb767 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #66604 'pdo/php_pdo_error.h' not copied to the include dir
2014-04-13 08:55:13 +02:00
Matteo Beccati 7fd9898a2d Fixed bug #66604 'pdo/php_pdo_error.h' not copied to the include dir 2014-04-13 08:53:21 +02:00
Ferenc Kovacs fdbf467d2e Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix bug #66568: the second arg for unserialize is optional.
2014-04-13 02:50:03 +02:00
Ferenc Kovacs aefc8f22b3 Fix bug #66568: the second arg for unserialize is optional. 2014-04-13 02:49:35 +02:00
Ferenc Kovacs fb326bbd9b Merge branch 'PHP-5.6'
* PHP-5.6:
  fix typo
2014-04-13 01:57:49 +02:00
Ferenc Kovacs 51cbb85ea9 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix typo
2014-04-13 01:57:15 +02:00
Bob Weinand 3db29ee439 Added support for command line arg passing
"phpdbg -- arg" in shell
"run arg" in phpdbg prompt
2014-04-13 00:27:46 +02:00
Bob Weinand eae0f529f2 Merge branch 'PHP-5.6' 2014-04-12 23:55:35 +02:00
Bob Weinand 53b1dce587 Merge branch 'PHP-5.5' into PHP-5.6 2014-04-12 23:54:57 +02:00
Bob Weinand 86a7731763 Fixed frame number order 2014-04-12 22:08:02 +02:00
Bob Weinand 48bcaf2e72 Retain full compability for all micro versions since PHP 5.4 2014-04-12 18:00:33 +02:00
Bob Weinand ca447a8f6f Merge branch 'PHP-5.6' 2014-04-11 20:14:44 +02:00
Bob Weinand 096e40a027 Fixed tests for recent constant array changes 2014-04-11 20:13:24 +02:00
Bob Weinand ccf863c8ce Merge branch 'PHP-5.6' 2014-04-11 19:35:11 +02:00
Bob Weinand 99d1a1bb3f Shut up, my lovely compiler; I do not like your warnings 2014-04-11 19:33:56 +02:00
Bob Weinand 35b895fdf0 Removed useless void* parameter and replaced with zend_bool on zval_update_constant* functions 2014-04-11 19:18:58 +02:00
Bob Weinand 920c5508ef Updated NEWS 2014-04-11 18:30:14 +02:00
Bob Weinand 38ec4d20bf Merge branch 'PHP-5.6' 2014-04-11 18:24:41 +02:00
Bob Weinand ee2a7c7d41 Fixed disallowal of array usage in constants at run-time
Added at the same time the possibility of array dereferencing
to complete the set of features (useful application of arrays in constants)
2014-04-11 18:21:46 +02:00
Bob Weinand 53e71e47b9 Merge branch 'PHP-5.6' 2014-04-11 16:21:15 +02:00
Bob Weinand ad05d3898e Updated zend_vm_execute.h 2014-04-11 16:18:42 +02:00
Anatol Belski f0c95cb705 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix syntax error in vc++
2014-04-11 13:28:13 +02:00
Anatol Belski 5c87ed058b fix syntax error in vc++ 2014-04-11 13:08:46 +02:00
Anatol Belski 3af4be482c Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  Fixed bug #66967 Updated the bundled libsqlite to 3.8.4.3
2014-04-11 11:02:02 +02:00
Anatol Belski 4c32c8d549 updated NEWS 2014-04-11 11:01:42 +02:00
Anatol Belski c5181ef6c2 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #66967 Updated the bundled libsqlite to 3.8.4.3
2014-04-11 11:01:01 +02:00
Bob Weinand 9663193bbc Merge branch 'PHP-5.6' 2014-04-11 10:11:58 +02:00
Bob Weinand f7ac308950 Updated NEWS 2014-04-11 10:10:36 +02:00
Bob Weinand f614fc6898 Fix bug #66015 by reverting "Removed operations on constant arrays." 2014-04-11 10:08:44 +02:00
Andrey Hristov 6828437c11 Merge branch 'PHP-5.6'
Conflicts:
	NEWS
	ext/mysqlnd/mysqlnd_result.c
2014-04-10 18:22:01 +03:00
Andrey Hristov d3f390a268 Here comes the news 2014-04-10 18:15:42 +03:00
Andrey Hristov e02fdcf3f7 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-04-10 18:13:58 +03:00
Andrey Hristov af5fa00c97 Fix the fix 2014-04-10 18:13:44 +03:00
Popa Adrian Marius c2ce0df01b Merge branch 'PHP-5.6'
* PHP-5.6:
  Cleanup $ is not needed for git
2014-04-10 17:43:45 +03:00
Popa Adrian Marius 4048872317 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Cleanup $ is not needed for git
2014-04-10 17:43:29 +03:00
Andrey Hristov 090c3e87c0 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Conflicts:
	ext/mysqli/tests/mysqli_begin_transaction.phpt
2014-04-10 16:49:13 +03:00
Andrey Hristov 63791d055a New result fetching mode for mysqlnd, which should use less memory but
implies more memory copy. The old method is still available and can be used.
It stays as default. Choosing the method is through a flag to mysqli_query()/mysqli_real_query()
New mode can be forced with an INI setting, for all extensions that support this mode
(ext/mysql and mysqli, because PDO due to it's architecture can't support it)
The setting is mysqlnd.fetch_data_copy=[0|1]
2014-04-10 16:44:54 +03:00
Anatol Belski 0eb34f25ae Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
2014-04-10 12:43:08 +02:00
Anatol Belski dfbc874a11 Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  fix prototype
  fix typo
  fix typo
  fix typo
  add a NEWS block for beta2
  add missing entries to NEWS
  abstract namespace for unix sockets is a linux only feature
  Don't test for specific non-zero substr_compare() return value
  Add only_integer_keys option to zend_hash_reindex
  Don't always separate splice replacement array
  Add zend_hash_splice
  Add zend_hash_reindex
  Remove some usages of hashtable internals
  Updated NEWS
  fixed bug66702 : regexiterator's invert flag doesn't work as expected
2014-04-10 12:42:58 +02:00
Anatol Belski 9112c2f122 fix prototype 2014-04-10 11:44:28 +02:00
Anatol Belski af53cc6799 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  fix typo
  fix typo
  fix typo
  add a NEWS block for beta2
  add missing entries to NEWS
  abstract namespace for unix sockets is a linux only feature
  Don't test for specific non-zero substr_compare() return value
  Add only_integer_keys option to zend_hash_reindex
  Don't always separate splice replacement array
  Add zend_hash_splice
  Add zend_hash_reindex
  Remove some usages of hashtable internals
  Updated NEWS
  fixed bug66702 : regexiterator's invert flag doesn't work as expected

Conflicts:
	Zend/zend_hash.c
	ext/spl/spl_iterators.c
	ext/standard/array.c
	ext/standard/php_array.h
2014-04-10 10:49:48 +02:00
Ferenc Kovacs 7b3e369740 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix typo
  fix typo
  fix typo
2014-04-10 07:07:50 +02:00
Ferenc Kovacs 3204ad5858 fix typo 2014-04-10 07:07:11 +02:00
Ferenc Kovacs 5cc93aa9a6 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix typo
  fix typo
2014-04-10 07:06:53 +02:00
Ferenc Kovacs edbaa1fa5e Merge branch 'PHP-5.6'
* PHP-5.6:
  add a NEWS block for beta2
  add missing entries to NEWS
2014-04-10 06:23:23 +02:00
Ferenc Kovacs 08faf19d09 add a NEWS block for beta2 2014-04-10 06:22:43 +02:00
Ferenc Kovacs ec6a0966bc add missing entries to NEWS 2014-04-10 06:21:31 +02:00
Ferenc Kovacs 1b1dabcf60 Merge branch 'PHP-5.6'
* PHP-5.6:
  abstract namespace for unix sockets is a linux only feature
2014-04-09 19:04:35 +02:00
Ferenc Kovacs cbcce72308 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  abstract namespace for unix sockets is a linux only feature
2014-04-09 19:02:56 +02:00
Tjerk Meesters 939b2db87d Merge branch 'PHP-5.6' 2014-04-09 20:11:36 +08:00
Tjerk Meesters 16ae472769 Merge branch 'PHP-5.5' into PHP-5.6 2014-04-09 20:11:07 +08:00
Nikita Popov 21e01f2b70 Merge branch 'PHP-5.6' 2014-04-09 12:31:35 +02:00
Nikita Popov ad2ef3d97e Add only_integer_keys option to zend_hash_reindex
This allows to either do a full reindex, or only reindex the integer
keys.
2014-04-09 12:31:21 +02:00
Nikita Popov f485c84a14 Don't always separate splice replacement array
Only perform separation when a typecast is done. Avoids doing a
full hash copy in many cases.
2014-04-09 12:31:21 +02:00
Nikita Popov 22d3eb3117 Add zend_hash_splice
This implements the original functionality of php_splice, but
as an in-place operation, thus avoiding copying the HT.

This is much faster (~10x) if the splice removes a small portion
of the array and doesn't insert many elements.
2014-04-09 12:31:21 +02:00
Nikita Popov 1aa8719e32 Add zend_hash_reindex
The implementation differs from the original in array.c in that it
rehashes the hashtable in the same loop. This is approximately two
times faster (not counting the rare case of a purely associative
array).
2014-04-09 12:31:21 +02:00
Nikita Popov eaf44ec397 Remove some usages of hashtable internals 2014-04-09 12:31:21 +02:00
Etienne Kneuss 6acfaa982b Merge branch 'PHP-5.6' 2014-04-09 11:52:11 +02:00
Etienne Kneuss 6006a3ed51 Merge branch 'PHP-5.5' into PHP-5.6 2014-04-09 11:36:36 +02:00
Anatol Belski b0ddef8ba3 Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
  cleanup old unsupported versions of Firebird 1.0.x
  cleanup
  Fixes bug #66071: isc_interprete is unsafe and deprecated , it is replaced with fb_iterpret
2014-04-09 11:17:43 +02:00
Anatol Belski 71a8b01b2b Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  Updated NEWS for #67043
  Fixed bug 67043
  cleanup
  Fixes bug #66071: isc_interprete is unsafe and deprecated , it is replaced with fb_iterpret
  updated libs versions
  fixed the test for ICI >= 52.1
  Fix Linux specific fail in error traces Linux apparently does not like memcpy in overlapping regions...
  add missing skip to the output, so we actually skip this test
  fix the test according to how new date code does it
  fix to work on different ICU versions
  multibytes tests still fail, put them in XFAIL
2014-04-09 11:17:23 +02:00
Anatol Belski abad64c50e Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  Updated NEWS for #67043
  Fixed bug 67043
  cleanup
  Fixes bug #66071: isc_interprete is unsafe and deprecated , it is replaced with fb_iterpret
  updated libs versions
  fixed the test for ICI >= 52.1
  Fix Linux specific fail in error traces Linux apparently does not like memcpy in overlapping regions...
  add missing skip to the output, so we actually skip this test
  fix the test according to how new date code does it
  fix to work on different ICU versions
  multibytes tests still fail, put them in XFAIL

Conflicts:
	ext/standard/string.c
2014-04-09 11:04:50 +02:00
Tjerk Meesters 419d98b291 Merge branch 'PHP-5.6' 2014-04-09 07:37:07 +08:00
Tjerk Meesters 2cdf38b7a0 Updated NEWS for #67043 2014-04-09 07:36:34 +08:00
Tjerk Meesters 2aba2494f5 Merge branch 'PHP-5.5' into PHP-5.6 2014-04-09 07:34:49 +08:00
Stanislav Malyshev d349971bb2 Merge branch 'PHP-5.6'
* PHP-5.6:
  cleanup
  Fixes bug #66071: isc_interprete is unsafe and deprecated , it is replaced with fb_iterpret
2014-04-08 09:39:34 -07:00
Popa Adrian Marius 002c8e8356 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  cleanup
  Fixes bug #66071: isc_interprete is unsafe and deprecated , it is replaced with fb_iterpret
2014-04-08 17:52:22 +03:00
Popa Adrian Marius 8abcd97333 cleanup old unsupported versions of Firebird 1.0.x 2014-04-08 17:36:38 +03:00
Popa Adrian Marius 88cd44aa62 cleanup 2014-04-08 15:29:32 +03:00
Popa Adrian Marius 6d7093cbbe Fixes bug #66071: isc_interprete is unsafe and deprecated , it is replaced with fb_iterpret 2014-04-08 14:11:58 +03:00
Anatol Belski 1157f81b2f Merge branch 'PHP-5.6'
* PHP-5.6:
  updated libs versions
2014-04-08 11:43:55 +02:00
Anatol Belski ff5896a04c Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated libs versions
2014-04-08 11:43:32 +02:00
Anatol Belski 6c2f7bc2c4 Merge branch 'PHP-5.6'
* PHP-5.6:
  fixed the test for ICI >= 52.1
2014-04-07 17:41:47 +02:00
Anatol Belski 964f65484c Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fixed the test for ICI >= 52.1
2014-04-07 17:41:32 +02:00
Bob Weinand d58a7500a7 Merge branch 'PHP-5.6' 2014-04-07 17:16:48 +02:00
Bob Weinand 0e273217cf Fix Linux specific fail in error traces
Linux apparently does not like memcpy in overlapping regions...
2014-04-07 17:14:38 +02:00
Ferenc Kovacs a6e56586c6 Merge branch 'PHP-5.6'
* PHP-5.6:
  add missing skip to the output, so we actually skip this test
2014-04-07 16:59:27 +02:00
Ferenc Kovacs 7446766dab add missing skip to the output, so we actually skip this test 2014-04-07 16:57:52 +02:00
Stanislav Malyshev 2000c8ed46 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix the test according to how new date code does it
  fix to work on different ICU versions
2014-04-05 20:13:48 -07:00
Stanislav Malyshev 63e7b84593 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix the test according to how new date code does it
  fix to work on different ICU versions
2014-04-05 20:13:24 -07:00
Stanislav Malyshev ca31c8f4fe Merge branch 'PHP-5.6'
* PHP-5.6:
  multibytes tests still fail, put them in XFAIL
2014-04-05 18:35:18 -07:00
Stanislav Malyshev cf910f351a multibytes tests still fail, put them in XFAIL
clean up XFAIL from tests no longer failing
2014-04-05 18:34:39 -07:00
Anatol Belski 589384cb2c Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
  Remove call_user_method() and call_user_method_array() from master, long time deprecated in favour of call_user_func*().
2014-04-05 10:34:46 +02:00
Anatol Belski 62a25407a9 Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  updated NEWS
  updated NEWS
  Fixed bug #66084 simplexml_load_string() mangles empty node name
  cleanup NEWS
  NEWS
  NEWS
  Fix Bug #66736 	fpassthru broken
2014-04-05 10:34:40 +02:00
Anatol Belski d308724d19 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  updated NEWS
  updated NEWS
  Fixed bug #66084 simplexml_load_string() mangles empty node name
  cleanup NEWS
  NEWS
  NEWS
  Fix Bug #66736 	fpassthru broken
2014-04-05 09:53:38 +02:00
Anatol Belski d7f5f608ac Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  updated NEWS
  Fixed bug #66084 simplexml_load_string() mangles empty node name
2014-04-05 09:50:13 +02:00
Anatol Belski 12e222ee91 updated NEWS 2014-04-05 09:49:51 +02:00
Anatol Belski a094f6d255 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated NEWS
  Fixed bug #66084 simplexml_load_string() mangles empty node name
2014-04-05 09:48:54 +02:00
Kalle Sommer Nielsen 96d5d7c240 Merge branch 'master' of https://git.php.net/push/php-src 2014-04-05 06:45:02 +02:00
Kalle Sommer Nielsen 91aa9fbb47 Remove call_user_method() and call_user_method_array() from master, long time deprecated in favour of call_user_func*(). 2014-04-05 06:43:41 +02:00
Stanislav Malyshev 882862eb6e Merge branch 'PHP-5.6'
* PHP-5.6:
  cleanup NEWS
2014-04-03 15:57:26 -07:00
Stanislav Malyshev 38e084d312 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  cleanup NEWS
2014-04-03 15:57:08 -07:00
Bob Weinand 9d72a84f06 Add array watchpoints if recursive zval watchpoint changed + WS 2014-04-03 19:53:58 +00:00
Bob Weinand fcacee0595 Fixed deleting watchpoints (plus error in btree_delete) 2014-04-03 19:34:08 +00:00
Michael Wallner 8d4ee1dbed Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  NEWS
  Fix Bug #66736 	fpassthru broken
2014-04-03 10:41:53 +02:00
Michael Wallner b628c36a85 NEWS 2014-04-03 10:41:45 +02:00
Michael Wallner 55005c8638 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  Fix Bug #66736 	fpassthru broken
2014-04-03 10:41:24 +02:00
Anatol Belski d7aed3c631 Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
2014-04-03 10:02:53 +02:00
Anatol Belski bccac3c79b Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  NEWS
  NEWS
  Fix bug #66182 	exit in stream filter produces segfault
  NEWS
  NEWS
  Fixed bug #61019 (Out of memory on command stream_get_contents)
  NEWS
  NEWS
  Fix bug #64330
  update NEWS
  updated NEWS
  updated NEWS
  added test for bug #53965
  Fixed bug #53965 <xsl:include> cannot find files w/ relative paths when loaded w/ "file://"
  updated libmagic.patch
  NEWS
  NEWS
  NEWS
  Fixed Bug #66987 Memory corruption in fileinfo ext (bigendian)
2014-04-03 10:02:44 +02:00
Anatol Belski 582bf28311 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  NEWS
  NEWS
  Fix bug #66182 	exit in stream filter produces segfault
  NEWS
  NEWS
  Fixed bug #61019 (Out of memory on command stream_get_contents)
  NEWS
  NEWS
  Fix bug #64330
  update NEWS
  updated NEWS
  updated NEWS
  added test for bug #53965
  Fixed bug #53965 <xsl:include> cannot find files w/ relative paths when loaded w/ "file://"
  updated libmagic.patch
  NEWS
  NEWS
  NEWS
  Fixed Bug #66987 Memory corruption in fileinfo ext (bigendian)
2014-04-03 09:12:26 +02:00
Michael Wallner 3f8c45e28c Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  NEWS
  Fix bug #66182 	exit in stream filter produces segfault
2014-04-03 09:10:02 +02:00
Michael Wallner 1c2bcec68a NEWS 2014-04-03 09:09:51 +02:00
Michael Wallner 5d42ce838c Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  Fix bug #66182 	exit in stream filter produces segfault
2014-04-03 09:09:24 +02:00
Michael Wallner 4d412421df Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  NEWS
  Fixed bug #61019 (Out of memory on command stream_get_contents)
2014-04-02 15:39:16 +02:00
Michael Wallner 06e6d42ee3 NEWS 2014-04-02 15:39:07 +02:00
Michael Wallner 68c57f8149 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  Fixed bug #61019 (Out of memory on command stream_get_contents)
2014-04-02 15:38:35 +02:00
Michael Wallner 2b7bf2cb6e Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  NEWS
2014-04-02 11:15:11 +02:00
Michael Wallner c4a3f67708 NEWS 2014-04-02 11:14:34 +02:00
Michael Wallner 80d58ca8cd Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
2014-04-02 11:13:42 +02:00
Michael Wallner 1d6b3f1293 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix bug #64330
2014-04-02 11:11:39 +02:00
Michael Wallner 669459da8c Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix bug #64330
2014-04-02 11:11:23 +02:00
Anatol Belski 45c1e28161 Merge branch 'PHP-5.6'
* PHP-5.6:
  update NEWS
  updated NEWS
  updated NEWS
  added test for bug #53965
  Fixed bug #53965 <xsl:include> cannot find files w/ relative paths when loaded w/ "file://"
2014-04-01 10:15:05 +02:00
Anatol Belski 88a44b15d7 update NEWS 2014-04-01 10:14:38 +02:00
Anatol Belski ef6538875f Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated NEWS
  updated NEWS
  added test for bug #53965
  Fixed bug #53965 <xsl:include> cannot find files w/ relative paths when loaded w/ "file://"
2014-04-01 10:13:38 +02:00
Anatol Belski 41d63e38e1 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated libmagic.patch
2014-03-31 17:24:53 +02:00
Anatol Belski e265df460d updated libmagic.patch 2014-03-31 17:24:15 +02:00
Remi Collet cf4e7837d1 Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fixed Bug #66987 Memory corruption in fileinfo ext (bigendian)
2014-03-31 16:58:21 +02:00
Remi Collet 3f6073602b NEWS 2014-03-31 16:58:10 +02:00
Remi Collet 62305edc5b Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #66987 Memory corruption in fileinfo ext (bigendian)
2014-03-31 16:57:39 +02:00
Anatol Belski 4dd4eac9d5 Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
2014-03-31 12:04:04 +02:00
Anatol Belski 0fb1f51435 Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  update lib versions
  Remove unneeded string copy. Allow to set ''(empty string values) internal/input/output_encoding for better compatibility. i.e. Runtime INI value changes. More compliance to the RFC. Improve/add encoding handling tests. i.e. Rather than set encoding automagic way, detect it.
  Fix test
2014-03-31 12:03:50 +02:00
Anatol Belski 295cec706e Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  update lib versions
  Remove unneeded string copy. Allow to set ''(empty string values) internal/input/output_encoding for better compatibility. i.e. Runtime INI value changes. More compliance to the RFC. Improve/add encoding handling tests. i.e. Rather than set encoding automagic way, detect it.
  Fix test

Conflicts:
	ext/iconv/iconv.c
	ext/standard/html.c
2014-03-31 11:57:46 +02:00
Julio Pintos 389d4e5ec3 Fix #66908: php-fpm reload leaks epoll_create() file descriptor
This patch fixes descriptor leak which could lead to DoS once Max open files is reached
2014-03-28 13:26:43 -03:00
Anatol Belski 5000a2cd37 Merge branch 'PHP-5.6'
* PHP-5.6:
  update lib versions
2014-03-27 18:20:17 +01:00
Anatol Belski 5f54cecde9 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  update lib versions
2014-03-27 18:19:43 +01:00
Yasuo Ohgaki 08cd3c6146 Merge branch 'PHP-5.6'
* PHP-5.6:
  Remove unneeded string copy. Allow to set ''(empty string values) internal/input/output_encoding for better compatibility. i.e. Runtime INI value changes. More compliance to the RFC. Improve/add encoding handling tests. i.e. Rather than set encoding automagic way, detect it.
2014-03-27 17:21:23 +09:00
Yasuo Ohgaki a84e5dc37d Remove unneeded string copy.
Allow to set ''(empty string values) internal/input/output_encoding for better compatibility. i.e. Runtime INI value changes.
More compliance to the RFC. Improve/add encoding handling tests. i.e. Rather than set encoding automagic way, detect it.
2014-03-27 17:20:57 +09:00
Andrey Hristov a496525744 Merge branch 'PHP-5.6' 2014-03-26 15:40:54 +02:00
Andrey Hristov 7ccbfb2e84 Merge branch 'PHP-5.5' into PHP-5.6 2014-03-26 14:27:25 +02:00
Anatol Belski fd89d420a8 Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
  fix merge issue
  Added TSRMLS_CC to zend_is_true() calls

Conflicts:
	ext/spl/spl_array.c
2014-03-26 08:31:42 +01:00
Anatol Belski 9a9af437cb Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  - Updated to version 2014.2 (2014b)
  fix merge issue
  Updated NEWS for #66834
  Call offsetGet() when called with isset() on ArrayObject derivatives
  NEWS
  NEWS
  NEWS
  Fixed bug #66946 extensive backtracking in awk rule regular expression CVE-2013-7345
  Fixed bug #66946 extensive backtracking in awk rule regular expression CVE-2013-7345

Conflicts:
	ext/spl/spl_array.c
2014-03-26 08:30:15 +01:00
Anatol Belski ef05ba6411 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  - Updated to version 2014.2 (2014b)
  fix merge issue
  Updated NEWS for #66834
  Call offsetGet() when called with isset() on ArrayObject derivatives
  NEWS
  NEWS
  NEWS
  Fixed bug #66946 extensive backtracking in awk rule regular expression CVE-2013-7345
  Fixed bug #66946 extensive backtracking in awk rule regular expression CVE-2013-7345

Conflicts:
	ext/spl/spl_array.c
2014-03-25 17:37:06 +01:00
Derick Rethans 5fe735c5a2 Merge branch 'PHP-5.6' 2014-03-25 12:17:22 +00:00
Derick Rethans dcc0644cde Merge branch 'PHP-5.5' into PHP-5.6 2014-03-25 12:17:19 +00:00
Remi Collet ab72457d7f fix merge issue 2014-03-25 12:07:29 +01:00
Remi Collet 5f0428e8cc fix merge issue 2014-03-25 12:07:15 +01:00
Tjerk Meesters 4cb19f0a0f Added TSRMLS_CC to zend_is_true() calls 2014-03-25 19:05:43 +08:00
Tjerk Meesters 6018c47a28 Merge branch 'PHP-5.6' 2014-03-25 18:19:42 +08:00
Tjerk Meesters 98163c7d1b Updated NEWS for #66834 2014-03-25 18:16:30 +08:00
Tjerk Meesters 5dee3c11fe Call offsetGet() when called with isset() on ArrayObject derivatives 2014-03-25 18:15:18 +08:00
Remi Collet 94647425d7 Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fixed bug #66946 extensive backtracking in awk rule regular expression CVE-2013-7345
  Fixed bug #66946 extensive backtracking in awk rule regular expression CVE-2013-7345
2014-03-25 11:05:11 +01:00
Remi Collet c5f6d1ab29 NEWS 2014-03-25 11:04:49 +01:00
Remi Collet 64d7dd55d3 Fix merge (5.6 already have file 5.17) 2014-03-25 11:03:59 +01:00
Anatol Belski 0e15725152 Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
2014-03-25 09:06:02 +01:00
Anatol Belski 7915eb8c5c Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  fix disabling PGO for extensions, rel bug #65715
  more fixes related to bug #65715
  fix some warnings
  PHP-5.6 compatibility for apache2 filter SAPI
  updated NEWS
  updated NEWS
  updated NEWS
  Fixed bug #65715 php5embed.lib isn't provided anymore
2014-03-25 09:05:49 +01:00
Anatol Belski 2fb527660d Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  fix disabling PGO for extensions, rel bug #65715
  more fixes related to bug #65715
  fix some warnings
  PHP-5.6 compatibility for apache2 filter SAPI
  updated NEWS
  updated NEWS
  updated NEWS
  Fixed bug #65715 php5embed.lib isn't provided anymore
2014-03-25 09:03:32 +01:00
Anatol Belski 86e77b6b58 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix disabling PGO for extensions, rel bug #65715
2014-03-25 06:46:25 +01:00
Anatol Belski 655f2973eb Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix disabling PGO for extensions, rel bug #65715
2014-03-25 06:46:06 +01:00
Anatol Belski 978ceb2830 Merge branch 'PHP-5.6'
* PHP-5.6:
  more fixes related to bug #65715
2014-03-24 19:19:24 +01:00
Anatol Belski 59dcf9879b Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  more fixes related to bug #65715
2014-03-24 19:19:06 +01:00
Michael Wallner 8b9d12dd47 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix some warnings
  PHP-5.6 compatibility for apache2 filter SAPI

Fixes bug #66595
2014-03-24 17:53:08 +01:00
Michael Wallner caba0203e8 fix some warnings 2014-03-24 17:51:50 +01:00
Michael Wallner 275b2c420d PHP-5.6 compatibility for apache2 filter SAPI 2014-03-24 17:48:28 +01:00
Bob Weinand e55bbd47af Use the internal zend_get_opcode_name() function
Requires now >=5.4.24 or >=5.5.8 or >=5.6
2014-03-24 14:46:14 +01:00
Anatol Belski 12bc572008 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  updated NEWS
  updated NEWS
  Fixed bug #65715 php5embed.lib isn't provided anymore
2014-03-24 10:32:07 +01:00
Anatol Belski 26f7051cf4 updated NEWS 2014-03-24 10:31:08 +01:00
Anatol Belski 13e8486550 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated NEWS
  updated NEWS
  Fixed bug #65715 php5embed.lib isn't provided anymore
2014-03-24 10:30:05 +01:00
Bob Weinand c86ba551ac Merge branch 'master' into watchpoints_recursive
Conflicts:
	phpdbg.c
	phpdbg_utils.c
	phpdbg_utils.h
2014-03-23 23:32:13 +01:00
Bob Weinand 30fab784dc Fixed TSRM build 2014-03-23 14:57:25 +01:00
Bob Weinand bd2305f1d2 Fixed possible duplication of watchpoints output 2014-03-22 21:27:25 -04:00
Bob Weinand 7b0219212d Fixed possible segmentation fault upon unset with watchpoints 2014-03-22 09:39:39 -04:00
Anatol Belski 8afbb5cdd6 Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
2014-03-22 11:06:37 +01:00
Anatol Belski 208af7e86c Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  fix C89 compat
  fix signature
  Revert "Add helper function for updating bucket contents"
  Rename+move zend_hash_apply_deleter and reuse it
  Make zend_hash_apply_deleter() void, to allow reuse
  Add helper function for updating bucket contents
  Remove unnecessary check
  Fixes after merge
  Emit a warning in case of unallowed characters. Fix another place this code is used - reuse
  add info: empty strings are interned
  don't replace with ?, just skip it
2014-03-22 11:06:27 +01:00
Anatol Belski 18405e9dff Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  fix C89 compat
2014-03-22 10:45:56 +01:00
Anatol Belski d374c7703c Merge branch 'PHP-5.6'
* PHP-5.6:
  fix C89 compat
2014-03-22 10:44:40 +01:00
Anatol Belski 9d4001f1c8 fix C89 compat 2014-03-22 10:44:01 +01:00
Anatol Belski 4d647197cf fix signature 2014-03-22 10:34:32 +01:00
Anatol Belski 69ae149b4f Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  Revert "Add helper function for updating bucket contents"
  Rename+move zend_hash_apply_deleter and reuse it
  Make zend_hash_apply_deleter() void, to allow reuse
  Add helper function for updating bucket contents
  Remove unnecessary check
  Fixes after merge
  Emit a warning in case of unallowed characters. Fix another place this code is used - reuse
  add info: empty strings are interned
  don't replace with ?, just skip it

Conflicts:
	Zend/zend_hash.c
	ext/mysqlnd/mysqlnd.c
2014-03-22 10:24:11 +01:00
Andrey Hristov 61103cc25c Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-03-21 14:33:44 +02:00
Andrey Hristov b418bea1ac Merge branch 'master' of git.php.net:php-src 2014-03-21 14:33:32 +02:00
Nikita Popov 4290293b81 Merge branch 'PHP-5.6' 2014-03-21 01:34:46 +01:00
Nikita Popov f331ed1414 Revert "Add helper function for updating bucket contents"
Reverting this for now, because it would require further changes
thanks to the zend signals tsrms-but-only-sometimes awesomeness.
2014-03-21 01:32:49 +01:00
Nikita Popov 2b89f618ff Merge branch 'PHP-5.6' 2014-03-21 00:16:03 +01:00
Nikita Popov 4e7e301dda Rename+move zend_hash_apply_deleter and reuse it
The interruption handling was normalized to wrap the entire deletion
operation (instead of leaving out the destructor call and/or the
deallocation) per the recommendation of somebody (don't remember who)
familiar with zend signals.

There is an always-inlined variant of the function for use in
the main deletion function, to ensure there is no performance
impact.
2014-03-21 00:14:52 +01:00
Nikita Popov 4efa58dd59 Make zend_hash_apply_deleter() void, to allow reuse
Also remove lies in the comment above the function. apply_deleter
is not safe against modification, if the modification involves
removing the next bucket.

Also modified the implementation of zend_hash_graceful_destroy()
to be fully graceful (the reverse variant already was).
2014-03-21 00:14:51 +01:00
Nikita Popov c3a317117a Add helper function for updating bucket contents 2014-03-21 00:14:46 +01:00
Nikita Popov 994fcfcff9 Remove unnecessary check
In case of an update the key already existed, so the next free
element can not change.
2014-03-20 22:58:10 +01:00
Andrey Hristov e3babd3ac3 Merge branch 'PHP-5.6' 2014-03-20 17:29:02 +02:00
Andrey Hristov 113f22550a Fixes after merge 2014-03-20 17:28:49 +02:00
Andrey Hristov ea93d1fe83 Merge branch 'PHP-5.6' 2014-03-20 17:24:26 +02:00
Andrey Hristov d2ab74588e Merge branch 'PHP-5.5' into PHP-5.6 2014-03-20 16:30:01 +02:00
Remi Collet 3b4fcd3f39 Merge branch 'PHP-5.6'
* PHP-5.6:
  add info: empty strings are interned
2014-03-20 15:18:50 +01:00
Remi Collet 7f7c84d64f add info: empty strings are interned 2014-03-20 15:18:41 +01:00
Andrey Hristov 8ed85557e0 Merge branch 'PHP-5.6' 2014-03-20 16:16:27 +02:00
Andrey Hristov e52334fdbe Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
	ext/mysqli/mysqli_api.c
2014-03-20 16:16:12 +02:00
Anatol Belski f52f68303f Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
  Add default_charset handling
2014-03-20 08:58:37 +01:00
Anatol Belski 8aed7642c2 Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  Add default_charset handling
  Updated UPGRADING to add three changes
  OCI8: fix prototypes for oci_field_*().  They can take a column index or name.
  Change test package name ARRAYBINDPKG1 to a per-file unique name to aid parallel testing
  fix compilation error
  fix typo
  Fix problem with mysqli_commt()/mysqli_rollback()
  Restore NEWS and UPGRADING for hash_equals().
  5.5.11RC1 preparation
  Fixed typo
  Add missing E_DEPRECATED error for https://wiki.php.net/rfc/default_encoding
2014-03-20 08:56:27 +01:00
Anatol Belski 10248d3b5a Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  Add default_charset handling
  Updated UPGRADING to add three changes
  OCI8: fix prototypes for oci_field_*().  They can take a column index or name.
  Change test package name ARRAYBINDPKG1 to a per-file unique name to aid parallel testing
  fix compilation error
  fix typo
  Fix problem with mysqli_commt()/mysqli_rollback()
  Restore NEWS and UPGRADING for hash_equals().
  5.5.11RC1 preparation
  Fixed typo
  Add missing E_DEPRECATED error for https://wiki.php.net/rfc/default_encoding

Conflicts:
	ext/mysqli/mysqli_api.c
	ext/mysqlnd/mysqlnd.c
	ext/standard/html.c
2014-03-20 08:47:51 +01:00
Yasuo Ohgaki bd9978331f Merge branch 'PHP-5.6'
* PHP-5.6:
  Add default_charset handling
2014-03-20 11:04:23 +09:00
Yasuo Ohgaki 8f5a31ff37 Add default_charset handling 2014-03-20 11:03:02 +09:00
Yasuo Ohgaki e1fe76f28a Add default_charset handling 2014-03-20 10:50:32 +09:00
Tjerk Meesters d0e3173016 Updated UPGRADING to add three changes 2014-03-20 07:44:23 +08:00
Christopher Jones 122c69a0be Merge branch 'PHP-5.6'
* PHP-5.6:
  OCI8: fix prototypes for oci_field_*().  They can take a column index or name.
2014-03-19 15:23:40 -07:00
Christopher Jones 014c5706a8 Merge branch 'oci_field_doc_prototype_fixes' into PHP-5.6
* oci_field_doc_prototype_fixes:
  OCI8: fix prototypes for oci_field_*().  They can take a column index or name.
2014-03-19 15:23:07 -07:00
Christopher Jones 6c20b07190 OCI8: fix prototypes for oci_field_*(). They can take a column index or name. 2014-03-19 15:20:40 -07:00
Christopher Jones 3406f98439 Merge branch 'PHP-5.6'
* PHP-5.6:
  Change test package name ARRAYBINDPKG1 to a per-file unique name to aid parallel testing
2014-03-19 14:13:40 -07:00
Christopher Jones 8bdf272758 Change test package name ARRAYBINDPKG1 to a per-file unique name to aid parallel testing 2014-03-19 14:10:56 -07:00
Andrey Hristov d22d1035cb Merge branch 'PHP-5.6' 2014-03-19 19:15:15 +02:00
Andrey Hristov 62ab3af12f fix compilation error 2014-03-19 19:15:04 +02:00
Andrey Hristov e756f417b9 Merge branch 'PHP-5.6' 2014-03-19 18:55:40 +02:00
Andrey Hristov b86595a37c Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
	NEWS
2014-03-19 18:55:29 +02:00
Andrey Hristov 01c2ec03bc Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
	NEWS
	configure.in
	ext/mysqli/mysqli_api.c
	main/php_version.h
2014-03-19 18:54:39 +02:00
Adam Harvey 4bac43a520 Merge branch 'PHP-5.6' 2014-03-19 06:25:06 -07:00
Adam Harvey d613b0acc2 Restore NEWS and UPGRADING for hash_equals(). 2014-03-19 06:24:01 -07:00
Yasuo Ohgaki dc471acafe Merge branch 'PHP-5.6'
* PHP-5.6:
  Add missing E_DEPRECATED error for https://wiki.php.net/rfc/default_encoding
2014-03-19 18:14:32 +09:00
Anatol Belski 3b55f66d93 Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  fix macros
2014-03-19 09:46:01 +01:00
Anatol Belski fa6ba0ecdb fix macros 2014-03-19 09:45:22 +01:00
Anatol Belski 177d45ee17 Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
2014-03-19 09:43:16 +01:00
Anatol Belski c569a6502d Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  prep for 5.4.27 rc1
  remove obsolete comment
  Fixes to various stream cast on win64
  - Updated to version 2014.1 (2014a)
  Add a test
  Add hash_equals() to perform string comparisons that are not vulnerable to timing attacks.
2014-03-19 09:42:59 +01:00
Yasuo Ohgaki 3ce980cf97 Merge branch 'pull-request/622' into PHP-5.6
* pull-request/622:
  Fixed typo
  Add missing E_DEPRECATED error for https://wiki.php.net/rfc/default_encoding
2014-03-19 17:29:24 +09:00
Yasuo Ohgaki babaa43762 Fixed typo 2014-03-19 17:25:45 +09:00
Anatol Belski 87da8f58e2 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  prep for 5.4.27 rc1
  remove obsolete comment
  Fixes to various stream cast on win64
  - Updated to version 2014.1 (2014a)
  Add a test
  Add hash_equals() to perform string comparisons that are not vulnerable to timing attacks.

Conflicts:
	ext/bz2/bz2.c
	ext/standard/streamsfuncs.c
2014-03-19 08:53:59 +01:00
Stanislav Malyshev 2833c3b77d Merge branch 'PHP-5.6'
* PHP-5.6:
  prep for 5.4.27 rc1
2014-03-18 23:25:32 -07:00
Stanislav Malyshev c1765d7ffe Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  prep for 5.4.27 rc1
2014-03-18 23:25:08 -07:00
Anatol Belski 6d6cce0f56 Merge branch 'PHP-5.6'
* PHP-5.6:
  remove obsolete comment
  Fixes to various stream cast on win64
2014-03-19 06:38:18 +01:00
Anatol Belski ec11530620 remove obsolete comment 2014-03-19 06:35:58 +01:00
Anatol Belski 62f6c5853f Fixes to various stream cast on win64
This fixes further issues on win64 with casts from the streams.
Sockets/descriptors handling was unitized. This has an impact only on
win64, php_socket_t otherwise can be feed back to int datatype.
2014-03-19 06:33:46 +01:00
Adam Harvey 68e479b94d Merge branch 'PHP-5.6'
* PHP-5.6:
  Add hash_equals() to perform string comparisons that are not vulnerable to timing attacks.
2014-03-18 09:33:22 -07:00
Adam Harvey a6f7fca637 Merge accepted RFC https://wiki.php.net/rfc/timing_attack into 5.6. 2014-03-18 09:22:13 -07:00
Derick Rethans 22fc261628 Merge branch 'PHP-5.6' 2014-03-18 15:02:27 +00:00
Derick Rethans 415233d26d Merge branch 'PHP-5.5' into PHP-5.6 2014-03-18 15:02:25 +00:00
Andrey Hristov dd1670067c Merge branch 'PHP-5.6' 2014-03-18 16:19:34 +02:00
Andrey Hristov 39c53031e0 Merge branch 'PHP-5.5' into PHP-5.6 2014-03-18 15:42:57 +02:00
Anatol Belski 849b546ba0 Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
2014-03-18 14:12:54 +01:00
Anatol Belski 4535642ad4 Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  Fixed wrong indentation
  Fix phpdbg build on FreeBSD
  Fixed off-by-one in php_url_parse_ex
  Fixed typo in UPGRADING and modified php.ini-* description for encoding related changes
  Add support for PCRE marks
  Update UPGRADING. Add more descriptions about default_charset and encoding related changes. Many thanks to Christopher.
  UPGRADING (openssl updates)
  Support async pgsql connections and non-blocking queries
2014-03-18 14:11:44 +01:00
Anatol Belski ed70f02b29 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  Fixed wrong indentation
  Fix phpdbg build on FreeBSD
  Fixed off-by-one in php_url_parse_ex
  Fixed typo in UPGRADING and modified php.ini-* description for encoding related changes
  Add support for PCRE marks
  Update UPGRADING. Add more descriptions about default_charset and encoding related changes. Many thanks to Christopher.
  UPGRADING (openssl updates)
  Support async pgsql connections and non-blocking queries

Conflicts:
	ext/pcre/php_pcre.c
	ext/pgsql/pgsql.c
2014-03-18 14:03:25 +01:00
Mateusz Kocielski 582032b659 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed wrong indentation
2014-03-18 10:50:16 +01:00
Mateusz Kocielski 6c259625c4 Fixed wrong indentation 2014-03-18 10:49:28 +01:00
Mateusz Kocielski 1a5c51829a Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix phpdbg build on FreeBSD
  Fixed off-by-one in php_url_parse_ex
2014-03-18 10:03:06 +01:00
Mateusz Kocielski 888f467d63 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed off-by-one in php_url_parse_ex
2014-03-18 09:53:58 +01:00
Mateusz Kocielski ccae70b765 Fix phpdbg build on FreeBSD
Added missing netinet/in.h header.
2014-03-18 09:51:39 +01:00
Yasuo Ohgaki 789b10ccb5 Merge branch 'PHP-5.6'
* PHP-5.6:
 Modified php.ini-* description for encoding related changes
2014-03-18 07:29:22 +09:00
Yasuo Ohgaki a28389b2ab Fixed typo in UPGRADING and modified php.ini-* description for encoding related changes 2014-03-18 07:28:26 +09:00
Nikita Popov 2c31b9f506 Merge branch 'PHP-5.6' 2014-03-17 22:32:45 +01:00
Nikita Popov 42562ee913 Add support for PCRE marks
If a MARK is set then it will be returned in the $matches array
unter key "MARK". If no MARK is used or passed, the key will not
be set.
2014-03-17 22:32:40 +01:00
Yasuo Ohgaki c4c97d878d Update UPGRADING.
Add more descriptions about default_charset and encoding related changes.
Many thanks to Christopher.
2014-03-18 05:49:09 +09:00
Daniel Lowrey ddbd20bd29 Merge branch 'PHP-5.6'
* PHP-5.6:
  Support async pgsql connections and non-blocking queries
2014-03-17 08:03:54 -06:00
Daniel Lowrey 33c7976dfc UPGRADING (openssl updates) 2014-03-17 08:03:40 -06:00
Daniel Lowrey 098b4e8f5a Merge branch 'pgsql-async' into PHP-5.6
* pgsql-async:
  Support async pgsql connections and non-blocking queries
2014-03-17 07:55:42 -06:00
Daniel Lowrey 2ee4c987e6 Support async pgsql connections and non-blocking queries
- New functions (each accepts a pgsql $connection resource):

  . pg_connect_poll
  . pg_socket
  . pg_consume_input
  . pg_flush

- Modified functions

  The following functions now additionally return zero if the
  underlying socket is set to non-blocking mode and the send
  operation does not complete immediately. Previously these
  functions returned only boolean TRUE/FALSE and blocked
  execution while polling until all data was sent:

  . pg_send_execute
  . pg_send_prepare
  . pg_send_query
  . pg_send_query_params

- New constants

  Used with pg_connect() to initiate an asynchronous connection
  attempt:

  . PGSQL_CONNECT_ASYNC

  Used with pg_connection_status() to determine the current state
  of an async connection attempt:

  . PGSQL_CONNECTION_STARTED
  . PGSQL_CONNECTION_MADE
  . PGSQL_CONNECTION_AWAITING_RESPONSE
  . PGSQL_CONNECTION_AUTH_OK
  . PGSQL_CONNECTION_SSL_STARTUP
  . PGSQL_CONNECTION_SETENV

  Used with pg_connect_poll() to determine the result of an
  async connection attempt:

  . PGSQL_POLLING_FAILED
  . PGSQL_POLLING_READING
  . PGSQL_POLLING_WRITING
  . PGSQL_POLLING_OK
  . PGSQL_POLLING_ACTIVE

- Polling via returned pg_socket() stream

  pg_socket() returns a read-only socket stream that may be
  cast to a file descriptor for select (and similar) polling
  operations. Blocking behavior of the pgsql connection socket
  can be controlled by calling stream_set_blocking() on the
  stream returned by pg_socket().
2014-03-17 06:31:15 -06:00
Bob Weinand 1401314a1b Fixed one major bug in phpdbg_btree_delete
There is some bug when arrays/property tables are deleted: the children are not notified

(Considering now to overwrite the dtor of the array)
2014-03-17 06:19:14 -04:00
Anatol Belski 87958f8cf7 Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  fix macros
2014-03-17 11:15:13 +01:00
Anatol Belski 1ad45a3741 fix macros 2014-03-17 11:14:33 +01:00
Anatol Belski 81fc3398c1 Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
2014-03-17 11:08:17 +01:00
Anatol Belski 263572fbe3 Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  Fix bug #66873: check if obj->src is set
  updated NEWS
  updated to oniguruma to 5.9.5
2014-03-17 11:07:54 +01:00
Anatol Belski 300a8df8f4 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  Fix bug #66873: check if obj->src is set
  updated NEWS
  updated to oniguruma to 5.9.5

Conflicts:
	ext/intl/converter/converter.c
2014-03-17 10:37:46 +01:00
Rouven Weßling 2148a88b3d Add hash_equals() to perform string comparisons that are not vulnerable to timing attacks. 2014-03-17 09:37:28 +01:00
Stanislav Malyshev 5b6c416002 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix bug #66873: check if obj->src is set
2014-03-17 01:20:31 -07:00
Stanislav Malyshev 2499b6518c Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix bug #66873: check if obj->src is set
2014-03-17 01:20:09 -07:00
Bob Weinand f887960f9b removed some weird crash when freeing to early 2014-03-16 22:37:33 +01:00
Bob Weinand 98025a40b8 Cleanup 2014-03-16 20:04:08 +01:00
Bob Weinand 3fcdd6ab0f Added WINDOWS support for watchpoints
Actually it mainly works by just a bit macro substitution and function
redeclarations.
So it leaves the code working on UNIX mostly untouched.

I needed to substitute the allocating functions by a Virtual*() functions
wrapper to use VirtualProtect() on the memory.
2014-03-16 19:39:02 +01:00
Anatol Belski 511ea15808 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  updated to oniguruma to 5.9.5
2014-03-15 18:00:38 +01:00
Anatol Belski 7c904c6cbd updated NEWS 2014-03-15 18:00:16 +01:00
Anatol Belski f5ebea91b0 updated to oniguruma to 5.9.5 2014-03-15 17:56:04 +01:00
Julio Pintos 4c70701e58 fix file descriptor leak of epollfd 2014-03-14 16:47:30 -03:00
Anatol Belski aa0c920cc5 Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
2014-03-14 12:36:50 +01:00
Anatol Belski c302a31491 Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  NEWS
  NEWS
  NEWS
  Fixed Bug #66833 Default digest algo is still MD5
  reorder the struct members which reduces its size by at least 112 bytes
  arg count is zend_size_t now, fix type
  Fix 5.5.10 NEWS
  fix declarations
  Typo fix: sicret -> secret
2014-03-14 12:27:09 +01:00
Anatol Belski 78fef11fe5 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fixed Bug #66833 Default digest algo is still MD5
  Fix 5.5.10 NEWS
  Typo fix: sicret -> secret
2014-03-14 12:21:20 +01:00
Remi Collet 90ea07a25c Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fixed Bug #66833 Default digest algo is still MD5
  Fix 5.5.10 NEWS
2014-03-14 09:53:35 +01:00
Remi Collet 8cde747336 NEWS 2014-03-14 09:53:11 +01:00
Remi Collet 89dc5924c9 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #66833 Default digest algo is still MD5
  Fix 5.5.10 NEWS
2014-03-14 09:52:47 +01:00
Anatol Belski beac52a78b reorder the struct members which reduces its size by at least 112 bytes 2014-03-13 18:28:22 +01:00
Anatol Belski 39fa14d089 arg count is zend_size_t now, fix type 2014-03-13 18:26:43 +01:00
Anatol Belski 3a66f6343c fix declarations 2014-03-13 05:47:31 -07:00
Lior Kaplan 14731a7501 Merge branch 'PHP-5.6'
* PHP-5.6:
  Typo fix: sicret -> secret
2014-03-13 12:43:15 +02:00
Lior Kaplan f120463efe Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Typo fix: sicret -> secret
2014-03-13 12:41:48 +02:00
Anatol Belski 386d326e8a Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
2014-03-13 11:17:04 +01:00
Anatol Belski b4c627c826 Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  fix array types for pass by ref
  fix macro
  updated libs_version.txt
2014-03-13 11:16:55 +01:00
Anatol Belski af0bc1a306 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  updated libs_version.txt
2014-03-13 11:16:12 +01:00
Anatol Belski 65fcde6651 fix array types for pass by ref 2014-03-13 11:02:05 +01:00
Anatol Belski be0563b5b0 fix macro 2014-03-13 10:50:30 +01:00
Anatol Belski 21db15ed1d Merge branch 'PHP-5.6'
* PHP-5.6:
  updated libs_version.txt
2014-03-13 10:31:26 +01:00
Anatol Belski f0634b5be5 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated libs_version.txt

Conflicts:
	win32/build/libs_version.txt
2014-03-13 10:31:03 +01:00
Anatol Belski 90bf37bff9 Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
2014-03-13 10:19:02 +01:00
Anatol Belski 1f094bf6f5 Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  fix zpp
  Remove unneeded test
  Update NEWS
  Revert "Implement Bug #54649 Create session_serializer_name()"
  Revert "Implemented Request #11100 (session_gc() function)."
  made libgd recognize the 9 version series
  fix include search
  NEWS
  NEWS
  Fix bug  #66887 imagescale - poor quality of scaled image
  NEWS
  Fixed Bug #66893i imagescale ignore method argument
  Add SKIPIF in GMP test
  Fix hash_pbkdf2() with missing $length argument
  typo in NEWS
  typo in NEWS
  NEWS
  NEWS
  Fixed Bug #66890 imagescale segfault
  Updated UPGRADING to cover PDO_pgsql changes
2014-03-13 10:18:50 +01:00
Anatol Belski 5ea53dc6df fix zpp 2014-03-13 10:16:19 +01:00
Anatol Belski 3fdbb0d39f Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  Remove unneeded test
  Update NEWS
  Revert "Implement Bug #54649 Create session_serializer_name()"
  Revert "Implemented Request #11100 (session_gc() function)."
  made libgd recognize the 9 version series
  fix include search
  NEWS
  NEWS
  Fix bug  #66887 imagescale - poor quality of scaled image
  NEWS
  Fixed Bug #66893i imagescale ignore method argument
  Add SKIPIF in GMP test
  Fix hash_pbkdf2() with missing $length argument
  typo in NEWS
  typo in NEWS
  NEWS
  NEWS
  Fixed Bug #66890 imagescale segfault
  Updated UPGRADING to cover PDO_pgsql changes

Conflicts:
	ext/gd/gd.c
	ext/hash/hash.c
	ext/session/session.c
2014-03-13 08:38:58 +01:00
Yasuo Ohgaki ea72093259 Merge branch 'PHP-5.6'
* PHP-5.6:
  Remove unneeded test
2014-03-13 06:55:10 +09:00
Yasuo Ohgaki 973f379efc Remove unneeded test 2014-03-13 06:54:52 +09:00
Yasuo Ohgaki 96d25b4b76 Update NEWS 2014-03-13 06:34:46 +09:00
Yasuo Ohgaki 0021095c40 Merge branch 'PHP-5.6'
* PHP-5.6:
  Revert "Implement Bug #54649 Create session_serializer_name()"
  Revert "Implemented Request #11100 (session_gc() function)."
2014-03-13 06:33:28 +09:00
Yasuo Ohgaki 6f0ad9ea12 Revert "Implement Bug #54649 Create session_serializer_name()"
This reverts commit 678ec30655.

Conflicts:
	ext/session/tests/session_serializer_name_basic.phpt
2014-03-13 06:32:49 +09:00
Yasuo Ohgaki 7dec5789fe Revert "Implemented Request #11100 (session_gc() function)."
This reverts commit 54a42f0d0c.

Conflicts:
	ext/session/tests/session_gc_basic.phpt
2014-03-13 06:30:32 +09:00
Anatol Belski f407482fcc Merge branch 'PHP-5.6'
* PHP-5.6:
  made libgd recognize the 9 version series
2014-03-12 19:31:21 +01:00
Anatol Belski 0bf5bce6ad Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  made libgd recognize the 9 version series
2014-03-12 19:31:07 +01:00
Anatol Belski 983e105d6b Merge branch 'PHP-5.6'
* PHP-5.6:
  fix include search
2014-03-12 19:25:44 +01:00
Anatol Belski 75486555c2 fix include search 2014-03-12 19:25:20 +01:00
Remi Collet 1db6ecc235 Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  NEWS
  Fix bug  #66887 imagescale - poor quality of scaled image
2014-03-12 17:13:55 +01:00
Remi Collet 78cee12561 NEWS 2014-03-12 17:13:47 +01:00
Remi Collet 44c0581e0c Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  Fix bug  #66887 imagescale - poor quality of scaled image
2014-03-12 17:13:31 +01:00
Remi Collet a498e64914 Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  Fixed Bug #66893i imagescale ignore method argument
2014-03-12 15:36:52 +01:00
Remi Collet 4a1efa350a NEWS 2014-03-12 15:36:38 +01:00
Remi Collet 5bd13c5231 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed Bug #66893i imagescale ignore method argument
2014-03-12 15:36:08 +01:00
Nikita Popov e2a5859b2f Merge branch 'PHP-5.6' 2014-03-12 14:17:27 +01:00
Nikita Popov 5e93a213f6 Add SKIPIF in GMP test 2014-03-12 14:17:08 +01:00
Nikita Popov e617dfbdf3 Merge branch 'PHP-5.5' into PHP-5.6 2014-03-12 14:16:58 +01:00
Remi Collet bc8095350d Merge branch 'PHP-5.6'
* PHP-5.6:
  typo in NEWS
  typo in NEWS
2014-03-12 14:08:36 +01:00
Remi Collet 0bccd48d3f typo in NEWS 2014-03-12 14:08:25 +01:00
Remi Collet a912fb498e Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  typo in NEWS
2014-03-12 14:08:09 +01:00
Remi Collet ee06def81b Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  NEWS
  Fixed Bug #66890 imagescale segfault
2014-03-12 13:47:36 +01:00
Remi Collet 081e2b9928 NEWS 2014-03-12 13:47:10 +01:00
Remi Collet c8c1205d84 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  Fixed Bug #66890 imagescale segfault
2014-03-12 13:46:51 +01:00
Matteo Beccati f35aba1874 Merge branch 'PHP-5.6'
* PHP-5.6:
  Updated UPGRADING to cover PDO_pgsql changes
2014-03-12 12:32:25 +01:00
Matteo Beccati f0da85b492 Updated UPGRADING to cover PDO_pgsql changes 2014-03-12 12:31:04 +01:00
Yasuo Ohgaki ca927bb47e Add missing E_DEPRECATED error for https://wiki.php.net/rfc/default_encoding 2014-03-12 17:54:22 +09:00
Anatol Belski bda12b052a Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
2014-03-12 09:06:05 +01:00
Anatol Belski c6f5be6427 Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  Updated NEWS
  Added new PDO::PGSQL_ATTR_DISABLE_PREPARES that uses PQexecParams
  Deprecated PDO::PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT
  Drop PDO support for extremely old libpq versions
  Fix compile error with theoretically supported versions of libcurl < 7.12.3.
2014-03-12 09:05:51 +01:00
Anatol Belski 63d06ce9b0 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  Updated NEWS
  Added new PDO::PGSQL_ATTR_DISABLE_PREPARES that uses PQexecParams
  Deprecated PDO::PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT
  Drop PDO support for extremely old libpq versions
  Fix compile error with theoretically supported versions of libcurl < 7.12.3.

Conflicts:
	ext/pdo_pgsql/pdo_pgsql.c
	ext/pdo_pgsql/pgsql_driver.c
2014-03-12 09:02:39 +01:00
Matteo Beccati f702bf3178 Merge branch 'PHP-5.6'
* PHP-5.6:
  Added new PDO::PGSQL_ATTR_DISABLE_PREPARES that uses PQexecParams
  Deprecated PDO::PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT
  Drop PDO support for extremely old libpq versions
2014-03-11 23:30:18 +01:00
Matteo Beccati 1241a63931 Updated NEWS 2014-03-11 23:28:53 +01:00
Matteo Beccati e378348a31 Added new PDO::PGSQL_ATTR_DISABLE_PREPARES that uses PQexecParams
Faster than prepared statements when queries are run once. Slightly
slower than PDO::ATTR_EMULATE_PREPARES but without the potential
security implications of embedding parameters in the query itself.
2014-03-11 23:10:48 +01:00
Matteo Beccati d72621ab9e Deprecated PDO::PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT 2014-03-11 23:10:48 +01:00
Matteo Beccati b1ffea3ccc Drop PDO support for extremely old libpq versions
configure will now fail if any of the following function is missing:
* PQprepare
* PQexecParams
* PQescapeStringConn
* PQescapeByteaConn
2014-03-11 23:10:47 +01:00
Adam Harvey 4ab192908f Merge branch 'PHP-5.6' 2014-03-11 11:07:21 -07:00
Adam Harvey 1a14eb53c4 Merge branch 'PHP-5.5' into PHP-5.6 2014-03-11 11:06:39 -07:00
Anatol Belski 7fbf929125 Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
2014-03-11 16:36:35 +01:00
Anatol Belski 7d770a9d50 Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  fix path separator
  Use /dev/urandom as the default mcrypt_create_iv() source
  Add tests for bug #66872 and gmp_[rem]root
  Fixed mcrypt test case
  Removed bogus loops
  restored the old code in 5.4/5 related to bug #66872
2014-03-11 16:36:12 +01:00
Anatol Belski f224455520 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  fix path separator
2014-03-11 16:30:43 +01:00
Anatol Belski 664b38a21d Merge branch 'PHP-5.6'
* PHP-5.6:
  fix path separator
2014-03-11 16:29:53 +01:00
Anatol Belski adca4c355c fix path separator 2014-03-11 16:29:30 +01:00
Anatol Belski adbb44537a Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  Use /dev/urandom as the default mcrypt_create_iv() source
  Add tests for bug #66872 and gmp_[rem]root
  Fixed mcrypt test case
  Removed bogus loops
  restored the old code in 5.4/5 related to bug #66872

Conflicts:
	ext/mcrypt/mcrypt.c
2014-03-11 15:32:07 +01:00
Bob Weinand 7a9e3e422f Added support for recursive watchpoints deletion 2014-03-11 09:11:27 -04:00
Nikita Popov 32103286de Merge branch 'PHP-5.6' 2014-03-11 14:06:57 +01:00
Nikita Popov fd5fbba98c Use /dev/urandom as the default mcrypt_create_iv() source
Also fixes the ARGINFO for mcrypt_create_iv() and adds missing
UPGRADING entries.
2014-03-11 14:06:13 +01:00
Nikita Popov a117e6b937 Add tests for bug #66872 and gmp_[rem]root 2014-03-11 14:06:12 +01:00
Tjerk Meesters 03e9878c78 Fixed mcrypt test case 2014-03-11 20:49:41 +08:00
Tjerk Meesters ea72a9b771 Merge branch 'PHP-5.6' 2014-03-11 19:17:11 +08:00
Tjerk Meesters ffc0f8a16f Merge branch 'php-5.5' into PHP-5.6 2014-03-11 19:16:13 +08:00
Anatol Belski 4bebb23d00 Merge branch 'PHP-5.6'
* PHP-5.6:
  restored the old code in 5.4/5 related to bug #66872
2014-03-11 11:53:42 +01:00
Anatol Belski 54a18f3be6 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  restored the old code in 5.4/5 related to bug #66872
2014-03-11 11:53:17 +01:00
Bob Weinand 008842c7fa Added COW handling and fixed various bugs 2014-03-11 06:14:32 -04:00
Anatol Belski b873bb63c5 Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
  inject it directly. This is not C++ and I don't want to use hacks with similar structures that are binary compatible. Better be explicit.

Conflicts:
	ext/mysqlnd/mysqlnd_structs.h
2014-03-11 09:58:36 +01:00
Anatol Belski b99af06dfe Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  Fixed Bug #66875 (Improve performance of multi-row OCI_RETURN_LOB queries)
2014-03-11 09:56:44 +01:00
Anatol Belski 78bbfd7fac Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  Fixed Bug #66875 (Improve performance of multi-row OCI_RETURN_LOB queries)
2014-03-11 09:46:41 +01:00
Anatol Belski 0ae46ce747 no need to fetch ts id here 2014-03-11 09:40:47 +01:00
Anatol Belski ddf306fdd2 Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  updated libsqlite to 3.8.3.1 in 5.5 branch, too
  DI
  Switch from a single flag to a flag byte
  updated libmagic.patch
  updated libmagic.patch

Conflicts:
	Zend/zend_language_scanner.c
2014-03-11 09:40:08 +01:00
Anatol Belski bed93450cd Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  updated libsqlite to 3.8.3.1 in 5.5 branch, too
  DI
  Switch from a single flag to a flag byte
  updated libmagic.patch
  updated libmagic.patch
  update NEWS
  fix #66872, invalid argument crashes gmp_testbit
  fix #66872, invalid argument crashes gmp_testbit
  update news
  - fix #66869, Invalid 2nd argument crashes imageaffinematrixget
  add vc12 (2013)
  add vc12 (2013)

Conflicts:
	Zend/zend_ini_scanner.c
	Zend/zend_language_scanner.c
	ext/mysqlnd/mysqlnd_structs.h
2014-03-11 09:26:05 +01:00
Christopher Jones cc409199f9 Merge branch 'master' of https://git.php.net/repository/php-src
# By Andrey Hristov (3) and Anatol Belski (1)
# Via Andrey Hristov (8) and others
* 'master' of https://git.php.net/repository/php-src:
  inject it directly. This is not C++ and I don't want to use hacks with similar structures that are binary compatible. Better be explicit.
  updated libsqlite to 3.8.3.1 in 5.5 branch, too
  DI
  Switch from a single flag to a flag byte
2014-03-10 16:46:43 -07:00
Christopher Jones f0ec533573 Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
# By Pierre Joye (7) and others
# Via Pierre Joye (10) and others
* 'PHP-5.6' of https://git.php.net/repository/php-src:
  updated libsqlite to 3.8.3.1 in 5.5 branch, too
  DI
  Switch from a single flag to a flag byte
  update NEWS
  fix #66872, invalid argument crashes gmp_testbit
  fix #66872, invalid argument crashes gmp_testbit
  update news
  - fix #66869, Invalid 2nd argument crashes imageaffinematrixget
  add vc12 (2013)
  add vc12 (2013)
2014-03-10 16:46:42 -07:00
Christopher Jones de4ff2c5a4 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed Bug #66875 (Improve performance of multi-row OCI_RETURN_LOB queries)
2014-03-10 16:34:21 -07:00
Christopher Jones 601367ee75 Fixed Bug #66875 (Improve performance of multi-row OCI_RETURN_LOB queries) 2014-03-10 16:33:35 -07:00
Andrey Hristov fa2e8615bf Merge branch 'master' of git.php.net:php-src 2014-03-10 19:24:29 +02:00
Andrey Hristov 5e836b443c Merge branch 'PHP-5.6' 2014-03-10 19:16:22 +02:00
Andrey Hristov d2a291393a inject it directly. This is not C++ and I don't want to use hacks with similar structures
that are binary compatible. Better be explicit.
2014-03-10 19:15:30 +02:00
Anatol Belski c946d7f086 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-03-10 17:52:51 +01:00
Anatol Belski 6cac2eec27 Merge branch 'master' of git.php.net:php-src 2014-03-10 17:52:32 +01:00
Anatol Belski 720522a24d Merge branch 'PHP-5.6'
* PHP-5.6:
  updated libsqlite to 3.8.3.1 in 5.5 branch, too
2014-03-10 17:51:05 +01:00
Anatol Belski dc87c208fd Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated libsqlite to 3.8.3.1 in 5.5 branch, too
2014-03-10 17:50:45 +01:00
Andrey Hristov 3456d47235 Merge branch 'PHP-5.6' 2014-03-10 18:19:22 +02:00
Andrey Hristov 73f03a47d0 DI 2014-03-10 18:18:56 +02:00
Andrey Hristov 07738a0f2b Merge branch 'PHP-5.6' 2014-03-10 17:52:48 +02:00
Andrey Hristov 16043b261f Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-03-10 17:34:18 +02:00
Andrey Hristov 2cece8574f Merge branch 'master' of git.php.net:php-src 2014-03-10 17:34:08 +02:00
Pierre Joye 52a44a736b Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
# By Anatol Belski (2) and others
# Via Anatol Belski (3) and others
* 'PHP-5.6' of git.php.net:php-src:
  updated libmagic.patch
  updated libmagic.patch
  Fix indentation
  Do not remove *.1, it's not generated by make but configure
  Fix typo: entory -> entry
2014-03-10 16:28:41 +01:00
Pierre Joye b1e661e0c5 Merge branch 'master' of git.php.net:php-src
# By Anatol Belski
# Via Anatol Belski
* 'master' of git.php.net:php-src:
  updated libmagic.patch
  updated libmagic.patch
  fix ZTS
2014-03-10 16:26:57 +01:00
Andrey Hristov f995187d34 Merge branch 'PHP-5.6' 2014-03-10 17:26:13 +02:00
Andrey Hristov 990f9c8f3f Switch from a single flag to a flag byte 2014-03-10 17:25:53 +02:00
Anatol Belski cfe1a63f4d Merge branch 'PHP-5.6'
* PHP-5.6:
  updated libmagic.patch
  updated libmagic.patch
2014-03-10 14:18:06 +01:00
Anatol Belski 8bda4c685a updated libmagic.patch 2014-03-10 14:17:47 +01:00
Anatol Belski 6dd80946a2 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated libmagic.patch
2014-03-10 14:14:01 +01:00
Bob Weinand b033c4fa28 Added handling of zval separation (aka watchpoint changes) 2014-03-10 09:10:27 -04:00
Anatol Belski 82c056235a Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
  fix ZTS
  update NEWS
  fix #66872, invalid argument crashes gmp_testbit
  fix #66872, invalid argument crashes gmp_testbit
  update news
  - fix #66869, Invalid 2nd argument crashes imageaffinematrixget
  Fixed mcrypt test case
  add vc12 (2013)
  add vc12 (2013)

Conflicts:
	ext/openssl/openssl.c
2014-03-10 12:45:17 +01:00
Anatol Belski b582be1e23 Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  Fix indentation
2014-03-10 12:33:02 +01:00
Anatol Belski be9c9da186 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  Fix indentation
2014-03-10 12:30:09 +01:00
Anatol Belski 4b9cf5468a Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport: (48 commits)
  more fixes to ext/mcrypt
  partly revert the wrong merge
  Do not remove *.1, it's not generated by make but configure
  Fix typo: entory -> entry
  after merge fixes
  updated NEWS
  removed the libsqlite patch as it's not relevant anymore
  updated bundled libsqlite to 3.8.3.1
  add OPSYS_Z_CPM missing constant
  Update php.ini files (new openssl directives)
  Fixed null termination
  Updated NEWS for #65545
  Updated NEWS for #65545
  Add fread(length) method
  Updated news for #66822
  Allow T_POW in constant expressions
  Fix typo
  Fix #66698: Add fnv1a32 and fnv1a64 hash options
  Fix HTML entity table generation
  Add test for bug #62102 / RFC 2144
  ...

Conflicts:
	ext/openssl/openssl.c
	ext/openssl/xp_ssl.c
2014-03-10 12:28:00 +01:00
Anatol Belski dd7ecf2c5b fix ZTS 2014-03-10 12:24:32 +01:00
Pierre Joye 6d6da2f189 Merge branch 'PHP-5.6'
* PHP-5.6:
  update NEWS
  fix #66872, invalid argument crashes gmp_testbit
  fix #66872, invalid argument crashes gmp_testbit
  add vc12 (2013)
2014-03-10 12:19:36 +01:00
Pierre Joye 5f88102fca Merge branch 'master' of git.php.net:php-src
# By Andrey Hristov (1) and others
# Via Andrey Hristov (3) and others
* 'master' of git.php.net:php-src:
  Fix indentation
  Do not remove *.1, it's not generated by make but configure
  Fix typo: entory -> entry
2014-03-10 12:19:32 +01:00
Pierre Joye eef2978afc Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  update NEWS
  fix #66872, invalid argument crashes gmp_testbit
  fix #66872, invalid argument crashes gmp_testbit
  add vc12 (2013)

Conflicts:
	ext/gmp/gmp.c
2014-03-10 12:18:57 +01:00
Andrey Hristov 9a112e00cd Merge branch 'PHP-5.6' 2014-03-10 12:55:53 +02:00
Andrey Hristov c8033ac207 Merge branch 'PHP-5.5' into PHP-5.6 2014-03-10 12:53:17 +02:00
Anatol Belski 61363d4751 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  Do not remove *.1, it's not generated by make but configure
  Fix typo: entory -> entry
2014-03-10 11:16:19 +01:00
Anatol Belski 8cea765858 more fixes to ext/mcrypt 2014-03-10 11:15:34 +01:00
Anatol Belski 0190e37ec6 partly revert the wrong merge 2014-03-10 09:21:12 +01:00
Xinchen Hui 29500848f6 Merge branch 'PHP-5.6' 2014-03-10 15:55:20 +08:00
Xinchen Hui aa23d754a9 Merge branch 'PHP-5.5' into PHP-5.6 2014-03-10 15:55:05 +08:00
Lior Kaplan 7cf0931f18 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix typo: entory -> entry
2014-03-09 23:07:48 +02:00
Lior Kaplan 6e16cc3528 Fix typo: entory -> entry 2014-03-09 22:58:04 +02:00
Pierre Joye c1732700db Merge branch 'PHP-5.6'
* PHP-5.6:
  update news
  - fix #66869, Invalid 2nd argument crashes imageaffinematrixget
  add vc12 (2013)
2014-03-09 21:18:23 +01:00
Pierre Joye ba79c45174 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  update news
  - fix #66869, Invalid 2nd argument crashes imageaffinematrixget
  add vc12 (2013)

Conflicts:
	win32/build/confutils.js
2014-03-09 21:17:06 +01:00
Pierre Joye bf58535965 Merge branch 'master' of git.php.net:php-src
# By Nikita Popov (10) and others
# Via Remi Collet (9) and others
* 'master' of git.php.net:php-src: (41 commits)
  updated NEWS
  removed the libsqlite patch as it's not relevant anymore
  updated bundled libsqlite to 3.8.3.1
  Fixed mcrypt test case
  add OPSYS_Z_CPM missing constant
  Update php.ini files (new openssl directives)
  Fixed null termination
  Updated NEWS for #65545
  Updated NEWS for #65545
  Add fread(length) method
  Updated news for #66822
  Allow T_POW in constant expressions
  Fix typo
  Fix #66698: Add fnv1a32 and fnv1a64 hash options
  Fix HTML entity table generation
  Add test for bug #62102 / RFC 2144
  Whitespace.
  Misc cleanup including adding the version number
  Fix order in NEWS
  Add CVE ref (not known at release time)
  ...
2014-03-09 17:06:57 +01:00
Anatol Belski 2a2649ed0a after merge fixes 2014-03-09 16:17:44 +01:00
Anatol Belski 7b8ba8e3e3 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6: (43 commits)
  updated NEWS
  removed the libsqlite patch as it's not relevant anymore
  updated bundled libsqlite to 3.8.3.1
  add OPSYS_Z_CPM missing constant
  Update php.ini files (new openssl directives)
  Fixed null termination
  Updated NEWS for #65545
  Updated NEWS for #65545
  Add fread(length) method
  Updated news for #66822
  Allow T_POW in constant expressions
  Fix typo
  Fix #66698: Add fnv1a32 and fnv1a64 hash options
  Fix HTML entity table generation
  Add test for bug #62102 / RFC 2144
  Whitespace.
  Misc cleanup including adding the version number
  Fix order in NEWS
  Add CVE ref (not known at release time)
  Fix NEWS for 5.5.11 fix (really not in 5.5.10)
  ...

Conflicts:
	ext/mcrypt/mcrypt.c
	ext/mysqlnd/mysqlnd.h
	ext/mysqlnd/mysqlnd_ps.c
	ext/mysqlnd/mysqlnd_result.c
	ext/mysqlnd/mysqlnd_result.h
	ext/mysqlnd/mysqlnd_structs.h
	ext/openssl/openssl.c
	ext/openssl/xp_ssl.c
	ext/zip/php_zip.c
2014-03-09 15:00:36 +01:00
Anatol Belski e3776042b9 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
2014-03-09 13:06:51 +01:00
Anatol Belski 7d0493219c updated NEWS 2014-03-09 13:06:32 +01:00
Anatol Belski efd983a40f Merge branch 'PHP-5.6'
* PHP-5.6:
  removed the libsqlite patch as it's not relevant anymore
2014-03-09 13:04:14 +01:00
Anatol Belski 2dd378df36 removed the libsqlite patch as it's not relevant anymore 2014-03-09 13:03:43 +01:00
Anatol Belski c34aa1cd63 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated bundled libsqlite to 3.8.3.1
2014-03-09 13:02:33 +01:00
Anatol Belski 61db86bff3 updated bundled libsqlite to 3.8.3.1 2014-03-09 13:01:48 +01:00
Bob Weinand 37ca791a91 Fixed recursive segfault in segfault handler 2014-03-08 09:52:57 -05:00
Tjerk Meesters 84efa66e4d Updated test case with expected output 2014-03-08 16:17:30 +08:00
Tjerk Meesters d09eb1504a Fixed mcrypt test case 2014-03-08 16:16:46 +08:00
Remi Collet 397b8aa2ad Merge branch 'PHP-5.6'
* PHP-5.6:
  add OPSYS_Z_CPM missing constant
2014-03-07 14:10:31 +01:00
Remi Collet 7946c5a235 add OPSYS_Z_CPM missing constant 2014-03-07 14:10:16 +01:00
Daniel Lowrey ddd855cbc2 Merge branch 'PHP-5.6'
* PHP-5.6:
  Update php.ini files (new openssl directives)
2014-03-07 05:26:48 -07:00
Daniel Lowrey ff3c6931c0 Update php.ini files (new openssl directives) 2014-03-07 05:26:37 -07:00
Tjerk Meesters 777831a24b Merge branch 'PHP-5.6' 2014-03-07 19:24:50 +08:00
Tjerk Meesters 8d3f4b647b Merge branch 'PHP-5.5' into PHP-5.6 2014-03-07 19:24:02 +08:00
Tjerk Meesters 7137775ec2 Merge branch 'PHP-5.6' 2014-03-07 19:01:53 +08:00
Tjerk Meesters 25d355bdb7 Updated NEWS for #65545 2014-03-07 18:57:55 +08:00
Tjerk Meesters 64906cdc38 Merge branch 'PHP-5.5' into PHP-5.6 2014-03-07 18:57:36 +08:00
Bob Weinand 75435e30ae Merge branch 'PHP-5.6' 2014-03-07 07:41:16 +01:00
Bob Weinand f76d5b3104 Include the T_POW operator in constant scalar expressions 2014-03-07 07:39:20 +01:00
Tjerk Meesters be8a4474d9 Updated news for #66822 2014-03-07 09:14:27 +08:00
Tjerk Meesters 3d1fa4cb17 Allow T_POW in constant expressions 2014-03-07 09:14:27 +08:00
Christopher Jones d32e180f20 Fix typo 2014-03-06 16:49:11 -08:00
Nikita Popov 45ed85941e Merge branch 'PHP-5.6' 2014-03-06 23:39:21 +01:00
Michael M Slusarz b88387d341 Fix #66698: Add fnv1a32 and fnv1a64 hash options 2014-03-06 23:38:51 +01:00
Nikita Popov 4c3454fbdc Merge branch 'PHP-5.6' 2014-03-06 23:15:37 +01:00
Nikita Popov 200c97829d Merge branch 'PHP-5.5' into PHP-5.6 2014-03-06 23:15:30 +01:00
Nikita Popov 7220eddf9e Merge branch 'PHP-5.6' 2014-03-06 22:40:31 +01:00
Andrey Andreev eb8dfc85ce Add test for bug #62102 / RFC 2144
Using test vectors from RFC 2144, section B.1 (http://tools.ietf.org/rfc/rfc2144.txt)
2014-03-06 22:40:26 +01:00
Christopher Jones 9989af2e9b Whitespace. 2014-03-06 10:21:36 -08:00
Christopher Jones 2cf9560921 Misc cleanup including adding the version number 2014-03-06 10:16:42 -08:00
Remi Collet 4e87968821 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix order in NEWS
  Add CVE ref (not known at release time)
  Fix NEWS for 5.5.11 fix (really not in 5.5.10)
  5.5.10 release date for NEWS
2014-03-06 11:02:48 +01:00
Remi Collet a8121ca0e1 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix order in NEWS
  Add CVE ref (not known at release time)
  Fix NEWS for 5.5.11 fix (really not in 5.5.10)
  5.5.10 release date for NEWS
2014-03-06 11:02:40 +01:00
Remi Collet b4d65a0e94 Merge branch 'PHP-5.6'
* PHP-5.6:
  Set default Digest Message to use SHA1 instead of MD5 in openssl tests as MD5 signature are now rejected by newer openssl Version.
  Add NEWS/UPGRADING notes (openssl + curl)
2014-03-06 10:16:40 +01:00
Remi Collet 518a6ed95b Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Set default Digest Message to use SHA1 instead of MD5 in openssl tests as MD5 signature are now rejected by newer openssl Version.
2014-03-06 10:16:30 +01:00
Daniel Lowrey a9cdf2e2e3 Add NEWS/UPGRADING notes (openssl + curl) 2014-03-05 10:49:21 -07:00
Daniel Lowrey 1f5459572e Merge branch 'PHP-5.6'
* PHP-5.6:
  Add encrypted server SNI support
  Raise timeout to 2s, reworded ssl timeout warning
  Refactor + reorganize openssl files
2014-03-05 10:23:54 -07:00
Daniel Lowrey fad14e3180 Add encrypted server SNI support
- New "SNI_server_certs" context option maps host names to
  appropriate certs should client handshakes advertise the
  SNI extension:

    $ctx = stream_context_create(["ssl" => [
        "local_cert" => "/path/to/cert.pem",
        "SNI_server_certs" => [
            "domain1.com" => "/path/to/domain1.pem",
            "*.domain2.com" => "/path/to/domain2.pem",
            "domain3.com" => "/path/to/domain3.pem"
        ]
    ]]);

- Prefixing a "*." will utilize the matching cert if a client
  requests the primary host name or any subdomain thereof. So
  in the above example our "domain2.pem" will be used for both
  requests to "domain2.com" -and- "subdomain.domain2.com"
- The "SNI_server_certs" ctx option has no effect for client
  streams.
- SNI support is enabled by default as of 5.6 for both servers
  and clients. Servers must specify the "SNI_server_certs" array
  to actually use the SNI extension, though.
- If the `"SNI_enabled" => false` ctx option is also passed then
  "SNI_server_certs" has no effect.
- While supporting SNI by itself is enough to successfully
  negotiate the TLS handshake with many clients, servers MUST
  still specify a "local_cert" ctx option or run the risk of
  connection failures from clients that do not support the SNI
  extension.
2014-03-05 10:03:33 -07:00
datibbaw 020e161966 Raise timeout to 2s, reworded ssl timeout warning 2014-03-05 10:03:23 -07:00
Daniel Lowrey 27849c998a Refactor + reorganize openssl files
- All streams-related code now lives in xp_ssl.c. Previously
  stream code was split across both openssl.c and xp_ssl.c
- Folded superfluous php_openssl_structs.h into xp_ssl.c
- Server-specific options now set on SSL_CTX instead of SSL
- Deprecate SNI_server_name ctx option
- Miscellaneous refactoring
2014-03-05 10:03:11 -07:00
Andrey Hristov 36d3c83abd Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-03-05 16:47:16 +02:00
Andrey Hristov 1c1ee4672d Merge branch 'master' of git.php.net:php-src 2014-03-05 16:46:45 +02:00
Nikita Popov 94e308da7a Merge branch 'PHP-5.6' 2014-03-05 15:38:56 +01:00
Nikita Popov d595502d0a Add NEWS entry for mcrypt changes 2014-03-05 15:36:00 +01:00
Nikita Popov d8ed84e4c4 Use zpp for accepting encryption mode string
Leaving the non-zpp usage for the mcrypt_{MODE} functions, as
they're deprecated and I'm too lazy to update all their tests.
2014-03-05 15:32:32 +01:00
Nikita Popov eb0eac75ef Remove a number of macros that are no longer used 2014-03-05 15:32:32 +01:00
Nikita Popov e5738d3bc9 Provide expected IV length in IV error messages 2014-03-05 15:32:32 +01:00
Nikita Popov b9737aa08e Call mcrypt_module_close on error 2014-03-05 15:32:32 +01:00
Nikita Popov e4876ecbfb Print supported key sizes in error message 2014-03-05 15:32:32 +01:00
Nikita Popov 32333abe3e Clean up do_crypt code
Avoid unnecessary alloc/copy/free cycles and clean up structure in
general. Add a few extra checks for the key length.
2014-03-05 15:32:32 +01:00
Nikita Popov a861a3a93d Abort on invalid key size
Previously an incorrectly sized key was either silently padded
with NUL bytes or truncated. Especially the silent nature of this
behavior makes it extremely easy to use weak encryption. A common
mistake - which has also been extensively made in our tests - is
to use a password instead of a key.

Incorrectly sized keys will now be rejected.
2014-03-05 15:32:32 +01:00
Nikita Popov 25d801f97e Abort on missing IV if the enc_mode requires it
Previously the code fell back on using a NUL IV if no IV was
passed and the encryption mode required it. This is dangerous and
makes no sense from a practical point of view (as you could just
as well use ECB then).
2014-03-05 15:32:31 +01:00
Nikita Popov c4b7cdb41e Abort on invalid IV size
Previously, if the size of the IV did not match the block size
mcrypt would throw a warning and fall back to a NUL IV. This
behavior is both dangerous and makes no practical sense.

mcrypt_encrypt etc. will now return false if the IV has an incorrect
size.
2014-03-05 15:32:31 +01:00
Andrey Hristov 529fdd5bb0 Merge branch 'PHP-5.6' 2014-03-05 16:24:43 +02:00
Andrey Hristov 6b804b96b8 Refactor the result set data structures. Move more to the buffered and unbuffered
substructures. Add methods to these too. Preparing for pluggable interface for
returning data to the engine (zvals, c-style, something else)
2014-03-05 16:22:23 +02:00
Remi Collet 1a94fca35e Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
2014-03-05 10:46:01 +01:00
Pierre Joye d1ac107077 Merge branch 'master' of git.php.net:php-src
# By krakjoe (558) and others
# Via Anatol Belski (126) and others
* 'master' of git.php.net:php-src: (1484 commits)
  NEWS
  NEWS
  Fixed Bug #66820 out-of-bounds memory access in fileinfo
  Improves fix for memory leak, keep in sync with upstream.
  Add notice about tsrm_virtual_cwd.h moved to zend_virtual_cwd.h as this introduce need for awfull hacks...
  Fixed NEWS for #60602
  Fixed news for #60602
  Updated news for #60602
  proc_open(): separate environment values that aren't strings
  Added DateTimeImmutable::createFromMutable.
  Sort alphabetically
  Fixed NEWS.
  Capture peer cert even if verify fails
  Windows cert verify improvements + leak fixes
  turn off some false positives
  support for static analyzers other than visual studio
  fix wording
  reveal more info on the configure options
  Updated news for #66535 and #66109
  Updated news for #66535 and #66109
  ...
2014-03-05 10:45:58 +01:00
Remi Collet 1b922895fc NEWS 2014-03-05 10:45:50 +01:00
Remi Collet 3686b6bd90 Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  Fixed Bug #66815 imagecrop(): insufficient fix for NULL defer CVE-2013-7327
2014-03-05 10:44:12 +01:00
Remi Collet cf89ff3d24 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  Fixed Bug #66815 imagecrop(): insufficient fix for NULL defer CVE-2013-7327
2014-03-05 10:44:04 +01:00
Remi Collet eaaf3f0f57 Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  NEWS
  Fixed Bug #66820 out-of-bounds memory access in fileinfo
2014-03-04 20:39:11 +01:00
Remi Collet 9a9add6b73 fix merge 2014-03-04 20:39:00 +01:00
Anatol Belski 902824b70e Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
2014-03-04 20:23:15 +01:00
Anatol Belski 30cad90261 Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  Improves fix for memory leak, keep in sync with upstream.
  Add notice about tsrm_virtual_cwd.h moved to zend_virtual_cwd.h as this introduce need for awfull hacks...
  Fixed NEWS for #60602
  Fixed news for #60602
  Updated news for #60602
  proc_open(): separate environment values that aren't strings
  Added DateTimeImmutable::createFromMutable.
  Sort alphabetically
  Fixed NEWS.
  Capture peer cert even if verify fails
  Windows cert verify improvements + leak fixes
  Updated news for #66535 and #66109
  Updated NEWS for #66535

Conflicts:
	ext/openssl/xp_ssl.c
2014-03-04 20:20:15 +01:00
Anatol Belski b186b2774a Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  Improves fix for memory leak, keep in sync with upstream.
  Add notice about tsrm_virtual_cwd.h moved to zend_virtual_cwd.h as this introduce need for awfull hacks...
  Fixed NEWS for #60602
  Fixed news for #60602
  Updated news for #60602
  proc_open(): separate environment values that aren't strings
  Added DateTimeImmutable::createFromMutable.
  Sort alphabetically
  Fixed NEWS.
  Capture peer cert even if verify fails
  Windows cert verify improvements + leak fixes
  Updated news for #66535 and #66109
  Updated NEWS for #66535

Conflicts:
	ext/standard/proc_open.c
2014-03-04 19:50:25 +01:00
Remi Collet 93f4ca0ea9 Merge branch 'PHP-5.6'
* PHP-5.6:
  Improves fix for memory leak, keep in sync with upstream.
2014-03-04 13:46:33 +01:00
Remi Collet 834b719cf5 fix merge 2014-03-04 13:46:21 +01:00
Remi Collet 945d50c25c Merge branch 'PHP-5.6'
* PHP-5.6:
  Add notice about tsrm_virtual_cwd.h moved to zend_virtual_cwd.h as this introduce need for awfull hacks...
2014-03-03 15:34:02 +01:00
Remi Collet f7e381eef6 Add notice about tsrm_virtual_cwd.h moved to zend_virtual_cwd.h
as this introduce need for awfull hacks...
2014-03-03 15:33:11 +01:00
Tjerk Meesters 8a825de5b0 Merge branch 'PHP-5.6' 2014-03-03 06:00:01 +08:00
Tjerk Meesters fed56fbae8 Fixed NEWS for #60602 2014-03-03 05:59:07 +08:00
Tjerk Meesters 330ffe2e24 Merge branch 'PHP-5.5' into PHP-5.6 2014-03-03 05:58:03 +08:00
Derick Rethans 18178aa013 Merge branch 'PHP-5.6' 2014-03-02 14:18:58 -05:00
Derick Rethans 574f230d3c Added DateTimeImmutable::createFromMutable. 2014-03-02 14:18:44 -05:00
Derick Rethans b8d75cc464 Sort alphabetically 2014-03-02 14:15:30 -05:00
Daniel Lowrey 41bde3f0a7 Merge branch 'PHP-5.6'
* PHP-5.6:
  Capture peer cert even if verify fails
  Windows cert verify improvements + leak fixes
2014-03-02 10:39:03 -07:00
Daniel Lowrey c126c16479 Capture peer cert even if verify fails
Previously the "capture_peer_cert" SSL context option only
captured the peer's certificate if the verification routine
succeeded.

By also capturing the on verify failure applications have the
ability to parse the cert and ask users whether they wish to
proceed given the information presented by the peer.
2014-03-02 10:35:52 -07:00
Chris Wright e8995c8cb0 Windows cert verify improvements + leak fixes
- Clean up properly at all fail points in native Windows peer
  verification routine
- Bring certificate usages and chain flags into line with chromium
  implementation in windows environments
2014-03-02 10:30:21 -07:00
Anatol Belski b1dbe97bb6 Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
2014-03-02 14:59:21 +01:00
Anatol Belski 4358b8e447 Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  turn off some false positives
  fixes signed/unsigned in ext/pgsql
  more signature fixes
  fixed signatures php_uint_t vs php_size_t for len
  removed senseless unsigned < 0 check
  more zpp fixes
  fix reading unsigned from zpp
  support for static analyzers other than visual studio
  fix wording
  reveal more info on the configure options
  fixes unsigned < 0 comparsion
  Updated news for #66535 and #66109
2014-03-02 14:59:07 +01:00
Anatol Belski 816e21982e Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  turn off some false positives
2014-03-02 13:14:04 +01:00
Anatol Belski ec7935f7b5 Merge branch 'PHP-5.6'
* PHP-5.6:
  turn off some false positives
2014-03-02 12:49:58 +01:00
Anatol Belski 9d4adf4fe1 turn off some false positives 2014-03-02 12:49:30 +01:00
Anatol Belski 43d15abf72 fixes signed/unsigned in ext/pgsql 2014-03-02 11:55:32 +01:00
Anatol Belski 17a7912eff more signature fixes 2014-03-02 11:37:01 +01:00
Anatol Belski e7a92a913f fixed signatures php_uint_t vs php_size_t for len 2014-03-02 11:30:22 +01:00
Anatol Belski e993862fb5 removed senseless unsigned < 0 check 2014-03-02 11:29:37 +01:00
Anatol Belski 549b251691 more zpp fixes 2014-03-02 11:10:27 +01:00
Anatol Belski 16e4b43f8c fix reading unsigned from zpp 2014-03-02 11:05:11 +01:00
Anatol Belski 7b5c1cd562 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  support for static analyzers other than visual studio
2014-03-01 20:22:03 +01:00
Anatol Belski c0b5c290bb Merge branch 'PHP-5.6'
* PHP-5.6:
  support for static analyzers other than visual studio
2014-03-01 20:18:44 +01:00
Anatol Belski cf90bd92bf support for static analyzers other than visual studio 2014-03-01 20:15:10 +01:00
Anatol Belski 586f3a87f0 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  fix wording
  reveal more info on the configure options
  Updated news for #66535 and #66109
2014-03-01 15:12:22 +01:00
Anatol Belski 4b50f20504 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix wording
  Updated news for #66535 and #66109
2014-03-01 13:28:24 +01:00
Anatol Belski 0bbacd8678 fix wording 2014-03-01 13:28:02 +01:00
Anatol Belski db9d911093 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-03-01 13:16:16 +01:00
Anatol Belski 91d61a2096 Merge branch 'PHP-5.6'
* PHP-5.6:
  reveal more info on the configure options
2014-03-01 13:12:08 +01:00
Anatol Belski 7c60a09cae reveal more info on the configure options 2014-03-01 13:11:35 +01:00
Anatol Belski a54d442de1 fixes unsigned < 0 comparsion 2014-03-01 11:30:49 +01:00
Tjerk Meesters 6b6b2149af Updated news for #66535 and #66109 2014-03-01 12:27:36 +08:00
Anatol Belski ef7c911c9e Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
2014-02-28 21:10:16 +01:00
Anatol Belski 9c1dd320d6 Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport: (33 commits)
  remove temp test files
  fix typo replacement
  don't compare constants on run time
  fix macros
  more descriptor fixes
  substr_compare(): Allow zero length comparison
  Fixed test case title
  [bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given
  Fixed expected output of a few cURL test cases
  Allow NULL as value for CURLOPT_CUSTOMREQUEST option.
  primitive test fixes
  man page: long option name is --strip, not --stripped
  --global have be removed in 5.2
  remove pcntl leftover from the test code
  list the fpm change hat rfc in UPGRADING
  mention the apparmor support in fpm
  typo spotted by Lajos Veres
  update libs_version.txt
  update libs_version.txt
  NEWS
  ...

Conflicts:
	ext/openssl/openssl.c
2014-02-28 21:09:55 +01:00
Anatol Belski e6ccba4b14 remove temp test files 2014-02-28 21:06:00 +01:00
Anatol Belski 3eeda5e804 fix typo replacement 2014-02-28 20:15:37 +01:00
Anatol Belski 3b37fe3bde Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  don't compare constants on run time
2014-02-28 19:42:31 +01:00
Anatol Belski 3f779b9bd2 Merge branch 'PHP-5.6'
* PHP-5.6:
  don't compare constants on run time
2014-02-28 19:39:50 +01:00
Anatol Belski af545ead97 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  don't compare constants on run time
2014-02-28 19:39:34 +01:00
Anatol Belski 65f17d672d fix macros 2014-02-28 19:19:32 +01:00
Anatol Belski 28dbadeb1d Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6: (28 commits)
  substr_compare(): Allow zero length comparison
  Fixed test case title
  [bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given
  Fixed expected output of a few cURL test cases
  Allow NULL as value for CURLOPT_CUSTOMREQUEST option.
  primitive test fixes
  man page: long option name is --strip, not --stripped
  --global have be removed in 5.2
  remove pcntl leftover from the test code
  list the fpm change hat rfc in UPGRADING
  mention the apparmor support in fpm
  typo spotted by Lajos Veres
  update libs_version.txt
  update libs_version.txt
  NEWS
  NEWS
  NEWS
  test for bug #66762
  Fixed Bug #66762 Segfault in mysqli_stmt::bind_result() when link closed
  fix tests broken by 633f898f15
  ...

Conflicts:
	ext/curl/interface.c
	ext/standard/mail.c
	ext/standard/string.c
2014-02-28 19:18:18 +01:00
Anatol Belski 2d83dca7be more descriptor fixes 2014-02-28 18:49:02 +01:00
Tjerk Meesters 0d26d655b7 Merge branch 'PHP-5.6'
* PHP-5.6:
  substr_compare(): Allow zero length comparison
2014-02-28 23:50:27 +08:00
Tjerk Meesters e424049840 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  substr_compare(): Allow zero length comparison
2014-02-28 23:48:34 +08:00
Tjerk Meesters d4d726bb6b Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed test case title
  [bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given
2014-02-28 22:33:08 +08:00
Tjerk Meesters 43ac0ab673 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed test case title
  [bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given
2014-02-28 22:31:16 +08:00
Tjerk Meesters 060643f5ba Merge branch '5.6'
* 5.6:
  Fixed expected output of a few cURL test cases
  Allow NULL as value for CURLOPT_CUSTOMREQUEST option.
2014-02-28 19:14:18 +08:00
Tjerk Meesters cbb2dc0788 Merge branch '5.5' into 5.6
* 5.5:
  Fixed expected output of a few cURL test cases
  Allow NULL as value for CURLOPT_CUSTOMREQUEST option.
2014-02-28 19:01:17 +08:00
Anatol Belski bad0b4fc8c Merge branch 'PHP-5.6'
* PHP-5.6:
  primitive test fixes
2014-02-28 09:45:02 +01:00
Anatol Belski 1cb4398ac1 primitive test fixes 2014-02-28 09:43:57 +01:00
krakjoe a2d7e336e6 parse stream locations properly, bp.c still needs work for #82 2014-02-28 07:41:34 +00:00
Remi Collet 0821d3942e Merge branch 'PHP-5.6'
* PHP-5.6:
  man page: long option name is --strip, not --stripped
  --global have be removed in 5.2
2014-02-28 08:12:38 +01:00
Remi Collet 06feb15a16 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  man page: long option name is --strip, not --stripped
  --global have be removed in 5.2
2014-02-28 08:12:26 +01:00
Rouven Weßling 09f69ca02d Fix a compiler warning in php_rand.h 2014-02-27 20:57:31 +01:00
krakjoe 623888adc0 use php streams to handle line endings better for #81 2014-02-27 19:10:59 +00:00
Anatol Belski 79063d16b9 Merge branch 'PHP-5.6'
* PHP-5.6:
  remove pcntl leftover from the test code
2014-02-27 15:51:28 +01:00
Anatol Belski 2c1385b7f5 remove pcntl leftover from the test code 2014-02-27 15:50:17 +01:00
Chris Wright 41da7f276f Allow crypto_method context value in stream_socket_enable_crypto() 2014-02-27 13:41:25 +00:00
Ferenc Kovacs e77131f5d1 Merge branch 'PHP-5.6'
* PHP-5.6:
  list the fpm change hat rfc in UPGRADING
2014-02-27 12:54:53 +01:00
Ferenc Kovacs 5abaf7cc87 list the fpm change hat rfc in UPGRADING 2014-02-27 12:54:07 +01:00
Ferenc Kovacs 4d8c167ccd Merge branch 'PHP-5.6'
* PHP-5.6:
  mention the apparmor support in fpm
2014-02-27 12:43:58 +01:00
Ferenc Kovacs 8bb84693b3 mention the apparmor support in fpm 2014-02-27 12:43:42 +01:00
Ferenc Kovacs 1bb0500a91 Merge branch 'PHP-5.6'
* PHP-5.6:
  typo spotted by Lajos Veres
2014-02-27 11:31:04 +01:00
Ferenc Kovacs bfbdc032b6 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  typo spotted by Lajos Veres
2014-02-27 11:30:23 +01:00
Anatol Belski 70b2d1d59a Merge branch 'PHP-5.6'
* PHP-5.6:
  update libs_version.txt
  update libs_version.txt
2014-02-27 09:27:06 +01:00
Anatol Belski 703154321f Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  update libs_version.txt

Conflicts:
	win32/build/libs_version.txt
2014-02-27 09:26:48 +01:00
Anatol Belski 603ebc70ff update libs_version.txt 2014-02-27 09:25:15 +01:00
Remi Collet a5f5855db9 Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  NEWS
  NEWS
  test for bug #66762
  Fixed Bug #66762 Segfault in mysqli_stmt::bind_result() when link closed
2014-02-27 08:50:41 +01:00
Remi Collet 6ed83d37af NEWS 2014-02-27 08:50:29 +01:00
Remi Collet fa01db3466 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  NEWS
  test for bug #66762
  Fixed Bug #66762 Segfault in mysqli_stmt::bind_result() when link closed
2014-02-27 08:50:07 +01:00
Ferenc Kovacs 6dd8a4d4f0 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix tests broken by 633f898f15
2014-02-27 02:33:20 +01:00
Ferenc Kovacs 42a43d4531 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix tests broken by 633f898f15
2014-02-27 02:32:47 +01:00
Ferenc Kovacs 1b60d39e5e Merge branch 'PHP-5.6'
* PHP-5.6:
  add missing NEWS entry
  add missing NEWS entry
  add missing NEWS entry
  add missing NEWS entry
  add missing NEWS entry
  add missing NEWS entry
2014-02-27 01:29:21 +01:00
Ferenc Kovacs afb0675e3b Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  add missing NEWS entry
2014-02-27 01:28:57 +01:00
Ferenc Kovacs 1d51c43287 add missing NEWS entry 2014-02-27 01:27:53 +01:00
Ferenc Kovacs 1b8679401c add missing NEWS entry 2014-02-27 01:27:53 +01:00
Ferenc Kovacs cb9ce48d02 add missing NEWS entry 2014-02-27 01:27:52 +01:00
Ferenc Kovacs 95e0de7cfa add missing NEWS entry 2014-02-27 01:27:52 +01:00
Ferenc Kovacs b59831bc30 add missing NEWS entry 2014-02-27 01:27:52 +01:00
Daniel Lowrey 1d2181b615 Merge branch 'PHP-5.6'
* PHP-5.6:
  Remove cURL close policy related constants
2014-02-26 13:41:04 -07:00
Daniel Lowrey 4b06e0a2d0 Merge branch 'curlClosePolicy' of https://github.com/DaveRandom/php-src into PHP-5.6
* 'curlClosePolicy' of https://github.com/DaveRandom/php-src:
  Remove cURL close policy related constants
2014-02-26 13:40:16 -07:00
Daniel Lowrey ed00de58bf Merge branch 'PHP-5.6'
* PHP-5.6:
  Deprecate CN_match in favor of peer_name in SSL contexts
2014-02-26 13:24:07 -07:00
Daniel Lowrey d0a6f8c68e Deprecate CN_match in favor of peer_name in SSL contexts 2014-02-26 13:20:06 -07:00
Anatol Belski f34e4283ce Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
2014-02-26 20:11:51 +01:00
Anatol Belski 9b4dc3a5a1 Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  Update stack size in tests/func/010.phpt
  Don't add num_additional_args in SEND opcodes
  Disallow use of positional args after unpacking
  Store arg_num in fcall entry
  Introduce zend_function_call_entry structure
2014-02-26 20:11:31 +01:00
Anatol Belski 8647f4e7f5 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  Update stack size in tests/func/010.phpt
  Don't add num_additional_args in SEND opcodes
  Disallow use of positional args after unpacking
  Store arg_num in fcall entry
  Introduce zend_function_call_entry structure

Conflicts:
	Zend/zend_compile.c
	Zend/zend_language_parser.y
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
2014-02-26 19:17:23 +01:00
Chris Wright afc24da436 Remove cURL close policy related constants
These options don't do anything and they never have.

Refs:
  http://curl.haxx.se/libcurl/c/curl_easy_setopt.html#CURLOPTCLOSEPOLICY
  http://curl.haxx.se/mail/lib-2006-11/0301.html
2014-02-26 17:48:14 +00:00
Anatol Belski 758f73630a Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport: (23 commits)
  after merge fix
  move the default encoding NEWS entry to alpha3, as it was pushed after beta2 was tagged
  rearrange the NEWS blocks a bit
  add NEWS block for 5.6.0 beta1
  restored that test part in ext/openssl to enable notify/wait
  remove echo
  fix stdin reading in new openssl tests
  kick redundant include
  Prevent implicit function declaration when TLSEXT unavailable
  Update NEWS+UPGRADING (openssl)
  Remove test case invalidated by openssl.cafile accessibility change
  Tolerate non-standard newlines when parsing stream CA files
  Remove openssl tests that shouldn't have survived last merge
  Add openssl.cafile ini check when loading cainfo
  Change openssl directives to PHP_INI_PERDIR
  Update openssl tests with new server/client test harness
  Add peer certificate verification on windows
  add news entry
  add news entry
  add clear_env option to FPM config
  ...
2014-02-26 17:16:20 +01:00
Anatol Belski d753db3a81 after merge fix 2014-02-26 17:01:24 +01:00
Anatol Belski bd9a370701 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6: (22 commits)
  move the default encoding NEWS entry to alpha3, as it was pushed after beta2 was tagged
  rearrange the NEWS blocks a bit
  add NEWS block for 5.6.0 beta1
  restored that test part in ext/openssl to enable notify/wait
  remove echo
  fix stdin reading in new openssl tests
  kick redundant include
  Prevent implicit function declaration when TLSEXT unavailable
  Update NEWS+UPGRADING (openssl)
  Remove test case invalidated by openssl.cafile accessibility change
  Tolerate non-standard newlines when parsing stream CA files
  Remove openssl tests that shouldn't have survived last merge
  Add openssl.cafile ini check when loading cainfo
  Change openssl directives to PHP_INI_PERDIR
  Update openssl tests with new server/client test harness
  Add peer certificate verification on windows
  add news entry
  add news entry
  add clear_env option to FPM config
  add clear_env option to FPM config
  ...

Conflicts:
	ext/openssl/openssl.c
2014-02-26 16:47:49 +01:00
Nikita Popov bfd967c11f Merge branch 'PHP-5.6' 2014-02-26 16:42:55 +01:00
Nikita Popov 96d0bb7bca Update stack size in tests/func/010.phpt
Stack size is 16K nowadays. Now the test takes a more reasonable
amount of time to run...
2014-02-26 16:40:25 +01:00
Nikita Popov 95c73f99d3 Don't add num_additional_args in SEND opcodes
Now that trailing positional args are disallowed,
num_additional_args will always be zero in SEND opcodes (and
FUNC_ARG fetches).
2014-02-26 16:40:25 +01:00
Nikita Popov d3b484df82 Disallow use of positional args after unpacking
This commit disallows the use of trailing positional arguments
after argument unpacking was used. The following calls are no
longer valid:

    fn(...$array, $var);
    fn(...$array1, $var, ...$array2);

However, all of the following continue to be valid:

    fn($var, ...$array);
    fn(...$array1, ...$array2);
    fn($var, ...$array1, ...$array2);

The reason behind this change is a stack allocation issue pointed
out by Dmitry: As of PHP 5.5 the stack necessary for pushing
arguments is precomputed and preallocated, as such the individual
SEND opcodes no longer verify that there is enough stack space.
The unpacked arguments will occupy some of that preallocated
space and as such following positional arguments could write past
a stack page boundary.

An alternative resolution for this issue is to ensure that there
is enough space for the remaining arguments in the UNPACK opcode.
However making this allocation precise (rather than using a
conversative over-estimate) would require some effort. Given that
this particular aspect of the feature wasn't very popular in the
first place, it doesn't seem worth the effort.
2014-02-26 16:40:25 +01:00
Nikita Popov 2eae187949 Store arg_num in fcall entry
Instead of storing the argument number in the znode of the parameter
list, store it in fcall->arg_num. This mainly cleans up the parameter
parsing code, which previously had to duplicate all rules (this
becomes more excessive as more features are added, e.g. named params
would already require a minimum of 14 rules...)
2014-02-26 16:40:25 +01:00
Nikita Popov cefa7f8d08 Introduce zend_function_call_entry structure
Instead of directly pushing the zend_function* onto the
function_call_stack, push this structure. This allows us to store
additional data on this stack.
2014-02-26 16:40:25 +01:00
Ferenc Kovacs 45ec37fb89 Merge branch 'PHP-5.6'
* PHP-5.6:
  move the default encoding NEWS entry to alpha3, as it was pushed after beta2 was tagged
  rearrange the NEWS blocks a bit
2014-02-26 15:41:46 +01:00
Ferenc Kovacs 44053a9dae move the default encoding NEWS entry to alpha3, as it was pushed after beta2 was tagged 2014-02-26 15:29:40 +01:00
Ferenc Kovacs da4c7af358 rearrange the NEWS blocks a bit 2014-02-26 15:28:36 +01:00
Ferenc Kovacs 25941c293f Merge branch 'PHP-5.6'
* PHP-5.6:
  add NEWS block for 5.6.0 beta1
  add news entry
  add news entry
  add clear_env option to FPM config
  add clear_env option to FPM config
  Reduce test noise on cross Oracle client <-> server version tests. This fix is already in PHP 5.6+
  Reduce test noise in cross Oracle client <-> server version testing. This change is already in PHP 5.6+
2014-02-26 15:14:50 +01:00
Ferenc Kovacs 2f5ba1ef69 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  add news entry
  add news entry
  add clear_env option to FPM config
  add clear_env option to FPM config
  Reduce test noise on cross Oracle client <-> server version tests. This fix is already in PHP 5.6+
  Reduce test noise in cross Oracle client <-> server version testing. This change is already in PHP 5.6+
2014-02-26 15:13:40 +01:00
Ferenc Kovacs 2b3483249c add NEWS block for 5.6.0 beta1 2014-02-26 15:08:08 +01:00
Anatol Belski e15fdcb09c Merge branch 'PHP-5.6'
* PHP-5.6:
  restored that test part in ext/openssl to enable notify/wait
2014-02-26 13:38:04 +01:00
Anatol Belski 9ab73c52ab restored that test part in ext/openssl to enable notify/wait 2014-02-26 13:37:20 +01:00
Anatol Belski 38f349da1f Merge branch 'PHP-5.6'
* PHP-5.6:
  remove echo
2014-02-26 12:41:57 +01:00
Anatol Belski bcff8d1b26 remove echo 2014-02-26 12:41:36 +01:00
Anatol Belski 83b2593b23 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix stdin reading in new openssl tests
2014-02-26 11:27:48 +01:00
Anatol Belski 56cbe04381 fix stdin reading in new openssl tests 2014-02-26 11:27:24 +01:00
Anatol Belski 8ece03a679 Merge branch 'PHP-5.6'
* PHP-5.6:
  kick redundant include
2014-02-26 11:24:22 +01:00
Anatol Belski 82a98f6e52 kick redundant include
this is already present from php.h
2014-02-26 11:23:43 +01:00
Daniel Lowrey b3b709f1fc Merge branch 'PHP-5.6'
* PHP-5.6:
  Prevent implicit function declaration when TLSEXT unavailable
2014-02-25 19:12:49 -07:00
Daniel Lowrey 2bc0dbab44 Prevent implicit function declaration when TLSEXT unavailable 2014-02-25 19:12:33 -07:00
Daniel Lowrey 33914b5166 Merge branch 'PHP-5.6'
* PHP-5.6:
  Remove test case invalidated by openssl.cafile accessibility change
  Tolerate non-standard newlines when parsing stream CA files
  Remove openssl tests that shouldn't have survived last merge
  Add openssl.cafile ini check when loading cainfo
  Change openssl directives to PHP_INI_PERDIR
  Update openssl tests with new server/client test harness
  Add peer certificate verification on windows
2014-02-25 13:27:10 -07:00
Daniel Lowrey 781d0b9ee3 Update NEWS+UPGRADING (openssl) 2014-02-25 13:22:16 -07:00
Daniel Lowrey bab017ddfd Remove test case invalidated by openssl.cafile accessibility change 2014-02-25 13:02:13 -07:00
Daniel Lowrey bd95716b8e Merge branch 'windowsPeerVerification' of https://github.com/DaveRandom/php-src into PHP-5.6
* 'windowsPeerVerification' of https://github.com/DaveRandom/php-src:
  Update openssl tests with new server/client test harness
  Add peer certificate verification on windows
2014-02-25 12:43:52 -07:00
Anatol Belski 4d1ab57e4f Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
  add clear_env option to FPM config
2014-02-25 20:20:55 +01:00
Anatol Belski 148058cc46 Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  fixed typo
  Use API instead of directly acessing the structure
  zpp readme adjustment

Conflicts:
	README.PARAMETER_PARSING_API
2014-02-25 20:20:44 +01:00
Anatol Belski 05db0cbcc0 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  Use API instead of directly acessing the structure

Conflicts:
	ext/mysqli/mysqli_prop.c
2014-02-25 20:19:04 +01:00
Daniel Lowrey f8fe09dcef Tolerate non-standard newlines when parsing stream CA files 2014-02-25 09:59:13 -07:00
Daniel Lowrey a4c7ab8399 Remove openssl tests that shouldn't have survived last merge
These are .phpt files I meant to remove with the last batch as
the same functionality is now covered in other tests and these
are no longer needed.
2014-02-25 09:59:13 -07:00
Daniel Lowrey a031dc06d9 Add openssl.cafile ini check when loading cainfo 2014-02-25 09:59:13 -07:00
Daniel Lowrey 47b5873c5d Change openssl directives to PHP_INI_PERDIR
Because openssl.cafile and openssl.capath have implications for
security these directives have been changed to PHP_INI_PERDIR
(previously PHP_INI_ALL)
2014-02-25 09:59:13 -07:00
Chris Wright d6fb7b8f2e Update openssl tests with new server/client test harness 2014-02-25 16:51:50 +00:00
Chris Wright 480e4f8541 Add peer certificate verification on windows
Peer certificate verification on Windows using the native certificate store and the Windows API
2014-02-25 16:51:49 +00:00
Anatol Belski 1ccc6d0a73 fixed typo 2014-02-25 17:28:12 +01:00
Andrey Hristov ee2d5776fa Merge branch 'PHP-5.6' 2014-02-25 17:40:59 +02:00
Andrey Hristov aad7b72472 Use API instead of directly acessing the structure 2014-02-25 17:39:06 +02:00
Anatol Belski b643fcddd1 zpp readme adjustment 2014-02-25 11:05:35 +01:00
Anatol Belski feedfe178c corrections to the zpp readme 2014-02-25 10:39:38 +01:00
krakjoe d8ed537cd4 moar params for registered functions 2014-02-24 22:30:46 +00:00
krakjoe 4bab2d2f90 export command 2014-02-24 19:03:55 +00:00
Andrew Kehrig 85c06f17f3 Fix #50444: PDO-ODBC changes for 64-bit
This bug is also referenced in
[#61777](https://bugs.php.net/bug.php?id=61777) and is still present in
the latest stable release of the 5.5 branch. I see two tickets exist for
this problem already, and I'm just submitting these changes via github
as a reminder that this is a serious problem for anyone using PDO_ODBC
on the x64 builds.
2014-02-24 13:48:39 -05:00
krakjoe 043bfd6e2c woops+correction in help 2014-02-24 17:11:09 +00:00
Anatol Belski 56d4d97393 Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  fixed macro
  add clear_env option to FPM config
  Make sure value is initialized
  We can't dereference dbh if it is NULL
2014-02-24 11:30:26 +01:00
krakjoe 85b5907e85 fix ts build 2014-02-24 09:26:03 +00:00
Anatol Belski 94cfa3a120 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  fixed macro
  add clear_env option to FPM config
  Make sure value is initialized
  We can't dereference dbh if it is NULL
2014-02-24 10:16:31 +01:00
Anatol Belski 5c3b9db84c Merge branch 'PHP-5.6'
* PHP-5.6:
  fixed macro
  add clear_env option to FPM config
2014-02-24 10:14:09 +01:00
Anatol Belski 60ed3f78bd Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fixed macro
2014-02-24 10:13:11 +01:00
Paul Annesley a97ae8bc06 add clear_env option to FPM config
This makes it possible to leave the envoronment as is on startup and
pass all the variables to the workers.
The default value of clear_env is "yes", preserving previous behaviour.
Patch by Paul Annesley.
2014-02-24 11:53:40 +04:00
Antony Dovgal 29a4407914 Merge branch 'pull-request/598'
* pull-request/598:
  add clear_env option to FPM config
2014-02-24 11:52:56 +04:00
Paul Annesley a16304f836 add clear_env option to FPM config
This makes it possible to leave the envoronment as is on startup and
pass all the variables to the workers.
The default value of clear_env is "yes", preserving previous behaviour.
Patch by Paul Annesley.
2014-02-24 11:47:44 +04:00
Johannes Schlüter a61d7e6278 Merge branch 'PHP-5.6' 2014-02-23 15:00:06 +01:00
Johannes Schlüter 5c8a0c92d1 Merge branch 'PHP-5.5' into PHP-5.6 2014-02-23 14:57:21 +01:00
krakjoe 4b738cee2b set colors working 2014-02-23 07:33:48 +00:00
Anatol Belski eb48e0181e Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
  Fix build against older OpenSSL libs

Conflicts:
	UPGRADING
2014-02-21 23:24:51 +01:00
Anatol Belski 592a73fbca Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  fix linkage
  More openssl UPGRADING updates
  Fix build against older OpenSSL libs
  Update NEWS/UPGRADING with openssl additions
  fix macro names

Conflicts:
	NEWS
	UPGRADING
2014-02-21 23:22:02 +01:00
Anatol Belski 734d1b8e6f Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  fix linkage
2014-02-21 23:17:41 +01:00
Anatol Belski 38d02db86d Merge branch 'PHP-5.6'
* PHP-5.6:
  fix linkage
  More openssl UPGRADING updates
  Fix build against older OpenSSL libs
  Update NEWS/UPGRADING with openssl additions
2014-02-21 23:14:48 +01:00
Anatol Belski 5b6ef90bc0 fix linkage
"extern inline" looks like tricky case for portability, but extern
is required with VS. So reduce the case to a starndard one to avoid
unporbatibily.
2014-02-21 23:09:16 +01:00
krakjoe ee6cc5ba60 do not allow abbreivation of anything without alias, fixes input for sh/ev 2014-02-21 21:31:01 +00:00
Anatol Belski 90d31780c9 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  More openssl UPGRADING updates
  Fix build against older OpenSSL libs
  Update NEWS/UPGRADING with openssl additions
2014-02-21 21:55:21 +01:00
krakjoe e37144f44b moar cleanup 2014-02-21 20:46:56 +00:00
krakjoe 1b92ce9a1b call register 2014-02-21 20:42:15 +00:00
Daniel Lowrey a27db7d2da Fix build against older OpenSSL libs 2014-02-21 13:01:04 -07:00
Daniel Lowrey 865a41a6a3 More openssl UPGRADING updates 2014-02-21 12:54:37 -07:00
krakjoe bab960069c ... 2014-02-21 19:37:16 +00:00
Daniel Lowrey c3d76441d5 Fix build against older OpenSSL libs 2014-02-21 12:16:23 -07:00
krakjoe 1c5f8ca7e1 verify noargs 2014-02-21 19:05:20 +00:00
krakjoe 28debb4717 ... 2014-02-21 18:52:06 +00:00
Daniel Lowrey 58e3fcf54f Update NEWS/UPGRADING with openssl additions 2014-02-21 11:40:39 -07:00
krakjoe d1b02fe2fe ... 2014-02-21 18:12:52 +00:00
krakjoe f13fdbe9a0 update export function 2014-02-21 18:05:11 +00:00
krakjoe c3a897bf3d introduce proper support for file:#opline 2014-02-21 18:01:50 +00:00
krakjoe a6eee49326 case insensitive 2014-02-21 17:47:02 +00:00
Anatol Belski a4de08ea89 fix macro names 2014-02-21 18:21:05 +01:00
Anatol Belski ff5f498f58 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  Mitigate client-initiated SSL renegotiation DoS
2014-02-21 17:52:53 +01:00
Anatol Belski 76e711fe59 after merge fix 2014-02-21 17:49:21 +01:00
Anatol Belski 264c68aed7 Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
  Mitigate client-initiated SSL renegotiation DoS

Conflicts:
	ext/openssl/xp_ssl.c
2014-02-21 17:46:15 +01:00
Anatol Belski 14af491490 Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  after merge fix
  C89 compat
  Added information about interned strings usage
  Updated opcache version
  Added function opcache_is_script_cached(). (Danack)
  Improve OpenSSL compile flag compatibility, minor updates
  Use crypto method flags; add tlsv1.0 wrapper; add wrapper tests
  Improve server forward secrecy, refactor client SNI
  Add 'honor_cipher_order' server context option
  Add 'capture_session_meta' context option
  Disable TLS compression by default in both clients and servers
  Release ssl buffers
  Add openssl_get_cert_locations() function
  Explicitly set cert verify depth if not specified
  Strengthen default cipher list

Conflicts:
	ext/openssl/xp_ssl.c
2014-02-21 17:45:04 +01:00
krakjoe b82ad53b29 ... 2014-02-21 16:29:09 +00:00
krakjoe fde1e44d62 trim breaking commands 2014-02-21 16:18:46 +00:00
Daniel Lowrey 1268bd6045 Merge branch 'PHP-5.6'
* PHP-5.6:
  Mitigate client-initiated SSL renegotiation DoS
2014-02-21 09:15:53 -07:00
Daniel Lowrey 5389d0963c Merge branch 'reneg-limit' of https://github.com/rdlowrey/php-src into PHP-5.6
* 'reneg-limit' of https://github.com/rdlowrey/php-src:
  Mitigate client-initiated SSL renegotiation DoS
2014-02-21 09:13:55 -07:00
Anatol Belski bb9b9d7d29 after merge fix 2014-02-21 17:09:29 +01:00
krakjoe 78e8690dee conditional breakpoints working again 2014-02-21 15:00:55 +00:00
krakjoe 5db16dd989 better-ness, I think 2014-02-21 14:44:16 +00:00
Daniel Lowrey b6edbd5897 Mitigate client-initiated SSL renegotiation DoS 2014-02-21 06:31:56 -07:00
Anatol Belski 93e8fb39df Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  C89 compat
  Added information about interned strings usage
  Updated opcache version
  Added function opcache_is_script_cached(). (Danack)

Conflicts:
	ext/openssl/xp_ssl.c
2014-02-21 13:56:14 +01:00
Anatol Belski befb267ddf Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
* origin/PHP-5.6:
  Improve OpenSSL compile flag compatibility, minor updates
  Use crypto method flags; add tlsv1.0 wrapper; add wrapper tests
  Improve server forward secrecy, refactor client SNI
  Add 'honor_cipher_order' server context option
  Add 'capture_session_meta' context option
  Disable TLS compression by default in both clients and servers
  Release ssl buffers
  Add openssl_get_cert_locations() function
  Explicitly set cert verify depth if not specified
  Strengthen default cipher list

Conflicts:
	ext/openssl/openssl.c
	ext/openssl/xp_ssl.c
	ext/standard/file.c
2014-02-21 13:37:35 +01:00
Anatol Belski 04a10be9db Merge branch 'PHP-5.6'
* PHP-5.6:
  C89 compat
2014-02-21 11:24:18 +01:00
Anatol Belski f51555ca58 C89 compat 2014-02-21 11:23:42 +01:00
Dmitry Stogov b0927faf48 Merge branch 'PHP-5.6'
* PHP-5.6:
  Added information about interned strings usage
2014-02-21 12:45:12 +04:00
Dmitry Stogov 31f5515059 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Added information about interned strings usage

Conflicts:
	NEWS
2014-02-21 12:44:58 +04:00
Dmitry Stogov f786eec680 Merge branch 'PHP-5.6'
* PHP-5.6:
  Updated opcache version
2014-02-21 12:06:46 +04:00
Dmitry Stogov aebfc519ea Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Updated opcache version
2014-02-21 12:06:35 +04:00
Dmitry Stogov c3b35e2519 Merge branch 'PHP-5.6'
* PHP-5.6:
  Added function opcache_is_script_cached(). (Danack)
2014-02-21 12:01:06 +04:00
Dmitry Stogov b9a87a5079 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Added function opcache_is_script_cached(). (Danack)

Conflicts:
	NEWS
2014-02-21 12:00:33 +04:00
Daniel Lowrey 86d9235de5 Merge branch 'PHP-5.6'
* PHP-5.6:
  Improve OpenSSL compile flag compatibility, minor updates
  Use crypto method flags; add tlsv1.0 wrapper; add wrapper tests
  Improve server forward secrecy, refactor client SNI
  Add 'honor_cipher_order' server context option
  Add 'capture_session_meta' context option
  Disable TLS compression by default in both clients and servers
  Release ssl buffers
  Add openssl_get_cert_locations() function
  Explicitly set cert verify depth if not specified
  Strengthen default cipher list
2014-02-20 17:46:54 -07:00
Daniel Lowrey dcf27a1f6f Merge branch 'improved-tls-defaults' of https://github.com/rdlowrey/php-src into PHP-5.6
* 'improved-tls-defaults' of https://github.com/rdlowrey/php-src:
  Improve OpenSSL compile flag compatibility, minor updates
  Use crypto method flags; add tlsv1.0 wrapper; add wrapper tests
  Improve server forward secrecy, refactor client SNI
  Add 'honor_cipher_order' server context option
  Add 'capture_session_meta' context option
  Disable TLS compression by default in both clients and servers
  Release ssl buffers
  Add openssl_get_cert_locations() function
  Explicitly set cert verify depth if not specified
  Strengthen default cipher list
2014-02-20 17:35:44 -07:00
Daniel Lowrey 9f94e0b51c Improve OpenSSL compile flag compatibility, minor updates 2014-02-20 17:23:34 -07:00
Daniel Lowrey 3a9829af20 Use crypto method flags; add tlsv1.0 wrapper; add wrapper tests 2014-02-20 17:10:06 -07:00
Daniel Lowrey d0c9207cff Improve server forward secrecy, refactor client SNI 2014-02-20 17:10:06 -07:00
Daniel Lowrey 742fc5fb35 Add 'honor_cipher_order' server context option 2014-02-20 17:10:06 -07:00
Daniel Lowrey 081c8e9d92 Add 'capture_session_meta' context option 2014-02-20 17:10:06 -07:00
Daniel Lowrey b98b093d73 Disable TLS compression by default in both clients and servers 2014-02-20 17:10:06 -07:00
Daniel Lowrey b9ba011c0f Release ssl buffers 2014-02-20 17:10:06 -07:00
Daniel Lowrey df6bfe3be2 Add openssl_get_cert_locations() function 2014-02-20 17:10:06 -07:00
Daniel Lowrey 258d04df5c Explicitly set cert verify depth if not specified 2014-02-20 17:10:06 -07:00
Daniel Lowrey 225f534b1a Strengthen default cipher list 2014-02-20 17:10:06 -07:00
Anatol Belski f629a3b84d Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
2014-02-21 00:32:03 +01:00
Anatol Belski d6591ba1e3 Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
  fixed path separator in the tests
  Add more tests for __debugInfo() and fix leak
  updated libmagic.patch for 5.6+
  updated libmagic.patch in 5.4/5
  fixed leak introduced after CVE/upgrade
  Use nicer output for characters < 32 and > 126 in exception strings Using question marks might confuse more than it helps. Users are wondering what happened to their string...
  Update pgsql document
  Fixes #66714: imageconvolution breakage in 5.5.9

Conflicts:
	UPGRADING
2014-02-21 00:31:32 +01:00
Anatol Belski 175ab77029 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport 2014-02-21 00:25:08 +01:00
Anatol Belski 0140e83048 Merge branch 'PHP-5.6'
* PHP-5.6:
  fixed path separator in the tests
2014-02-21 00:23:36 +01:00
Anatol Belski 5d0d88d1f2 fixed path separator in the tests 2014-02-21 00:23:01 +01:00
Anatol Belski eca2c0462f Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport 2014-02-20 23:12:57 +01:00
Sara Golemon d301c35540 Merge branch 'PHP-5.6'
* PHP-5.6:
  Add more tests for __debugInfo() and fix leak
2014-02-20 12:10:40 -08:00
Sara Golemon 14c08ea362 Add more tests for __debugInfo() and fix leak 2014-02-20 12:10:00 -08:00
Anatol Belski a30ef13ad8 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport 2014-02-20 20:34:12 +01:00
Anatol Belski 7fab1a5790 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated libmagic.patch for 5.6+
2014-02-20 19:06:32 +01:00
Anatol Belski b67c8b8603 updated libmagic.patch for 5.6+ 2014-02-20 19:05:59 +01:00
Anatol Belski 2b767f83dc Merge branch 'PHP-5.6'
* PHP-5.6:
  updated libmagic.patch in 5.4/5
2014-02-20 19:01:45 +01:00
Anatol Belski 0746e6af08 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated libmagic.patch in 5.4/5
2014-02-20 19:01:09 +01:00
Anatol Belski 34f39f26e1 Merge branch 'PHP-5.6'
* PHP-5.6:
  fixed leak introduced after CVE/upgrade
2014-02-20 18:55:21 +01:00
Anatol Belski 67d281f093 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fixed leak introduced after CVE/upgrade
2014-02-20 18:55:05 +01:00
Bob Weinand 219a37106f Merge branch 'PHP-5.6' 2014-02-20 17:50:14 +01:00
Bob Weinand fe3c8de9d5 Merge branch 'PHP-5.5' into PHP-5.6 2014-02-20 17:49:45 +01:00
Xinchen Hui 6557bc48e2 Merge branch 'PHP-5.6' 2014-02-20 11:20:01 +08:00
Xinchen Hui c0d26bb138 Merge branch 'PHP-5.5' into PHP-5.6 2014-02-20 11:19:52 +08:00
Yasuo Ohgaki 3fa164c24b Update pgsql document 2014-02-20 10:44:18 +09:00
Anatol Belski ee690ae2a6 Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64 2014-02-20 02:12:33 +01:00
Anatol Belski c869a60c91 Merge remote-tracking branch 'origin/master' into str_size_and_int64 2014-02-20 02:12:18 +01:00
Anatol Belski 465fe9f0de Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport 2014-02-20 02:09:35 +01:00
Anatol Belski d021f575f6 Merge branch 'PHP-5.6'
* PHP-5.6:
  some missing pieces for __debugInfo
2014-02-20 02:08:07 +01:00
Anatol Belski 47204c6341 some missing pieces for __debugInfo 2014-02-20 02:07:34 +01:00
Anatol Belski ef295ab8e8 Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
Conflicts:
	NEWS
2014-02-20 00:00:33 +01:00
krakjoe e2fcc870e3 work on lexer to be more permissive (accept moar strings)
work on parameter parsing and command resolution
work on error reporting for failed arguments
update most commands
move quiet to set quiet
move set break on/off to set breaks on/off
keep set break for set break <id> <on/off>
update help accordingly
2014-02-19 20:18:49 +00:00
Anatol Belski cd064187da Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
Conflicts:
	ext/fileinfo/libmagic.patch
	ext/fileinfo/libmagic/readcdf.c
	ext/openssl/openssl.c
2014-02-19 12:42:20 +01:00
Daniel Lowrey af318419ad Merge branch 'PHP-5.6'
* PHP-5.6:
  Add tests for Bug #65538
  Fix Bug #65538 (cafile now supports stream wrappers)
2014-02-19 04:19:30 -07:00
Daniel Lowrey e272225e2a Merge branch 'bug-65538' of https://github.com/rdlowrey/php-src into PHP-5.6
* 'bug-65538' of https://github.com/rdlowrey/php-src:
  Add tests for Bug #65538
  Fix Bug #65538 (cafile now supports stream wrappers)
2014-02-19 04:17:33 -07:00
Daniel Lowrey 4c1baa8263 Merge branch 'PHP-5.6'
* PHP-5.6:
  Skip failing tests when EC unavailable (RHEL)
2014-02-19 04:03:16 -07:00
Daniel Lowrey d9036d14f7 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Skip failing tests when EC unavailable (RHEL)
2014-02-19 04:01:57 -07:00
Anatol Belski 97c8a4da98 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
2014-02-19 11:29:15 +01:00
Anatol Belski 3e82ff615f updated NEWS 2014-02-19 11:28:55 +01:00
Anatol Belski 46cdc50e61 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated libmagic.patch
2014-02-19 11:20:53 +01:00
Anatol Belski 6b5c9f6c5a updated libmagic.patch 2014-02-19 11:20:24 +01:00
Anatol Belski 5f526e4907 Merge branch 'PHP-5.6'
* PHP-5.6:
  remove PHP_API_VERSION < 20100412 check
2014-02-19 11:02:19 +01:00
Anatol Belski fdaf3996af remove PHP_API_VERSION < 20100412 check 2014-02-19 11:01:42 +01:00
Anatol Belski f4d61099fb Merge branch 'PHP-5.6'
* PHP-5.6:
  expose correct libmagic version
2014-02-19 10:49:15 +01:00
Anatol Belski 6d2cf0f2a4 expose correct libmagic version 2014-02-19 10:48:52 +01:00
Anatol Belski 61677fa12d Merge branch 'PHP-5.6'
* PHP-5.6:
  fixed tests in ext/fileinfo
2014-02-19 10:05:01 +01:00
Anatol Belski 4019531748 fixed tests in ext/fileinfo 2014-02-19 10:04:29 +01:00
Anatol Belski 9a250f6dc6 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated to libmagic-5.17
2014-02-19 10:03:19 +01:00
Anatol Belski 967a6771d3 updated to libmagic-5.17 2014-02-19 10:02:36 +01:00
krakjoe 996182993d remove input_t
support single char aliases
...
2014-02-19 08:33:54 +00:00
krakjoe e2e93ac259 work on parameters to commands 2014-02-19 00:33:49 +00:00
Bob Weinand 366bf38b4f Oplines run from 0 to op_array->last - 1
See also in issue 76
2014-02-19 01:13:03 +01:00
krakjoe 1952750af6 ... 2014-02-18 20:04:02 +00:00
krakjoe e392e730ea execute new stack now 2014-02-18 19:48:33 +00:00
Anatol Belski 3580f401ca Merge branch 'PHP-5.6'
* PHP-5.6:
  updated libmagic.patch
2014-02-18 19:09:20 +01:00
Anatol Belski e95a2925fc Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated libmagic.patch
2014-02-18 19:09:04 +01:00
Stanislav Malyshev 87cb5858e7 Merge branch 'PHP-5.6'
* PHP-5.6:
  update news with CVE
  5.5.11-dev next
  5.5.11 next for NEWS
2014-02-18 08:49:15 -08:00
Stanislav Malyshev 54b1829f75 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  update news with CVE
  5.5.11-dev next
  5.5.11 next for NEWS

Conflicts:
	configure.in
	main/php_version.h
2014-02-18 08:48:52 -08:00
Remi Collet e32b54578a Merge branch 'PHP-5.6'
* PHP-5.6:
  Set fileinfo version to 1.0.5 (as in php 5.4, no diff)
  NEWS
  NEWS
  Fixed Bug #66731 file: infinite recursion
2014-02-18 13:58:48 +01:00
Remi Collet aa84d906d8 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Set fileinfo version to 1.0.5 (as in php 5.4, no diff)
  NEWS
  NEWS
  Fixed Bug #66731 file: infinite recursion
2014-02-18 13:58:36 +01:00
Anatol Belski a3dd7ab593 Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64 2014-02-18 10:56:30 +01:00
krakjoe 29e74ebf65 Merge branch 'master' of https://github.com/krakjoe/phpdbg into lexer 2014-02-18 09:13:50 +00:00
krakjoe 8da9b7e3a2 fix #70 2014-02-18 09:13:42 +00:00
krakjoe 07dafa8940 Merge branch 'master' of https://github.com/krakjoe/phpdbg into lexer 2014-02-18 08:47:25 +00:00
krakjoe 791828d00c fix zpp issues #74 2014-02-18 08:47:15 +00:00
krakjoe 0634f176a8 Merge branch 'master' of https://github.com/krakjoe/phpdbg into lexer 2014-02-18 08:40:42 +00:00
krakjoe 0b19b9dd0c fix #75 phpdbg disabled by default 2014-02-18 08:40:33 +00:00
krakjoe cadc909bb7 use correct param types 2014-02-18 08:39:38 +00:00
Stanislav Malyshev 8862a4d98d Merge branch 'PHP-5.6'
* PHP-5.6:
  5.4.27 now
  update NEWS
2014-02-17 21:22:56 -08:00
Stanislav Malyshev 140769a9d9 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  5.4.27 now
  update NEWS
2014-02-17 21:22:24 -08:00
Sara Golemon 837af67271 Merge branch 'PHP-5.6'
* PHP-5.6:
  Add __debugInfo() magic method
2014-02-17 19:37:55 -08:00
Sara Golemon 1e752ce9c5 Add __debugInfo() magic method
class Foo {
  private $val = 'Random, meaningless data';

  public function count() { return 42; }

  public function __debugInfo() {
    return ['count' => $this->count()];
  }
}

$f = new Foo;
var_dump($f);
2014-02-17 19:33:56 -08:00
Daniel Lowrey 491d492ada Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed broken build when EC unavailable
2014-02-17 19:39:43 -05:00
Daniel Lowrey 4e4d319e62 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed broken build when EC unavailable
2014-02-17 19:38:49 -05:00
krakjoe d980101803 start work on resolving commands, add numeric function and method to lexer 2014-02-17 22:43:53 +00:00
Andrey Hristov f3e59b838e Merge branch 'PHP-5.6' 2014-02-17 19:04:14 +02:00
Andrey Hristov 3e59f041da remove dead code 2014-02-17 19:04:01 +02:00
Andrey Hristov f83e88e3ea Merge branch 'PHP-5.6' 2014-02-17 18:37:59 +02:00
Andrey Hristov b2cd56c3cb Move code out, that handles the actual structure to be used for the decoded
data. Will make it easier to add different structures
2014-02-17 18:37:08 +02:00
Anatol Belski cbaea7d214 Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	ext/json/php_json.h
	ext/pgsql/pgsql.c
	ext/pgsql/php_pgsql.h
2014-02-17 12:27:33 +01:00
Anatol Belski 4dd4f728ce Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
Conflicts:
	ext/json/php_json.h
2014-02-17 12:17:04 +01:00
Julien Pauli 90325ba7ef Merge branch 'PHP-5.6'
* PHP-5.6:
  Updated NEWS for #65753
  Export JsonSerializable Interface (bug #65753)
2014-02-17 11:16:48 +01:00
Julien Pauli 0bc96ef3cc Updated NEWS for #65753 2014-02-17 11:16:32 +01:00
Julien Pauli e19e266ae1 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Updated NEWS for #65753
  Updated NEWS for #65753
  Export JsonSerializable Interface (bug #65753)
2014-02-17 11:13:54 +01:00
Julien Pauli 1ba76df8d0 Export JsonSerializable Interface (bug #65753) 2014-02-17 10:39:39 +01:00
Julien Pauli 8a1d248d4e Export JsonSerializable Interface (bug #65753) 2014-02-17 10:38:51 +01:00
Anatol Belski 3d1d48a85f Merge branch 'PHP-5.6'
* PHP-5.6:
  simplify the metadata part
2014-02-17 10:21:59 +01:00
Anatol Belski 6877af3f71 simplify the metadata part 2014-02-17 10:20:36 +01:00
krakjoe 1641d2afbe case insensitivity where we can
additional param types
2014-02-17 08:53:47 +00:00
Anatol Belski 463b450595 after merge fix 2014-02-17 09:21:27 +01:00
Anatol Belski f6c611fd84 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
Conflicts:
	ext/pgsql/pgsql.c
	ext/pgsql/php_pgsql.h
2014-02-17 09:16:13 +01:00
krakjoe 1fce0887a3 Merge branch 'master' of https://github.com/krakjoe/phpdbg into lexer 2014-02-17 07:40:35 +00:00
Scott MacVicar 24092b7196 Merge branch 'PHP-5.6'
* PHP-5.6:
  imagettftext() uses the last charactermap it found and not the one you want
  [libxml] Unit test for libxml_disable_entity_loader()
  Add pgsql related change information to NEWS and UPGRADING
2014-02-16 22:51:20 -08:00
Scott MacVicar 796bfb0bd0 imagettftext() uses the last charactermap it found and not the one you want
Summary:
This caused issues when you picked a font with multiple maps, it wouldn't
pick the unicode version but instead pick the last one it saw. Change so
we cache on a per encoding level. There was even a todo list item in the code.

In an ideal world we can probably iterate through at font write time.

Test Plan:
See said unit test, it's Apache Licensed font included
2014-02-16 22:49:31 -08:00
Scott MacVicar 1f3af9cd21 [libxml] Unit test for libxml_disable_entity_loader()
Summary:
Test to make sure libxml_disable_entity_loader() is behaving.
2014-02-16 22:34:52 -08:00
Yasuo Ohgaki e5ec5fc9cc Add pgsql related change information to NEWS and UPGRADING 2014-02-17 10:13:44 +09:00
krakjoe 3cabee71ab ... 2014-02-16 23:17:16 +00:00
krakjoe 4af3e39147 improve error reporting 2014-02-16 23:12:24 +00:00
krakjoe ff95046b76 ... 2014-02-16 22:54:43 +00:00
krakjoe c3bf5dc904 modify command to parse arguments with lexer for testingz 2014-02-16 22:47:20 +00:00
krakjoe d392de0ff7 fix lexer for namespaced methods 2014-02-16 21:52:25 +00:00
krakjoe a9e0202a5d remove leaks from stack
traverse the other way
fix id regex, thanks @bwoebi
2014-02-16 21:38:55 +00:00
Yasuo Ohgaki d06551b957 Merge branch 'PHP-5.6'
* PHP-5.6:
  Imprement FR #25854	Return value for pg_insert should be resource instead of bool
2014-02-17 06:38:36 +09:00
Yasuo Ohgaki d8aa130296 Imprement FR #25854 Return value for pg_insert should be resource instead of bool 2014-02-17 06:36:54 +09:00
Yasuo Ohgaki 540a28b4ec Merge branch 'PHP-5.6'
* PHP-5.6:
  Implement FR #41146 - Add "description" with exteneded flag pg_meta_data(). pg_meta_data(resource $conn, string $table [, bool extended]) It also made pg_meta_data() return "is enum" always.
2014-02-17 06:35:15 +09:00
Yasuo Ohgaki 5fd6365c77 Implement FR #41146 - Add "description" with exteneded flag pg_meta_data().
pg_meta_data(resource $conn, string $table [, bool extended])
It also made pg_meta_data() return "is enum" always.
2014-02-17 06:24:10 +09:00
Yasuo Ohgaki 862e4bdf52 Implement FR #41146 - Add "description" with exteneded flag pg_meta_data().
pg_meta_data(resource $conn, string $table [, bool extended])
It also made pg_meta_data() return "is enum" always.
2014-02-17 06:23:52 +09:00
krakjoe c744605dc7 build stack from command line 2014-02-16 19:25:15 +00:00
Anatol Belski 558795d02b fix always_populate_raw_data config 2014-02-16 19:29:07 +01:00
Bob Weinand f89f66d762 removed warning; WS 2014-02-16 17:41:50 +01:00
Daniel Lowrey 2a83295b14 Add tests for Bug #65538 2014-02-16 09:20:43 -07:00
Anatol Belski d69911515a Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport 2014-02-16 17:17:19 +01:00
Anatol Belski 107df3d32b Merge remote-tracking branch 'origin/master' into str_size_and_int64 2014-02-16 17:16:55 +01:00
Anatol Belski a2928ea32c Merge branch 'PHP-5.6'
* PHP-5.6:
  updated pgsql/config.w32
2014-02-16 17:15:40 +01:00
Anatol Belski a9c0d319eb updated pgsql/config.w32
keep track with the latest changes for postgles 9.3 compatibility
2014-02-16 17:13:56 +01:00
Bob Weinand 7b44890ac4 Merge pull request #73 from TerryE/new-help
New help updates
2014-02-16 17:09:15 +01:00
Daniel Lowrey c7220dc6c5 Fix Bug #65538 (cafile now supports stream wrappers) 2014-02-16 08:47:37 -07:00
Anatol Belski 01cf1aabe2 remove cast 2014-02-16 15:08:12 +01:00
Anatol Belski 88ba1e9eb5 remove some obsolete casts 2014-02-16 15:07:32 +01:00
Anatol Belski d8c35fd578 Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	ext/pgsql/pgsql.c
	ext/pgsql/tests/config.inc
2014-02-16 15:06:44 +01:00
Anatol Belski c801f53102 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
Conflicts:
	ext/pgsql/pgsql.c
	ext/pgsql/tests/config.inc
2014-02-16 14:50:47 +01:00
Yasuo Ohgaki 24a2c76f86 Merge branch 'PHP-5.6'
* PHP-5.6:
  Travis has old PostgreSQL server. Avoid test error.
2014-02-16 18:09:23 +09:00
Yasuo Ohgaki 170db1c577 Travis has old PostgreSQL server. Avoid test error. 2014-02-16 18:08:50 +09:00
Yasuo Ohgaki eed796f175 Merge branch 'PHP-5.6'
* PHP-5.6:
  It seems travis needs ending >?
2014-02-16 16:41:24 +09:00
Yasuo Ohgaki 4a2b39269f It seems travis needs ending >? 2014-02-16 16:40:58 +09:00
Yasuo Ohgaki d4bc18bbe8 Add PGSQL_DML_ESCPE 2014-02-16 14:24:20 +09:00
Yasuo Ohgaki a59559a173 Update NEWS and UPGRADING 2014-02-16 14:21:05 +09:00
Yasuo Ohgaki 390b5200c6 Merge branch 'PHP-5.6'
* PHP-5.6:
  EXPERIMENTAL flags for pg_select/pg_insert/pg_update/pg_delete are removed.
2014-02-16 14:13:17 +09:00
Yasuo Ohgaki 56854511d8 EXPERIMENTAL flags for pg_select/pg_insert/pg_update/pg_delete are removed.
Use string escape for exotic types that allows to handle any data types. i.e. Array, JSON, JSONB, etc will work.
Add escape only query for better performance which removes meta data look up. Limitations forced by pg_convert() can be avoided with this. PGSQL_DML_ESCAPE constant is added for it.
2014-02-16 14:11:21 +09:00
Yasuo Ohgaki 53daf94f28 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src:
  Remove XFAIL from a test
  Declare a number of functions as variadic.
2014-02-16 10:53:49 +09:00
Yasuo Ohgaki 44cb669ca7 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Remove XFAIL from a test
  Declare a number of functions as variadic.
2014-02-16 10:52:54 +09:00
Yasuo Ohgaki bf18d4c16e Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed possbile injections against pg_insert()/pg_delete()/pg_update()/pg_select()
2014-02-16 10:47:58 +09:00
Yasuo Ohgaki 3f4134c00c Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed possbile injections against pg_insert()/pg_delete()/pg_update()/pg_select()
2014-02-16 10:47:32 +09:00
Anatol Belski 5847fc8b20 Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	ext/pgsql/pgsql.c
2014-02-16 01:12:00 +01:00
Anatol Belski 729079fc66 Merge remote-tracking branch 'origin/PHP-5.6' into str_size_and_int64_56_backport
Conflicts:
	ext/mysqli/mysqli_api.c
	ext/pgsql/pgsql.c
2014-02-16 01:06:20 +01:00
krakjoe 5f89934686 Revert "handle strings better"
This reverts commit a32f1b4654.
2014-02-15 23:34:35 +00:00
Nikita Popov 1aa6f95651 Merge branch 'PHP-5.6' 2014-02-16 00:08:17 +01:00
Nikita Popov 7d5f806e77 Remove XFAIL from a test
Everything looks to be working fine, the test is just wrong.
INF equals INF as per IEEE 754.
2014-02-16 00:07:55 +01:00
Rouven Weßling 417dbfbacc Declare a number of functions as variadic. 2014-02-16 00:07:55 +01:00
krakjoe a32f1b4654 handle strings better 2014-02-15 22:53:20 +00:00
Yasuo Ohgaki e5b2e4c4d3 Merge branch 'PHP-5.6'
* PHP-5.6:
  Refactor build_tablename()
2014-02-16 07:52:12 +09:00
Yasuo Ohgaki a12c896dba Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Refactor build_tablename()
2014-02-16 07:52:00 +09:00
Anatol Belski fdc8dbe9d9 remaining backports for ext/* 2014-02-15 23:48:05 +01:00
Anatol Belski c9e2bfc424 Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	ext/mysqli/mysqli_api.c
	ext/pgsql/pgsql.c
2014-02-15 23:12:40 +01:00
Yasuo Ohgaki d10e83cf89 Merge branch 'PHP-5.6'
* PHP-5.6:
  Revise encoding blacklist
2014-02-16 06:25:27 +09:00
Yasuo Ohgaki 53f34bca76 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Revise encoding blacklist
2014-02-16 06:25:15 +09:00
Anatol Belski 98f03086bb further ext backports 2014-02-15 21:48:15 +01:00
Anatol Belski f2f78bc053 fix wrong backport 2014-02-15 21:41:28 +01:00
krakjoe cdf1dcc497 barf on unexpected input 2014-02-15 20:05:44 +00:00
Anatol Belski a005010ef6 backported remaining part in main/streams 2014-02-15 21:01:06 +01:00
krakjoe a01853de78 betterness 2014-02-15 19:51:39 +00:00
Anatol Belski 4fc459e424 backported ticks function signature 2014-02-15 20:51:14 +01:00
Anatol Belski 23679f5a01 backport ext/spl 2014-02-15 20:38:36 +01:00
Anatol Belski beb11f69f3 backported sapi/cli 2014-02-15 20:25:37 +01:00
Anatol Belski 1648d83e6d backport ext/date 2014-02-15 20:25:16 +01:00
Anatol Belski f6b64e93dd backported ext/standard 2014-02-15 20:16:05 +01:00
Johannes Schlüter bc4e9d36a6 Merge branch 'PHP-5.6' 2014-02-15 20:06:15 +01:00
Johannes Schlüter 1fd53fd2ae Move static functions further up so they are delared efore being used. 2014-02-15 20:05:46 +01:00
Anatol Belski b64462fd71 remove comment 2014-02-15 15:19:49 +01:00
Anatol Belski abca09bf6b remove test files 2014-02-15 14:43:53 +01:00
Anatol Belski 533dab176c simple overwrites 2014-02-15 14:41:52 +01:00
Anatol Belski f90db6feda fix sprintf declaration for broken sprintf 2014-02-15 14:40:11 +01:00
Anatol Belski 9a7f242f86 backported main/ 2014-02-15 14:33:11 +01:00
Felipe Pena 70317ca754 Merge branch 'PHP-5.6'
* PHP-5.6:
  - Fix ZTS build when HAVE_PQESCAPELITERAL is not set
  Update NEWS
  Update NEWS
2014-02-15 11:05:39 -02:00
Felipe Pena 8cec20a565 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  - Fix ZTS build when HAVE_PQESCAPELITERAL is not set
  Update NEWS
  Update NEWS
2014-02-15 11:05:25 -02:00
Anatol Belski 2fd7f7c825 backported Zend 2014-02-15 14:04:53 +01:00
Yasuo Ohgaki c1211e84fc Merge branch 'PHP-5.6' 2014-02-15 18:30:50 +09:00
Yasuo Ohgaki 5ff9089aeb Merge branch 'PHP-5.5' into PHP-5.6 2014-02-15 18:30:11 +09:00
krakjoe 5778e010b7 have a go at writing lexer for input 2014-02-15 04:52:04 +00:00
Daniel Lowrey 2976f7dae7 Update NEWS 2014-02-14 21:44:05 -07:00
Daniel Lowrey 1b4af87af4 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix for bug66501 - "key type not supported in this PHP build"
2014-02-14 18:24:04 -07:00
Daniel Lowrey b60cb2b88a Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix for bug66501 - "key type not supported in this PHP build"
2014-02-14 18:20:01 -07:00
Anatol Belski f2e817ea64 Merge remote-tracking branch 'origin/master' into str_size_and_int64 2014-02-15 01:32:33 +01:00
Daniel Lowrey 89292d95ad Add missing TSRMLS_CC 2014-02-14 17:27:29 -07:00
Daniel Lowrey 8562b8c163 Merge branch 'PHP-5.6'
* PHP-5.6:
  Bug #47030 (separate host and peer verification)
2014-02-14 15:40:36 -07:00
Daniel Lowrey 734d887b40 Merge branch 'bug-47030' of https://github.com/rdlowrey/php-src into PHP-5.6
* 'bug-47030' of https://github.com/rdlowrey/php-src:
  Bug #47030 (separate host and peer verification)
2014-02-14 15:37:49 -07:00
Daniel Lowrey ce8dc0ede2 Bug #47030 (separate host and peer verification) 2014-02-14 15:17:30 -07:00
Daniel Lowrey a5551b73db Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix test broken if openssl is compiled without sslv2
2014-02-14 13:39:53 -07:00
Daniel Lowrey f073588e75 Fix test broken if openssl is compiled without sslv2 2014-02-14 13:39:02 -07:00
Daniel Lowrey d47f2116a0 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix segfault accessing context when no context assigned

Conflicts:
	ext/openssl/xp_ssl.c
2014-02-14 10:53:47 -07:00
Daniel Lowrey 4921c1f0ce Fix segfault accessing context when no context assigned
Conflicts:
	ext/openssl/xp_ssl.c
2014-02-14 10:33:43 -07:00
Daniel Lowrey 059c0a9eb9 Merge branch 'master' of git://git.php.net/php-src
* 'master' of git://git.php.net/php-src: (33 commits)
  a few typofixes
  a few typofixes
  a few typofixes
  Update NEWS and UPGRADING
  move the peer verification NEWS entry to the alpha2 block, as it was pushed after alpha1
  mention ldap_modify_batch()
  Implement RFC https://wiki.php.net/rfc/default_encoding
  update the alpha2 release date
  Fixed ZTS and added fix to NEWS.
  Implemented feature #45528: Allow the DateTimeZone constructor to accept timezones per offset too.
  Rename timelib_get_zone to timelib_parse_zone and export.
  Replace old SVN references to Git
  fix regex to detect valgrind version New PCRE version got stricter
  fix regex to detect valgrind version New PCRE version got stricter
  Fixed memory leak in pow operator
  5.5.9 now released
  Added information in NEWS and UPGRADING
  add T_POW (**) operator
  add NEWS block for 5.6.0alpha3
  updated libs_version.txt
  ...
2014-02-14 10:27:11 -07:00
Daniel Lowrey 81c29af865 Updated NEWS 2014-02-14 10:26:42 -07:00
Daniel Lowrey 8582353700 Fix segfault accessing context when no context assigned 2014-02-14 10:24:08 -07:00
Lior Kaplan 464b1bc4fb Merge branch 'PHP-5.6' 2014-02-14 17:19:33 +02:00
Veres Lajos a7ec000f35 a few typofixes 2014-02-14 17:16:17 +02:00
Lior Kaplan 23d952ed60 Merge branch 'PHP-5.5' into PHP-5.6 2014-02-14 17:15:35 +02:00
Yasuo Ohgaki 71b8f59ebb Update NEWS and UPGRADING 2014-02-14 08:56:39 +09:00
Ferenc Kovacs 91fecd7673 move the peer verification NEWS entry to the alpha2 block, as it was pushed after alpha1 2014-02-14 00:22:31 +01:00
Ferenc Kovacs 2537fdf0c8 mention ldap_modify_batch() 2014-02-13 23:21:28 +01:00
Bob Weinand 0dc1072a19 Fix issue 72 (too much whitespace in config.m4) 2014-02-13 20:42:54 +01:00
Anatol Belski b923de2a8f Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	ext/standard/html.c
2014-02-13 09:22:58 +01:00
Yasuo Ohgaki 9a5cb51ebc Merge branch 'PHP-5.6'
* PHP-5.6:
  Implement RFC https://wiki.php.net/rfc/default_encoding
2014-02-13 11:56:54 +09:00
Yasuo Ohgaki cbd108abf1 Implement RFC https://wiki.php.net/rfc/default_encoding 2014-02-13 11:54:52 +09:00
Anatol Belski 8cda1af604 Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	ext/oci8/oci8.c
2014-02-12 22:30:20 +01:00
Ferenc Kovacs c9e9151bb3 Merge branch 'PHP-5.6'
* PHP-5.6:
  update the alpha2 release date
  Make html_table_gen consistent with html_table.h
2014-02-12 06:40:43 +01:00
Ferenc Kovacs 06bbfe1e2a update the alpha2 release date 2014-02-12 06:39:10 +01:00
Derick Rethans 45772c7784 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-02-11 11:31:57 +00:00
Derick Rethans c4e6c12b71 Merge branch 'PHP-5.6' 2014-02-11 11:31:13 +00:00
Derick Rethans 75f59e148c Merge branch 'PHP-5.5' into PHP-5.6 2014-02-11 11:31:06 +00:00
Anatol Belski d7a5bd11e5 Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	ext/date/php_date.c
2014-02-10 12:52:57 +01:00
Derick Rethans a30ebbdb18 Merge branch 'PHP-5.6' 2014-02-09 15:57:54 -05:00
Derick Rethans 9fa6bcd8cb Merge branch 'PHP-5.5' into PHP-5.6 2014-02-09 15:57:43 -05:00
Terry Ellison 21c973d3de More update to help text on parameter typing 2014-02-09 15:04:13 +00:00
Anatol Belski e7719f949a fix printf fmt for zend_uint_t 2014-02-09 06:37:08 -08:00
Anatol Belski d55c85d795 fix return of hash num elements 2014-02-09 14:29:10 +01:00
Anatol Belski 33b5108a2b Merge remote-tracking branch 'origin/master' into str_size_and_int64 2014-02-09 11:01:26 +01:00
Anatol Belski d5c924750b replace *_STRTOL with STRTOI, etc. 2014-02-09 10:55:52 +01:00
Anatol Belski 110c17f8b8 fix size types 2014-02-08 20:05:49 +01:00
Anatol Belski 9d972d3956 fix implicit type conversion 2014-02-08 20:05:16 +01:00
Anatol Belski 3ea59f0d51 fix size types in zend_ts_hash.* 2014-02-08 20:04:31 +01:00
Nuno Lopes 7b7d2952a6 fix regex to detect valgrind version
New PCRE version got stricter
2014-02-08 07:07:15 -05:00
Nuno Lopes f46200bcc0 fix regex to detect valgrind version
New PCRE version got stricter
2014-02-08 07:06:44 -05:00
Anatol Belski da452e33e7 fix some implicit 32 vs 64 bit type conversions 2014-02-07 00:14:01 +01:00
Anatol Belski 06eff86e4d it's actually correct to always use size_t for zend_size_t, even on 32 bit 2014-02-07 00:13:11 +01:00
Anatol Belski 44772c2cb5 Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	Zend/zend_operators.c
2014-02-06 23:17:09 +01:00
Bob Weinand 237c1bf7b5 Merge branch 'PHP-5.6' 2014-02-06 21:32:11 +01:00
Bob Weinand 363ff60475 Fixed memory leak in pow operator 2014-02-06 21:31:40 +01:00
Bob Weinand b0273e749c Fix issue 68 (made check win only) 2014-02-06 20:43:17 +01:00
Anatol Belski eeea68592f after merge fix 2014-02-06 20:20:39 +01:00
Anatol Belski 7e8616620d Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
  Added information in NEWS and UPGRADING
  add T_POW (**) operator
  add NEWS block for 5.6.0alpha3
  updated libs_version.txt
  updated libs_version.txt
  update libs_version.txt

Conflicts:
	Zend/zend_ini_scanner.c
	ext/standard/math.c
2014-02-06 20:20:12 +01:00
Bob Weinand 44dcdd146d Merge branch 'PHP-5.6' 2014-02-06 14:48:56 +01:00
Bob Weinand 7a022da23b Added information in NEWS and UPGRADING 2014-02-06 14:45:22 +01:00
datibbaw aff56f3c45 add T_POW (**) operator
Fixed recognition of the operator

Added opcode, still doing multiply instead of pow()

opcode now always returns int(42)

The right answer, but always a float

Yanked code from pow() implementation.

Should not handle negative long as exponent ourselves

Added test cases from pow()

Moved precedence higher than '~'

Added GMP operator overloading

Added ZEND_ASSIGN_POW (**=) operator.

Added pow() as a language construct.

Adjusted test cases for changed precedence.

Reduced pow() to shell function around ZEND_API pow_function()

Reduced test case to only contain edge cases
Added overloading test case

Moved unary minus above T_POW

Revert "Added pow() as a language construct."

Bad bad bad idea.

This reverts commit f60b98cf7a8371233d800a6faa286ddba4432d02.

Reverted unary minus behaviour due to previous revert.
Convert arrays to int(0)
Exponent with array as a base becomes int(0)

Rebase against master

Fixed tokenizer test case
2014-02-06 14:41:21 +01:00
Ferenc Kovacs df76fd8997 add NEWS block for 5.6.0alpha3 2014-02-06 13:48:57 +01:00
Anatol Belski 205543143f Merge branch 'PHP-5.6'
* PHP-5.6:
  updated libs_version.txt
  updated libs_version.txt
  update libs_version.txt
2014-02-06 09:18:22 +01:00
Anatol Belski b33060af82 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated libs_version.txt
  update libs_version.txt
2014-02-06 09:17:54 +01:00
Anatol Belski 10a806ba8f updated libs_version.txt 2014-02-06 09:15:28 +01:00
Anatol Belski a72d90cb6d Merge remote-tracking branch 'origin/master' into str_size_and_int64 2014-02-05 20:17:11 +01:00
Anatol Belski 190c7772c1 Merge branch 'PHP-5.6'
* PHP-5.6:
  more tests for ICU >= 52.1 compat
  fix tests for ICU >= 52.1
2014-02-05 20:14:19 +01:00
Anatol Belski 65f9380a3f more tests for ICU >= 52.1 compat 2014-02-05 20:13:48 +01:00
Anatol Belski bf0d383aba fix tests for ICU >= 52.1 2014-02-05 19:25:33 +01:00
Anatol Belski e8f16c1792 fix tests for ICU >= 52.1 2014-02-05 19:25:14 +01:00
Hannes Magnusson 7d62a321c7 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix year
2014-02-05 10:18:10 -08:00
Hannes Magnusson ae310e078d Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix year
2014-02-05 10:17:49 -08:00
Anatol Belski b35c788a62 Merge branch 'PHP-5.6'
* PHP-5.6:
  adapt test to curl 7.35.0 upgrade
2014-02-05 15:17:48 +01:00
Anatol Belski 5180425ca9 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  adapt test to curl 7.35.0 upgrade
2014-02-05 15:17:30 +01:00
Anatol Belski ff390d788f Merge branch 'PHP-5.6'
* PHP-5.6:
  move the NEWS entry into the right section
2014-02-05 10:52:17 +01:00
Anatol Belski 3c1ba1f263 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  move the NEWS entry into the right section
2014-02-05 10:52:00 +01:00
Anatol Belski c907406c79 Merge remote-tracking branch 'origin/master' into str_size_and_int64 2014-02-05 07:35:14 +01:00
Daniel Lowrey 6c1cdd0814 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed SNI failure from missing Z_STRVAL_PP
2014-02-04 19:13:50 -07:00
Daniel Lowrey 99fa59054d Fixed SNI failure from missing Z_STRVAL_PP 2014-02-04 19:11:56 -07:00
Terry Ellison ebdfef807a Update help content and refactor new routine in php_help.c
*  I've added more content to the help to expand desciption for new-to-phpdbg
   developers.

*  After a code review of the new routines that I've added to the help module,
   I've decided that the implementation was unnecessarily convolved and that
   Keep-It-Simple-Stupid would be more understandable, maintainable and have
   no material performance hit.
2014-02-05 00:04:21 +00:00
Anatol Belski 971a4a52e3 fix flag signness 2014-02-04 18:52:45 +01:00
Anatol Belski 1f8153a533 fix the comment text 2014-02-04 18:09:22 +01:00
Anatol Belski be7934b91b Merge remote-tracking branch 'origin/master' into str_size_and_int64 2014-02-04 11:15:54 +01:00
Anatol Belski 60846fab58 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
  updated NEWS
2014-02-04 10:39:46 +01:00
Anatol Belski 78815f9034 updated NEWS 2014-02-04 10:39:18 +01:00
Anatol Belski b052ae9292 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated NEWS
2014-02-04 10:38:46 +01:00
Anatol Belski f27eaa1578 Merge branch 'PHP-5.6'
* PHP-5.6:
  pcre tests go with 8.34 upgrade
2014-02-04 10:35:19 +01:00
Anatol Belski f2d42e1624 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  pcre tests go with 8.34 upgrade
2014-02-04 10:34:51 +01:00
Anatol Belski 2e8e2db82a Merge branch 'PHP-5.6'
* PHP-5.6:
  pcre upgraded to 8.34
2014-02-04 10:32:09 +01:00
Anatol Belski 353e2643ab Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  pcre upgraded to 8.34
2014-02-04 10:31:52 +01:00
Anatol Belski ac42ddf586 let thread id be 64 bit on win64 2014-02-03 18:44:46 +01:00
Anatol Belski ba32bba8c2 fix some specs for line num 2014-02-03 18:14:31 +01:00
Anatol Belski c98fcaafe7 Merge remote-tracking branch 'origin/master' into str_size_and_int64 2014-02-03 17:21:30 +01:00
Anatol Belski 798e2e75b5 more cleanups to num args types 2014-02-03 17:03:53 +01:00
Anatol Belski c5668d1fae more cleanup for num args 2014-02-03 15:59:35 +01:00
Anatol Belski 6fb3434592 fix type for op num 2014-02-03 15:03:59 +01:00
Anatol Belski 7af9b01e26 fixed length property types in zend_property_info 2014-02-03 14:23:24 +01:00
Anatol Belski 8903518423 fixed types for num_args at various places 2014-02-03 14:17:15 +01:00
Ferenc Kovacs 0e764dc657 Merge branch 'PHP-5.6' 2014-02-03 04:21:27 +01:00
Ferenc Kovacs 5d3a2fde24 mention the openssl SPKAC functions commited to master before branching out 5.6. see https://github.com/php/php-src/pull/267 2014-02-03 04:20:16 +01:00
Anatol Belski 472579280f after merge fix, some datatypes 2014-02-02 20:33:24 +01:00
Anatol Belski 7061c35725 Merge remote-tracking branch 'origin/master' into str_size_and_int64 2014-02-02 18:46:15 +01:00
Terry Ellison 88bd558a73 Work in progress chekpoint of changes to help module. To allow peer review and feedback 2014-02-02 16:35:28 +00:00
krakjoe 891477dc1c windows 2014-02-02 15:16:01 +00:00
krakjoe 6597d86389 Merge branch 'PHP-5.6'
* PHP-5.6:
  windows
2014-02-02 15:14:53 +00:00
krakjoe 148d7cc103 windows 2014-02-02 15:14:25 +00:00
krakjoe eacab735e0 Merge branch 'PHP-5.6'
* PHP-5.6:
  clean symbols
2014-02-02 15:10:28 +00:00
krakjoe 407d761d09 clean symbols 2014-02-02 15:10:17 +00:00
krakjoe 8aaec7d1c3 Merge branch 'PHP-5.6'
* PHP-5.6:
  another patch from upstream
2014-02-02 14:59:30 +00:00
krakjoe e8519bc207 another patch from upstream 2014-02-02 14:58:39 +00:00
krakjoe f88ff6c661 woops 2014-02-02 14:51:30 +00:00
krakjoe 202dcc0f6a Merge branch 'PHP-5.6'
* PHP-5.6:
  woops
2014-02-02 14:50:43 +00:00
krakjoe 6a6bec44ad woops 2014-02-02 14:50:32 +00:00
krakjoe ee42849f8f Merge branch 'PHP-5.6'
* PHP-5.6:
  better use of tmpnam/mkstemp
2014-02-02 14:42:54 +00:00
krakjoe 9e84124e2d better use of tmpnam/mkstemp 2014-02-02 14:42:31 +00:00
krakjoe 0c94f8a893 ... 2014-02-02 14:41:51 +00:00
krakjoe 37f4f132fc Merge branch 'PHP-5.6'
* PHP-5.6:
  update version
2014-02-02 14:05:03 +00:00
krakjoe 4a96a75c7d update version 2014-02-02 14:04:47 +00:00
krakjoe 4c6816ddf2 Merge branch 'PHP-5.6'
* PHP-5.6:
  remove use of zend directly, avoid leaks/bugs in modules etc
2014-02-02 13:51:05 +00:00
krakjoe dc02b5a1fd Merge branch 'master' of https://git.php.net/repository/php-src 2014-02-02 13:50:54 +00:00
krakjoe a58c74f1c7 remove use of zend directly, avoid leaks/bugs in modules etc 2014-02-02 13:43:43 +00:00
krakjoe a4a120d66a Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6 2014-02-02 13:42:01 +00:00
krakjoe e55bd70643 scrap using zend directly, too many leaks/bugs 2014-02-02 13:29:34 +00:00
Anatol Belski 15896155c4 Merge remote-tracking branch 'origin/master' into str_size_and_int64 2014-02-01 20:37:43 +01:00
Daniel Lowrey f08e8772a7 Merge branch 'PHP-5.6'
* PHP-5.6:
  Remove #if PHP_VERSION_ID version checks

Conflicts:
	ext/openssl/xp_ssl.c
2014-02-01 08:25:01 -07:00
Daniel Lowrey 0893a13e32 Remove #if PHP_VERSION_ID version checks 2014-02-01 08:13:53 -07:00
Daniel Lowrey 05c309f2d8 Remove #if PHP_VERSION_ID version checks 2014-02-01 08:01:13 -07:00
Daniel Lowrey f197dafd1c Merge branch 'PHP-5.6'
* PHP-5.6:
  Use master-agnostic zend_is_true checks

Conflicts:
	ext/openssl/xp_ssl.c
2014-01-31 14:22:35 -07:00
Daniel Lowrey 58293fb533 Use master-agnostic zend_is_true checks 2014-01-31 14:18:31 -07:00
Christopher Jones f65cdd0a46 Fix expectation that zval size was 4 bytes
Various range checks added
2014-01-30 17:45:15 -08:00
Anatol Belski 39c41e6c1d cleanup with --reverse 2014-01-30 17:21:14 -08:00
Anatol Belski 247d7d7b14 add --zpp-vars to script usage out 2014-01-30 21:53:45 +01:00
Anatol Belski d82da76d19 document more on --zpp-vars 2014-01-30 21:50:46 +01:00
Anatol Belski e56176479c added replace.php --zpp-vars
Simple cases on datatype replacements can be handled now
2014-01-30 21:40:43 +01:00
Anatol Belski 31ca11d1b6 more feasible solution for zpp specs using compat.h 2014-01-30 18:26:21 +01:00
Dmitry Panin cb7af767ec Make html_table_gen consistent with html_table.h
In commit 6dabd7de04 the html_table.h was changed manually,
without changing the underlying generator (html_table_gen.php).
This commit fixes it.
2014-01-30 02:07:08 -08:00
Christopher Jones 9da5118af8 Fix merge 2014-02-10 17:04:38 -08:00
Christopher Jones 2cbd857283 Add Oracle PL/SQL BOOLEAN type support to oci_bind_by_name() 2014-02-10 15:00:42 -08:00
Sara Golemon 7f42e62d22 Merge branch 'PHP-5.6'
* PHP-5.6:
  Make html_table_gen consistent with html_table.h
2014-01-30 02:06:30 -08:00
Christopher Jones 66500333cf Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix merge
2014-02-10 17:04:55 -08:00
Christopher Jones 71a82be899 Merge branch 'PHP-5.6'
* PHP-5.6:
  Add Oracle PL/SQL BOOLEAN type support to oci_bind_by_name()
2014-02-10 15:01:37 -08:00
Sara Golemon 45e2a557f1 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Make html_table_gen consistent with html_table.h
2014-01-30 02:05:49 -08:00
Anatol Belski d329b89a55 Merge remote-tracking branch 'origin/master' into str_size_and_int64 2014-01-30 10:49:14 +01:00
Anatol Belski 5ed1bdf9a5 fix ZTS build 2014-01-30 10:47:58 +01:00
Anatol Belski 2adf9e6235 Merge remote-tracking branch 'origin/master' into str_size_and_int64 2014-01-30 10:03:40 +01:00
Anatol Belski ae850328a1 mention important compiler warnings, state the changed APIs more precisely 2014-01-30 09:32:24 +01:00
Stanislav Malyshev 11e47b1cdc Merge branch 'PHP-5.6'
* PHP-5.6:
  tests still failing, so xfail for now until fixed
  tests still failing, so xfail for now until fixed
  tests still failing, so xfail for now until fixed
2014-01-29 23:48:44 -08:00
Stanislav Malyshev d76a6a3e4d tests still failing, so xfail for now until fixed 2014-01-29 23:48:44 -08:00
Stanislav Malyshev 1207461d14 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  tests still failing, so xfail for now until fixed
  tests still failing, so xfail for now until fixed
2014-01-29 23:48:34 -08:00
Stanislav Malyshev 8071de3dfd tests still failing, so xfail for now until fixed 2014-01-29 23:48:33 -08:00
Yasuo Ohgaki 210b444e1d Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug data->fd not set to -1 for open_basedir failure.
2014-01-30 14:17:11 +09:00
Yasuo Ohgaki 53e3023566 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug data->fd not set to -1 for open_basedir failure.
2014-01-30 14:16:47 +09:00
Daniel Lowrey ba8cdc855d Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed build breakage from b4b4d9697f
2014-01-29 17:59:46 -07:00
Daniel Lowrey 43432c12f1 Fixed build breakage from b4b4d9697f 2014-01-29 17:57:59 -07:00
Anatol Belski 0c14569584 after merge fix 2014-01-29 23:21:15 +01:00
Anatol Belski 27868a0966 Merge remote-tracking branch 'origin/master' into str_size_and_int64 2014-01-29 22:57:53 +01:00
Anatol Belski c91ad8233b fix merge error after b4b4d9697f 2014-01-29 22:50:56 +01:00
Anatol Belski 485e999d9c Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	ext/mysqli/php_mysqli_structs.h
2014-01-29 22:08:50 +01:00
Andrey Hristov 79e0c273b8 Merge branch 'master' of git.php.net:php-src
Conflicts:
	ext/openssl/xp_ssl.c
2014-01-29 15:33:52 +02:00
Andrey Hristov 1c7f54d4f7 Merge branch 'PHP-5.6'
Conflicts:
	NEWS
	ext/openssl/xp_ssl.c
2014-01-29 15:32:02 +02:00
Andrey Hristov 253a66c8d5 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-01-29 15:28:47 +02:00
Andrey Hristov 7807d7d0ce Add new INI for rollbacking connections put back into the pconn pool
as well a function get the the statistics in easier way than ob_start()
and parsing phpinfo().
2014-01-29 15:27:43 +02:00
Remi Collet cbb1097770 Merge branch 'PHP-5.6'
* PHP-5.6:
  zip extension version 1.12.4
2014-01-29 14:01:03 +01:00
Remi Collet f06f4c9254 zip extension version 1.12.4 2014-01-29 14:00:50 +01:00
Anatol Belski 7554d07945 separated zpp and macro replacement 2014-01-29 13:39:02 +01:00
Anatol Belski 9fedc08613 more doc on replace.php 2014-01-29 13:10:57 +01:00
Anatol Belski e2bdd42758 fixed reverse mode for --zpp 2014-01-29 12:52:38 +01:00
Anatol Belski b281016972 some datatype fixes 2014-01-29 12:40:32 +01:00
Anatol Belski e2cab1d888 fixed --zpp and added --zpp-compat 2014-01-29 12:39:19 +01:00
Anatol Belski 236e3188db Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	main/php_ini.c
2014-01-29 10:45:52 +01:00
Remi Collet 83c302840e Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed Request #66574 Allow multiple paths in php_ini_scanned_path
2014-01-29 09:57:22 +01:00
Remi Collet 0fad6dbef3 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed Request #66574 Allow multiple paths in php_ini_scanned_path
2014-01-29 09:57:04 +01:00
krakjoe 261a5305c6 fix bugsnet #66591 and github #60 2014-01-29 07:28:54 +00:00
Yasuo Ohgaki 3828b5d83d Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed zend.multibyte tests partially
2014-01-29 15:56:13 +09:00
Yasuo Ohgaki a6ac64bdbb Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed zend.multibyte tests partially
2014-01-29 15:53:57 +09:00
Anatol Belski 8da5217cd5 Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
  Update NEWS/UPGRADING
  Verify peers by default in client socket operations
  add text for the new constants
  add new consts
  Fixed arginfo of PDO::__construct() to match the docs and zend_parse_parameters definition.
  fix *.dsp files related to bug #50333
2014-01-29 00:36:37 +01:00
Anatol Belski 68969026fc reveal implemented replace.php options 2014-01-29 00:35:40 +01:00
Anatol Belski 4347713fd2 more precise info on printf formats and fix some wording 2014-01-29 00:16:47 +01:00
Anatol Belski febe423643 added info about new datatypes in zval 2014-01-28 23:55:39 +01:00
Daniel Lowrey 6edc84fcdf Merge branch 'PHP-5.6'
* PHP-5.6:
  Update NEWS/UPGRADING
  Verify peers by default in client socket operations

Conflicts:
	ext/openssl/xp_ssl.c
2014-01-28 10:36:28 -07:00
Daniel Lowrey 7a90254231 Update NEWS/UPGRADING 2014-01-28 10:27:00 -07:00
krakjoe c768abd420 fix bugsnet #66594, thanks ondrej@php.net 2014-01-28 17:23:29 +00:00
Daniel Lowrey b4b4d9697f Verify peers by default in client socket operations 2014-01-28 10:05:56 -07:00
Daniel Lowrey 4bc8f94b58 Merge branch 'master' of https://github.com/php/php-src
* 'master' of https://github.com/php/php-src:
  add text for the new constants
  add new consts
2014-01-28 09:53:17 -07:00
Andrey Hristov fb5c7cda5d Merge branch 'master' of git.php.net:php-src 2014-01-28 15:58:08 +02:00
Andrey Hristov 3834771b2e Merge branch 'PHP-5.6'
Conflicts:
	NEWS
	UPGRADING
2014-01-28 15:57:48 +02:00
Andrey Hristov 79ab514f0c Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-01-28 15:56:17 +02:00
Andrey Hristov d9078c7c8d Merge branch 'PHP-5.6' 2014-01-28 15:47:50 +02:00
Andrey Hristov c1141d43e9 Merge branch 'PHP-5.5' into PHP-5.6 2014-01-28 15:38:14 +02:00
Anatol Belski 90bce9f1e8 word on bit shifting 2014-01-28 14:17:36 +01:00
Bob Weinand 4b8c098f02 Merge branch 'PHP-5.6' 2014-01-28 13:35:13 +01:00
Bob Weinand 18c2d45006 Merge branch 'PHP-5.5' into PHP-5.6 2014-01-28 13:34:33 +01:00
Anatol Belski b1396cc7a5 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix *.dsp files related to bug #50333
2014-01-28 13:10:01 +01:00
Anatol Belski 07f3bac6ca fix *.dsp files related to bug #50333 2014-01-28 13:09:29 +01:00
Anatol Belski 82857031f0 fix datatype 2014-01-28 12:00:33 +01:00
Freek 54a6c1de7d Fix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec
curl_exec returns an empty string when data is received from a domain that returns zero content. curl_multi_getcontent
returned null. Now it returns an empty string fixing the incosistency
2014-01-28 11:47:14 +01:00
Anatol Belski b972c10f3c Merge remote-tracking branch 'origin/master' into str_size_and_int64 2014-01-28 07:58:50 +01:00
Daniel Lowrey aafce7353e Merge branch '5.6'
* 5.6:
  Update NEWS/UPGRADING
  Prevent invalid SAN peer verification on null byte prefix attack
2014-01-27 15:00:04 -07:00
Daniel Lowrey fc36908c88 Update NEWS/UPGRADING 2014-01-27 14:58:04 -07:00
Daniel Lowrey 68883318aa Prevent invalid SAN peer verification on null byte prefix attack 2014-01-27 14:51:22 -07:00
Yasuo Ohgaki 9f3a98b124 Merge branch 'PHP-5.6'
* PHP-5.6:
  Remove obsolete description
2014-01-27 18:58:06 +09:00
Yasuo Ohgaki a63c095033 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Remove obsolete description

Conflicts:
	php.ini-development
	php.ini-production
2014-01-27 18:57:45 +09:00
krakjoe 1c0fccfc9a fix readline build error bugsnet #66576 2014-01-27 07:39:34 +00:00
Stanislav Malyshev 473cd4d6a9 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix English and improve by Stas. Thanks :)
  Update source docs
  Revert "Update source docs"
  Update source docs
2014-01-26 17:21:33 -08:00
Stanislav Malyshev 223a62d69e Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix English and improve by Stas. Thanks :)
  Update source docs
  Revert "Update source docs"
  Update source docs

Conflicts:
	README.EXTENSIONS
2014-01-26 17:21:14 -08:00
Stanislav Malyshev 586f379b88 Merge branch 'PHP-5.6'
* PHP-5.6:
  drop precision since trigonometric functions are non-portable
  XFAIL multibyte tests until they are fixed (bug 66582)
2014-01-26 15:51:46 -08:00
Stanislav Malyshev 561317898c Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  drop precision since trigonometric functions are non-portable
  XFAIL multibyte tests until they are fixed (bug 66582)
2014-01-26 15:51:38 -08:00
Stanislav Malyshev 909ef53e9d Merge branch 'PHP-5.6'
* PHP-5.6:
  drop precision since trigonometric functions are non-portable
2014-01-26 15:16:08 -08:00
Stanislav Malyshev 2fac5e5669 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  drop precision since trigonometric functions are non-portable
2014-01-26 15:15:50 -08:00
Stanislav Malyshev 4e89151159 Merge branch 'PHP-5.6'
* PHP-5.6:
  XFAIL multibyte tests until they are fixed (bug 66582)
2014-01-26 15:12:40 -08:00
Stanislav Malyshev de62be2682 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  XFAIL multibyte tests until they are fixed (bug 66582)
2014-01-26 15:12:19 -08:00
Stanislav Malyshev ceca4d2490 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix test
2014-01-26 14:31:43 -08:00
Stanislav Malyshev c2bb54a246 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix test
2014-01-26 14:31:32 -08:00
Stanislav Malyshev a0445644e0 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix test
2014-01-26 14:26:26 -08:00
Stanislav Malyshev e52c332b38 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix test
2014-01-26 14:26:01 -08:00
Stanislav Malyshev 54c1e28a39 fix test 2014-01-26 14:25:49 -08:00
Stanislav Malyshev 8e08f6c28d Merge branch 'PHP-5.6'
* PHP-5.6:
  fix test - new flag ZEND_ACC_HAS_TYPE_HINTS
2014-01-26 12:17:32 -08:00
Stanislav Malyshev c4259f90b1 fix test - new flag ZEND_ACC_HAS_TYPE_HINTS 2014-01-26 12:17:29 -08:00
Stanislav Malyshev d78c40d25d fix test - new flag ZEND_ACC_HAS_TYPE_HINTS 2014-01-26 12:17:09 -08:00
Anatol Belski d7c02a47fd extended replace.php with --reverse and --zpp 2014-01-26 18:21:05 +01:00
Derick Rethans 6dd41435a3 Merge branch 'PHP-5.6' 2014-01-26 14:02:55 +01:00
Derick Rethans 2e65908643 Merge branch 'PHP-5.5' into PHP-5.6 2014-01-26 14:02:44 +01:00
Anatol Belski 350d9db222 after merge fixes to ext/ldap 2014-01-26 13:42:06 +01:00
Anatol Belski 4d7f63385b Merge remote-tracking branch 'origin/master' into str_size_and_int64 2014-01-26 12:29:45 +01:00
Stanislav Malyshev c2a93ba3af Merge branch 'PHP-5.6'
* PHP-5.6:
  fix test bug62479.phpt
2014-01-25 23:27:48 -08:00
Stanislav Malyshev 6d6850b3b8 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix test bug62479.phpt
2014-01-25 23:27:21 -08:00
Stanislav Malyshev 1eee68d3f4 Merge branch 'PHP-5.6'
* PHP-5.6:
  Implement ldap_modify_batch.
2014-01-25 22:05:18 -08:00
Stanislav Malyshev ea0769f00e Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Implement ldap_modify_batch.
2014-01-25 22:04:39 -08:00
Anatol Belski 2726001dd0 Merge remote-tracking branch 'origin/master' into str_size_and_int64 2014-01-25 22:24:37 +01:00
Derick Rethans 0f62b94971 Merge branch 'PHP-5.6' 2014-01-25 16:16:42 +01:00
Derick Rethans 0f79cc6eae Merge branch 'PHP-5.5' into PHP-5.6 2014-01-25 16:16:34 +01:00
Anatol Belski 3b61e3ec1e Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	ext/mysqlnd/mysqlnd_ps_codec.c
2014-01-24 22:15:16 +01:00
Ferenc Kovacs a791671f40 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix the primary qa email address and update the list of available people being able to add moderators to our lists
  Revert "Fix #62479: Some chars not parsed in passwords"
  Fix #62479: Some chars not parsed in passwords
2014-01-24 16:13:10 +01:00
Ferenc Kovacs fba2756631 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix the primary qa email address and update the list of available people being able to add moderators to our lists
  Revert "Fix #62479: Some chars not parsed in passwords"
  Fix #62479: Some chars not parsed in passwords
2014-01-24 16:12:33 +01:00
Andrey Hristov 3aa6f8bfdd Merge branch 'PHP-5.6' 2014-01-24 12:31:33 +02:00
Andrey Hristov 350b5dddac WS 2014-01-24 12:31:19 +02:00
Andrey Hristov dc6b14149d Merge branch 'PHP-5.6'
Conflicts:
	ext/mysqlnd/mysqlnd_ps_codec.c
2014-01-24 12:15:03 +02:00
Andrey Hristov cd2cc7b8f9 Reduce code duplication a bit 2014-01-24 11:52:35 +02:00
Andrey Hristov c1b2f1aa13 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-01-24 11:39:42 +02:00
Andrey Hristov 0c90c207a7 Backport refactoring from php-src 2014-01-24 11:39:24 +02:00
Anatol Belski 727fac6290 Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	ext/mysqlnd/mysqlnd_ps_codec.c
2014-01-24 04:20:21 +01:00
Anatol Belski 9debf41bfd some extension to the porting doc 2014-01-24 04:15:50 +01:00
Xinchen Hui 874a0bb7eb Merge branch 'PHP-5.6' 2014-01-24 10:52:22 +08:00
Xinchen Hui aba775fd34 Fixed warning "No new line at end of file" 2014-01-24 10:50:41 +08:00
Will Fitch 28e0a2129b Merge branch 'PHP-5.6'
* PHP-5.6:
  Update gitignore and Makefile for additional entries
2014-01-23 21:36:54 -05:00
Will Fitch a9b40a20fc Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Update gitignore and Makefile for additional entries
2014-01-23 21:35:24 -05:00
Christopher Jones daa34699af Add #defines for compatibility with PHP releases prior to the core PHP
type changes.
2014-01-23 11:13:32 -08:00
Andrey Hristov 7072db5a6b FIx failing tests because of operator precedence 2014-01-23 18:20:13 +02:00
Anatol Belski 4be5d97f3d fixed merge error in ext/oci8 2014-01-23 01:10:13 +01:00
Anatol Belski c0e5d95ca6 added convert_to_int_ex 2014-01-23 01:07:44 +01:00
Christopher Jones ab5405e800 Fixes to ext/oci8 2014-01-23 00:25:55 +01:00
Anatol Belski 2741cf56a4 missed header 2014-01-22 15:16:35 -08:00
Anatol Belski aa6f6ca864 fixed ZEND_INT_FMT 2014-01-22 15:11:39 -08:00
Anatol Belski 2bdb887975 Merge remote-tracking branch 'origin/master' into str_size_and_int64 2014-01-22 23:47:05 +01:00
Anatol Belski 4904be6d94 Merge branch 'PHP-5.6'
* PHP-5.6:
  refixed that test for 5.5+
  5.5.10 next
2014-01-22 23:31:09 +01:00
Anatol Belski 698b04270e Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  refixed that test for 5.5+
  5.5.10 next
2014-01-22 23:30:52 +01:00
Anatol Belski d21056176a missing piece of code from the mainstream 2014-01-22 22:19:02 +01:00
Anatol Belski 806e540a4f Merge remote-tracking branch 'origin/master' into str_size_and_int64 2014-01-22 15:43:09 +01:00
Anatol Belski 03dfe0d5e0 Merge branch 'PHP-5.6'
* PHP-5.6:
  fixed test
2014-01-22 15:41:45 +01:00
Anatol Belski f8e9f84a97 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fixed test
2014-01-22 15:40:58 +01:00
Anatol Belski 529060dbc9 after merge fix ext\session 2014-01-22 14:55:25 +01:00
Anatol Belski 374a796daa renamed the compat macros 2014-01-22 14:51:47 +01:00
Anatol Belski dcdf236467 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix zts
2014-01-22 12:05:27 +01:00
Anatol Belski ca27c86110 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix zts
2014-01-22 12:05:06 +01:00
Anatol Belski bb45daeb75 Merge remote-tracking branch 'origin/master' into str_size_and_int64 2014-01-22 11:56:50 +01:00
Anatol Belski 74fff1512a Merge branch 'PHP-5.6'
* PHP-5.6:
  fixed missing usleep() prototype in pgsql
2014-01-22 11:54:16 +01:00
Anatol Belski 4247f624cb Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fixed missing usleep() prototype in pgsql
2014-01-22 11:53:56 +01:00
Yasuo Ohgaki 36a7f48e84 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed previous commit may delete unwanted cookies. Sync tests from upper branches.
  Re-fixed bug #66469
2014-01-22 19:23:52 +09:00
Yasuo Ohgaki 3cc6c6c587 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed previous commit may delete unwanted cookies.
  Re-fixed bug #66469
2014-01-22 19:23:17 +09:00
Anatol Belski ff42d2a644 after merge fix and more revamp on ext\session 2014-01-22 09:54:04 +01:00
Anatol Belski 8a43325b38 Merge remote-tracking branch 'origin/master' into str_size_and_int64 2014-01-22 09:29:30 +01:00
Yasuo Ohgaki 9cefeea860 Merge branch 'PHP-5.6'
* PHP-5.6:
  Re-fixed bug #66469
2014-01-22 13:49:13 +09:00
Yasuo Ohgaki 26a2bed185 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Re-fixed bug #66469
2014-01-22 13:47:55 +09:00
Stanislav Malyshev d5f79e40e5 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix CVE ref for bug #66060
  fix CVE ref for bug #66060
  fix buglet in makedist
  5.4.26 next
  fix news
2014-01-21 13:29:13 -08:00
Stanislav Malyshev 34ad83857b Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix CVE ref for bug #66060
  fix CVE ref for bug #66060
  fix buglet in makedist
  5.4.26 next
  fix news
2014-01-21 13:28:32 -08:00
Anatol Belski a40c20f764 Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	ext/mysqlnd/mysqlnd_result.c
2014-01-21 17:17:27 +01:00
Anatol Belski 4b7148711b Merge branch 'PHP-5.6'
* PHP-5.6:
  fixed post deactivate signature in ext\libxml
2014-01-21 17:15:12 +01:00
Anatol Belski 6e3fae4390 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fixed post deactivate signature in ext\libxml
2014-01-21 17:14:56 +01:00
Johannes Schlüter 676864684b Merge branch 'PHP-5.6' 2014-01-21 16:40:13 +01:00
Johannes Schlüter 4d43e2efdb Merge branch 'PHP-5.5' into PHP-5.6 2014-01-21 16:38:32 +01:00
David Soria Parra 807d937e91 Merge branch 'PHP-5.6'
* PHP-5.6:
  Change automaticaly to automatically
2014-01-21 16:20:14 +01:00
David Soria Parra e9ae3cb964 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Change automaticaly to automatically
2014-01-21 16:20:08 +01:00
Ferenc Kovacs 2bf13b2042 Merge branch 'PHP-5.6' 2014-01-21 11:21:28 +01:00
Ferenc Kovacs 5817111b63 starting a new NEWS section for alpha2 2014-01-21 11:20:40 +01:00
Ferenc Kovacs 15acd4ee50 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix these tests so they properly clean up after themselves.
2014-01-21 02:29:11 +01:00
Ferenc Kovacs 425dbe55ef Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix these tests so they properly clean up after themselves.
2014-01-21 02:28:49 +01:00
Will Fitch 6e7d132b7a Updating NEWS with 66509 change 2014-01-20 12:18:20 -05:00
Anatol Belski 5b83f7252a Merge remote-tracking branch 'origin/master' into str_size_and_int64 2014-01-20 17:39:53 +01:00
Anatol Belski 9673f66da6 range checks for ext\bz2 2014-01-20 17:24:09 +01:00
Remi Collet a3541301eb Merge branch 'PHP-5.6'
* PHP-5.6:
  Skip those test which fails on ARM architecture
  dos2unix
2014-01-20 14:44:43 +01:00
Remi Collet 0290b10272 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Skip those test which fails on ARM architecture
  dos2unix
2014-01-20 14:44:32 +01:00
Xinchen Hui aaad97675a Merge branch 'PHP-5.6' 2014-01-20 21:25:42 +08:00
Xinchen Hui dc5f36ffe1 Merge branch 'PHP-5.5' into PHP-5.6 2014-01-20 21:25:26 +08:00
Anatol Belski 89a9acea1f Merge branch 'PHP-5.6'
* PHP-5.6:
  fixed glob compilation with vc12
2014-01-20 10:13:22 +01:00
Anatol Belski 8dd44fee08 fixed glob compilation with vc12 2014-01-20 10:11:31 +01:00
Anatol Belski d501707248 Merge branch 'PHP-5.6'
* PHP-5.6:
  support for Visual C+ 2013
2014-01-20 10:05:37 +01:00
Anatol Belski 379f4c0ceb support for Visual C+ 2013 2014-01-20 10:04:20 +01:00
Remi Collet 5b5b9b9239 Merge branch 'PHP-5.6'
* PHP-5.6:
  Skip readline tests which fail with libedit Add specific libedit test (output slightly differs)
2014-01-20 09:39:39 +01:00
Remi Collet 0401226d93 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Skip readline tests which fail with libedit Add specific libedit test (output slightly differs)
2014-01-20 09:39:29 +01:00
Remi Collet 3b82a477b0 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed Bug #66412 readline_clear_history() with libedit causes segfault after #65714
2014-01-20 08:41:04 +01:00
Remi Collet 91513097ca Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed Bug #66412 readline_clear_history() with libedit causes segfault after #65714
2014-01-20 08:40:39 +01:00
Bob Weinand 2e4aed3673 Merge branch PHP-5.6 of php-src 2014-01-19 12:26:14 +01:00
Yasuo Ohgaki fd45f1eb78 Merge branch 'PHP-5.6'
* PHP-5.6:
  Enable zend.multibyte tests. Tipcal configuration works, but most tests fail.
2014-01-19 13:33:27 +09:00
Yasuo Ohgaki fb7e25d2e0 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Enable zend.multibyte tests. Tipcal configuration works, but most tests fail.
2014-01-19 13:32:35 +09:00
Bob Weinand ab16299355 Removed some segfault; does still not delete all the watches if var is removed, might segfault 2014-01-18 20:36:56 -05:00
Anatol Belski e3cfbef33f Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	ext/pdo_pgsql/pgsql_driver.c
2014-01-19 02:17:07 +01:00
Anatol Belski d788a85736 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix C89 compat
2014-01-19 02:05:38 +01:00
Anatol Belski 12c1cfbf8f fix C89 compat 2014-01-19 02:05:10 +01:00
Will Fitch 9eb4bc2f84 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix #62479: Some chars not parsed in passwords
2014-01-18 19:49:06 -05:00
Will Fitch fb2091b1d4 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix #62479: Some chars not parsed in passwords
2014-01-18 19:41:45 -05:00
Anatol Belski bc7dc1913c Merge remote-tracking branch 'origin/master' into str_size_and_int64 2014-01-19 01:35:02 +01:00
Bob Weinand 3714352cb1 Merge branch 'master' of ssh://github.com/krakjoe/phpdbg into watchpoints_recursive 2014-01-18 19:30:13 -05:00
Bob Weinand f27be2fded Fixed order of instructions... 2014-01-18 19:24:22 -05:00
Bob Weinand 992a8d0411 Clean root symbol table when starting new execution 2014-01-18 18:48:53 -05:00
Bob Weinand b12286461d Merge branch 'master' of ssh://github.com/krakjoe/phpdbg 2014-01-18 13:18:47 -05:00
Bob Weinand a1f5925652 Fixed that for example "run" is only set as last cmd after the whole execution 2014-01-18 13:18:28 -05:00
Will Fitch 4e5195f82c Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix bug #66509: copy() arginfo incorrect since 5.4
2014-01-18 11:57:34 -05:00
Will Fitch a540c57331 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix bug #66509: copy() arginfo incorrect since 5.4
2014-01-18 11:56:22 -05:00
Nikita Popov 89eab884d9 Merge branch 'PHP-5.6' 2014-01-18 14:44:57 +01:00
Nikita Popov 31a2ac470c Fix argument unpacking across stack pages
If multiple unpacks were used (or mixed with normal arguments)
parts of the arguments could land on different stack pages. If
this occurs the arguments will now be copied to a new stack page.

The code used to do this is copied verbatim from the PHP 5.4 branch
and only modified to reduce the amount of inlined code.
2014-01-18 14:41:33 +01:00
Johannes Schlüter 84efb8fc71 Merge branch 'PHP-5.6' 2014-01-18 13:53:15 +01:00
Johannes Schlüter 8ff4d61f08 Merge branch 'phpdbg' into PHP-5.6 2014-01-18 13:52:27 +01:00
Anatol Belski f5d48e8524 partial revamp ext/intl 2014-01-17 23:52:19 +01:00
Bob Weinand f4a7e50156 Update year 2014-01-17 23:09:07 +01:00
krakjoe c205a6f3de zts fix 2014-01-17 21:20:19 +00:00
krakjoe 18f31d474e ... 2014-01-17 21:15:03 +00:00
krakjoe 54fa2883f0 remove goto from zend_try/zend_end_try/zend_catch blocks 2014-01-17 21:08:35 +00:00
Adam Harvey 86096a99ec Merge branch 'PHP-5.6' 2014-01-17 20:29:31 +08:00
Adam Harvey 43a8f4f814 Add a couple of missing items to UPGRADING.
Usual grumble about please ensuring UPGRADING gets updated goes here. :)
2014-01-17 20:28:49 +08:00
Michael Wallner f1fc5a5bf5 Merge branch 'PHP-5.6'
* PHP-5.6:
  Clarify always_populate_raw_post_data situation in 5.6
2014-01-17 12:19:17 +01:00
Michael Wallner 03386d1786 Clarify always_populate_raw_post_data situation in 5.6 2014-01-17 12:18:16 +01:00
Anatol Belski ee039d5a1a Merge remote-tracking branch 'origin/master' into str_size_and_int64 2014-01-17 11:12:14 +01:00
Anatol Belski deb56c010e Merge branch 'PHP-5.6' 2014-01-17 11:08:21 +01:00
Anatol Belski b58dbefba0 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  added appropriate exception handling flag to ext\intl
  Update NEWS
2014-01-17 11:08:02 +01:00
Antony Dovgal 98e6c8ca2d fix indentation 2014-01-17 12:49:21 +04:00
Gernot Vormayr dff0d51243 Add some basic and apparmor tests to fpm 2014-01-17 12:49:07 +04:00
Gernot Vormayr e3d3283405 Add --force-stderr to fpm 2014-01-17 12:49:00 +04:00
Gernot Vormayr f6d137a716 Add apparmor change hat functionality to fpm 2014-01-17 12:48:33 +04:00
Antony Dovgal cfce5a4d02 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  forked the test for bug #66481
2014-01-17 12:22:34 +04:00
Antony Dovgal a053e69991 fix indentation 2014-01-17 12:22:07 +04:00
Anatol Belski feb4eb850d Merge branch 'PHP-5.6'
* PHP-5.6:
  forked the test for bug #66481
2014-01-17 03:32:26 +01:00
Anatol Belski 8b703e9ee0 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  forked the test for bug #66481
2014-01-17 03:32:06 +01:00
krakjoe 837bd24dea fix #50 2014-01-16 20:10:30 +00:00
Antony Dovgal 998f506b6d Merge branch 'fpm-apparmor-fixed' of https://github.com/notti/php-src
* 'fpm-apparmor-fixed' of https://github.com/notti/php-src:
  Add some basic and apparmor tests to fpm
  Add --force-stderr to fpm
  Add apparmor change hat functionality to fpm
2014-01-16 17:36:03 +04:00
Anatol Belski 24850c5662 Merge remote-tracking branch 'origin/master' into str_size_and_int64 2014-01-16 10:16:04 +01:00
Xinchen Hui 7691926bbe Merge branch 'PHP-5.6' 2014-01-16 14:42:14 +08:00
Xinchen Hui bfcdd67865 Merge branch 'PHP-5.5' into PHP-5.6 2014-01-16 14:42:04 +08:00
Anatol Belski 49c20cdfcb Merge remote-tracking branch 'origin/master' into str_size_and_int64 2014-01-16 07:32:33 +01:00
Yasuo Ohgaki 7b5b2b4efa Merge branch 'PHP-5.6'
* PHP-5.6:
  Bug #66481 Segfaults on session_name()
2014-01-16 11:35:57 +09:00
Yasuo Ohgaki 518327f7e3 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Bug #66481 Segfaults on session_name()
2014-01-16 11:35:11 +09:00
Dmitry Stogov 511a375e60 Merge branch 'PHP-5.6'
* PHP-5.6:
  Log information about cached scripts and keys
2014-01-15 12:15:41 +04:00
Dmitry Stogov 299d893f0a Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Log information about cached scripts and keys
2014-01-15 12:15:25 +04:00
Anatol Belski 208e580ebc Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	ext/pgsql/pgsql.c
2014-01-15 08:29:12 +01:00
Dmitry Stogov 61028ad45e Merge branch 'PHP-5.6'
* PHP-5.6:
  We don't know PHP_5_6_X_API_NO yet
2014-01-15 11:11:01 +04:00
Dmitry Stogov 77bc5b8bae We don't know PHP_5_6_X_API_NO yet 2014-01-15 11:09:38 +04:00
Yasuo Ohgaki e4f1eee6c3 Merge branch 'PHP-5.6'
* PHP-5.6:
  Added pg_lo_truncate() and 64bit large object support from PostgreSQL 9.3 and up
2014-01-15 14:39:56 +09:00
Yasuo Ohgaki 28be6aea9c Added pg_lo_truncate() and 64bit large object support from PostgreSQL 9.3 and up 2014-01-15 14:37:24 +09:00
Yasuo Ohgaki a92c5b14cf Merge branch 'PHP-5.6'
* PHP-5.6:
  Always initialize pg_version() result array elements to prevent failed test with older postgresql servers. Add missing client_encoding element.
2014-01-15 14:28:08 +09:00
Yasuo Ohgaki c58329fccc Always initialize pg_version() result array elements to prevent failed test with older postgresql servers. Add missing client_encoding element. 2014-01-15 14:27:33 +09:00
Yasuo Ohgaki ee4e5ce2cf Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed pg_version() crash with older postgresql
2014-01-15 13:32:43 +09:00
Yasuo Ohgaki d0924c2500 Fixed pg_version() crash with older postgresql 2014-01-15 13:32:15 +09:00
Yasuo Ohgaki 42c134df4b Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed session module is sending multiple set-cookie headers when session.use_strict_mode=1
2014-01-15 11:07:51 +09:00
Yasuo Ohgaki 167eaedcbd Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed session module is sending multiple set-cookie headers when session.use_strict_mode=1
2014-01-15 11:07:10 +09:00
Anatol Belski 3213959080 Merge remote-tracking branch 'origin/master' into str_size_and_int64 2014-01-14 17:23:59 +01:00
Xinchen Hui aca07343ce Merge branch 'PHP-5.6' 2014-01-14 22:34:53 +08:00
Nikita Popov a5ee337156 Fixed arguments unpacking segfault with opcache 2014-01-14 22:34:08 +08:00
Anatol Belski 4f71b9022d fix printf spec 2014-01-14 05:59:40 -08:00
Anatol Belski d384422f27 Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	ext/mysqlnd/mysqlnd_ps_codec.c
2014-01-14 09:51:34 +01:00
Anatol Belski 25e57e702b fix uninitialized value 2014-01-14 09:47:27 +01:00
Anatol Belski 0c04890354 more fixes after merge 2014-01-14 09:45:46 +01:00
Anatol Belski 5866c701a2 after merge fix 2014-01-14 09:15:55 +01:00
Anatol Belski 28c917923d Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	ext/mysqlnd/mysqlnd_ps_codec.c
2014-01-14 09:10:38 +01:00
Anatol Belski 614a69fe1d Merge branch 'str_size_and_int64' of git.php.net:php-src into str_size_and_int64 2014-01-14 08:59:36 +01:00
Yasuo Ohgaki 681e1a5ce0 Merge branch 'PHP-5.6'
* PHP-5.6:
  Made pg_version() return full connection info.
2014-01-14 10:16:43 +09:00
Yasuo Ohgaki 58dff7cee5 Made pg_version() return full connection info. 2014-01-14 10:10:48 +09:00
Paul Tarjan d599d36d49 Dont ignore errors from FT_Get_Glyph 2014-01-13 16:30:48 -08:00
Andrey Hristov bbc37e78e8 Merge branch 'master' of git.php.net:php-src 2014-01-14 01:32:36 +02:00
Andrey Hristov 73008bb5ce More refactoring of the big function generating execute requests 2014-01-14 01:31:16 +02:00
Anatol Belski aeec64b7f4 fixed a typo 2014-01-13 23:12:58 +01:00
Anatol Belski f92f7f05e9 Merge remote-tracking branch 'origin/master' into str_size_and_int64 2014-01-13 22:08:35 +01:00
krakjoe 231a1c401b issues raised in #46, don't quit on CTRL+C if not executing 2014-01-13 20:16:50 +00:00
Dmitry Stogov 5980e987d2 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed ZTS build
2014-01-13 23:11:36 +04:00
Dmitry Stogov 029d019dac Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed ZTS build
2014-01-13 23:10:35 +04:00
Anatol Belski 7010a933d1 Merge remote-tracking branch 'origin/master' into str_size_and_int64 2014-01-13 18:58:45 +01:00
Anatol Belski 25dfcf4fdd small corrections 2014-01-13 18:56:43 +01:00
Anatol Belski de137e5a8d Merge branch 'PHP-5.6'
* PHP-5.6:
  forked test for win32
2014-01-13 17:13:11 +01:00
Anatol Belski 9b2dc009b2 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  forked test for win32
2014-01-13 17:12:53 +01:00
Dmitry Stogov 127eb33b84 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0)
2014-01-13 18:07:26 +04:00
Dmitry Stogov 7864fcaec9 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0)

Conflicts:
	NEWS
2014-01-13 18:06:49 +04:00
Anatol Belski 972a6bd0f7 Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	ext/opcache/Optimizer/pass1_5.c
2014-01-13 14:29:14 +01:00
Anatol Belski e15f7decd1 further porting notes 2014-01-13 14:23:39 +01:00
Dmitry Stogov e141592da6 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #66440 (Optimisation of conditional JMPs based on pre-evaluate constant function calls)
2014-01-13 16:16:57 +04:00
Dmitry Stogov 9b74dc4a07 Fixed bug #66440 (Optimisation of conditional JMPs based on pre-evaluate constant function calls) 2014-01-13 16:16:23 +04:00
Dmitry Stogov f5182741a6 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  move common code into a function
2014-01-13 15:36:37 +04:00
Dmitry Stogov 3458dac342 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #66471 (Keep backward compatibility)
2014-01-13 15:36:06 +04:00
Dmitry Stogov ca550248f1 Fixed bug #66471 (Keep backward compatibility) 2014-01-13 15:34:25 +04:00
Anatol Belski 21643019c0 Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	ext/mysqlnd/mysqlnd_ps_codec.c
2014-01-13 12:29:30 +01:00
Anatol Belski bd5a5e7f7a added ptrdiff_t notes and some other porting doc improvements 2014-01-13 12:22:01 +01:00
Anatol Belski 85ff0a75e3 ws and some note corrections 2014-01-13 12:04:25 +01:00
Anatol Belski e5613c17fc more on porting 2014-01-13 11:55:53 +01:00
Andrey Hristov cf9966671c Merge branch 'master' of git.php.net:php-src 2014-01-13 12:40:59 +02:00
Andrey Hristov 01d5e28057 move common code into a function 2014-01-13 12:40:39 +02:00
Anatol Belski 7957d672bc Merge remote-tracking branch 'origin/master' into str_size_and_int64
* origin/master:
  Fixed bug #66474 (Optimizer bug in constant string to boolean conversion)
2014-01-13 10:45:19 +01:00
Anatol Belski f7e5a97076 further writing on PECL_PORTING 2014-01-13 10:44:36 +01:00
krakjoe c645e5043e patch version 2014-01-13 08:19:37 +00:00
krakjoe 1ba3ff157e fix #46 ignore EOF 2014-01-13 08:14:04 +00:00
krakjoe 9add0e9f5c Revert "fix #46 ignore EOF"
This reverts commit 333264fdb7.
2014-01-13 08:12:49 +00:00
cyanogenmod 333264fdb7 fix #46 ignore EOF 2014-01-13 08:11:09 +00:00
Dmitry Stogov aab2e8eb7e Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #66474 (Optimizer bug in constant string to boolean conversion)
2014-01-13 12:08:23 +04:00
Dmitry Stogov d09d64c15c Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #66474 (Optimizer bug in constant string to boolean conversion)

Conflicts:
	NEWS
2014-01-13 12:07:50 +04:00
Anatol Belski 4560d412bb reworked compat.h 2014-01-13 04:08:46 +01:00
Bob Weinand 66e93a7820 Merge branch 'master' of ssh://github.com/krakjoe/phpdbg into watchpoints_recursive
Conflicts:
	phpdbg.c
2014-01-12 20:40:54 -05:00
krakjoe 7d51e47eda work on #46 (handle quit local consoles gracefully) 2014-01-12 16:48:10 +00:00
Anatol Belski 2487493f83 added compat.h 2014-01-12 15:48:47 +01:00
Anatol Belski 3957288cf7 rrenamed the readme file 2014-01-12 14:02:18 +01:00
Anatol Belski b1ea854100 Merge remote-tracking branch 'origin/master' into str_size_and_int64 2014-01-12 12:03:53 +01:00
Anatol Belski fba53c888b started the porting docs/tools 2014-01-12 12:00:12 +01:00
Bob Weinand a86e869ee8 Merge branch 'PHP-5.6' 2014-01-12 02:00:37 +01:00
Bob Weinand 69edad213a Fixed build (making zend_is_by_ref_func_arg_fetch function static) 2014-01-12 01:59:22 +01:00
Anatol Belski fd09f3f059 Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	Zend/zend_language_parser.y
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
2014-01-11 16:30:35 +01:00
Nikita Popov 4facc35413 Merge branch 'PHP-5.6' 2014-01-11 12:54:08 +01:00
Nikita Popov 2c47dfbaeb Implement argument unpacking
RFC: https://wiki.php.net/rfc/argument_unpacking
2014-01-11 12:42:08 +01:00
Nikita Popov c7bb283338 Minor cleanup in zend_do_pass_param() 2014-01-11 12:40:16 +01:00
Anatol Belski 5122ece265 Merge remote-tracking branch 'origin/master' into str_size_and_int64 2014-01-11 00:25:13 +01:00
Bob Weinand 78e274af31 Added rudimentary support for watchpoints on an array itself 2014-01-10 13:54:07 -05:00
Johannes Schlüter 82dfe1acc8 Merge branch 'PHP-5.6' 2014-01-10 16:04:29 +01:00
Johannes Schlüter 45d46d7edd Merge branch 'PHP-5.5' into PHP-5.6 2014-01-10 16:02:46 +01:00
Anatol Belski 5fefc0ce47 reverted erroneous patch in array_sum() 2014-01-10 14:56:03 +01:00
Anatol Belski aaccf60fea Merge remote-tracking branch 'origin/master' into str_size_and_int64 2014-01-09 16:30:25 +01:00
Anatol Belski 9aaea81cfe Merge branch 'PHP-5.6'
* PHP-5.6:
  fixed EOL in the test
2014-01-09 15:29:16 +01:00
Anatol Belski ec89e6bfe2 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fixed EOL in the test
2014-01-09 15:28:47 +01:00
Anatol Belski 3572a0482d Merge branch 'PHP-5.6'
* PHP-5.6:
  added testcase from bug #65371
2014-01-09 15:25:18 +01:00
Anatol Belski 4fe9a5d611 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  added testcase from bug #65371
2014-01-09 15:24:55 +01:00
Dmitry Stogov 83b00bbd08 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry)
2014-01-09 13:50:12 +04:00
Dmitry Stogov f16a4bc203 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry)
2014-01-09 13:49:54 +04:00
Anatol Belski 6951bea25e revamped ext/shmop 2014-01-09 09:51:21 +01:00
Anatol Belski 9dd5099566 Merge remote-tracking branch 'origin/master' into str_size_and_int64 2014-01-09 08:26:42 +01:00
Anatol Belski 2a468115e3 revamp mysqlnd, mysqli, mysql and pdo_mysql 2014-01-09 04:18:37 +01:00
Anatol Belski 8edaa10eab fixed the 'p' modifier when %p is used 2014-01-09 04:17:38 +01:00
Gernot Vormayr e9883779a0 Add some basic and apparmor tests to fpm 2014-01-07 00:21:24 +01:00
Gernot Vormayr 32d9409a24 Add --force-stderr to fpm 2014-01-07 00:19:01 +01:00
Scott MacVicar 6fe34014f0 Merge branch 'PHP-5.6'
* PHP-5.6:
  [libxml] Unit test for libxml_disable_entity_loader()
2014-01-06 17:06:33 +00:00
Scott MacVicar 28beaaad9c Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  [libxml] Unit test for libxml_disable_entity_loader()
2014-01-06 17:05:34 +00:00
Scott MacVicar 42f084c692 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  [libxml] Unit test for libxml_disable_entity_loader()
2014-01-06 17:05:16 +00:00
Scott MacVicar 24cc7c0be2 [libxml] Unit test for libxml_disable_entity_loader()
Summary:
Test to make sure libxml_disable_entity_loader() is behaving.
2014-01-06 17:04:54 +00:00
Anatol Belski 47df90a765 Merge remote-tracking branch 'origin/master' into str_size_and_int64 2014-01-05 23:06:08 +01:00
Anatol Belski e797e058c5 Merge branch 'PHP-5.6'
* PHP-5.6:
  one more extension for the basename test
2014-01-05 19:22:11 +01:00
Anatol Belski 61e1f79585 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  one more extension for the basename test
2014-01-05 19:21:49 +01:00
Anatol Belski ac875f8f7e Merge branch 'PHP-5.6'
* PHP-5.6:
  improved the fix for bug #66395
  Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012
  updated NEWS
  Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012
2014-01-05 19:13:40 +01:00
Anatol Belski e5dd5d0ad4 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  improved the fix for bug #66395
  updated NEWS
  Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012
2014-01-05 19:13:15 +01:00
Anatol Belski 4ff4837966 Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	Zend/zend.c
	Zend/zend_ini_scanner.c
2014-01-04 02:17:11 +01:00
Anatol Belski 19aafe43b2 Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012
Visual Studio 2012 includes sanity checks for C++11 features, see
http://msdn.microsoft.com/en-us/library/vstudio/bb531344(v=vs.110).aspx
To fix the 'inline' keyword redefinition for C++ in debug mode, the
new macros ZEND_WIN32_KEEP_INLINE is introduced, ZEND_WIN32_FORCE_INLINE is
automatically appended in release mode.
2014-01-04 01:41:49 +01:00
Anatol Belski 4e7c9ea896 Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012
Visual Studio 2012 includes sanity checks for C++11 features, see
http://msdn.microsoft.com/en-us/library/vstudio/bb531344(v=vs.110).aspx
To fix the 'inline' keyword redefinition for C++ in debug mode, the
new macros ZEND_WIN32_KEEP_INLINE is introduced, ZEND_WIN32_FORCE_INLINE is
automatically appended in release mode.
2014-01-04 01:41:27 +01:00
Nikita Popov 250ee4c17a Merge branch 'PHP-5.6' 2014-01-04 01:30:44 +01:00
Nikita Popov 72a16851f4 Merge branch 'PHP-5.5' into PHP-5.6 2014-01-04 01:29:15 +01:00
Anatol Belski 6e7d24dd14 Merge branch 'PHP-5.6'
* PHP-5.6:
  updated NEWS
2014-01-03 22:45:09 +01:00
Anatol Belski 169d66e0c6 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated NEWS
2014-01-03 22:44:46 +01:00
Anatol Belski b502c0a3dc Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #66395 basename function doesn't remove drive letter
2014-01-03 22:39:17 +01:00
Anatol Belski f0100261e1 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #66395 basename function doesn't remove drive letter
2014-01-03 22:38:47 +01:00
Xinchen Hui b209c27302 Merge branch 'PHP-5.6' 2014-01-03 11:37:32 +08:00
Xinchen Hui 4e2ae5f5ca Here need to be str_efree
found by ext/standard/tests/general_functions/phpinfo2.php fails
2014-01-03 11:36:50 +08:00
Xinchen Hui af6c11c5f0 Bump year 2014-01-03 11:11:57 +08:00
Xinchen Hui 0f53e37494 Merge branch 'PHP-5.6' 2014-01-03 11:09:07 +08:00
Xinchen Hui c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui b5f245db37 Merge branch 'PHP-5.5' into PHP-5.6 2014-01-03 11:08:06 +08:00
Derick Rethans c9f909cd42 Merge branch 'PHP-5.6' 2014-01-02 12:52:26 +00:00
Derick Rethans 68c9f5d84c Merge branch 'PHP-5.5' into PHP-5.6 2014-01-02 12:52:20 +00:00
Derick Rethans 63d390cdf9 Merge branch 'PHP-5.6' 2014-01-02 12:47:52 +00:00
Derick Rethans 110b7dcfb8 Merge branch 'PHP-5.5' into PHP-5.6 2014-01-02 12:47:44 +00:00
Anatol Belski 826064410c Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	ext/gmp/gmp.c
2014-01-02 09:55:25 +01:00
krakjoe 9e4ab7c53f Merge branch 'PHP-5.6'
* PHP-5.6:
  fix #66375 bad logic in sapi header callback routine
2014-01-01 13:01:41 +00:00
krakjoe 8a7e2f8dd2 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix #66375 bad logic in sapi header callback routine
2014-01-01 13:01:06 +00:00
Felipe Pena 57a6209051 Merge branch 'PHP-5.6'
* PHP-5.6:
  - Fixed bug #66381 (__ss_family was changed on AIX 5.3)
2014-01-01 09:57:03 -02:00
Felipe Pena 37897e258d Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  - Fixed bug #66381 (__ss_family was changed on AIX 5.3)
2014-01-01 09:56:49 -02:00
Bob Weinand f4eeda9a9b First try of recursive watchpoints 2013-12-31 13:14:36 -05:00
Bob Weinand c64d692f49 Merge branch 'master' into watchpoints
Conflicts:
	CREDITS
	phpdbg.c
	test.php
2013-12-31 12:07:10 -05:00
Nikita Popov 73db3cda8b Merge branch 'PHP-5.6' 2013-12-30 14:41:45 +01:00
Nikita Popov 5408f1e5a6 Throw warning when converting invalid string to GMP 2013-12-30 14:38:09 +01:00
Michael Wallner 79d1c70e99 This should be an empty merge.
Merge branch 'PHP-5.6'

* PHP-5.6:
  update php.ini-*
  Add E_DEPRECATED when populating $HTTP_RAW_POST_DATA
  add 'never'
  fix type
  fix type; add tests for -1
  s/BOOLEAN/ENTRY/
  re-introduce always_populate_raw_post_data
2013-12-30 14:32:25 +01:00
Michael Wallner feb4caad09 update php.ini-* 2013-12-30 14:28:43 +01:00
Michael Wallner 4797f7ad16 Add E_DEPRECATED when populating $HTTP_RAW_POST_DATA 2013-12-30 14:28:43 +01:00
Michael Wallner 729f85fad7 add 'never' 2013-12-30 14:28:43 +01:00
Michael Wallner 7762de4022 fix type 2013-12-30 14:28:43 +01:00
Michael Wallner cea59a74a7 fix type; add tests for -1 2013-12-30 14:28:42 +01:00
Michael Wallner 4153c23efa s/BOOLEAN/ENTRY/ 2013-12-30 14:28:42 +01:00
Michael Wallner 3641507fc1 re-introduce always_populate_raw_post_data 2013-12-30 14:28:42 +01:00
Nikita Popov 056f3441fd Merge branch 'PHP-5.6' 2013-12-30 13:59:55 +01:00
Nikita Popov 71a36fb6ae Merge branch 'PHP-5.5' into PHP-5.6 2013-12-30 13:58:29 +01:00
Anatol Belski 9ac081f295 after merge fixes to ext/zip 2013-12-30 10:48:14 +01:00
Anatol Belski 4e9b54757a fixes after merge and some opcache revamp 2013-12-30 10:42:05 +01:00
Anatol Belski d40315a09d Merge remote-tracking branch 'origin/master' into str_size_and_int64 2013-12-30 10:12:32 +01:00
Anatol Belski bcfee0ada4 Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	ext/opcache/Optimizer/zend_optimizer.c
	ext/opcache/Optimizer/zend_optimizer_internal.h
	ext/zip/php_zip.c
2013-12-30 10:07:08 +01:00
Remi Collet a3c7971f94 Merge branch 'PHP-5.6'
* PHP-5.6:
  missing file from libzip 0.11.2
2013-12-30 10:00:19 +01:00
Remi Collet 33ef788abd missing file from libzip 0.11.2 2013-12-30 10:00:02 +01:00
Remi Collet 7844fb292c Merge branch 'PHP-5.6'
* PHP-5.6:
  fix compat for PHP ABI changes
2013-12-30 08:47:23 +01:00
Remi Collet 3a492cf686 fix compat for PHP ABI changes 2013-12-30 08:47:16 +01:00
Remi Collet 717dcdaa67 Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
2013-12-30 07:45:17 +01:00
Remi Collet 41cdb132c8 NEWS 2013-12-30 07:45:09 +01:00
Remi Collet 764190c1d6 Merge branch 'PHP-5.6'
* PHP-5.6:
  Sync with pecl/zip 1.12.4dev
2013-12-30 07:38:45 +01:00
Remi Collet 0a950a0500 Sync with pecl/zip 1.12.4dev
- update bunled libzip to 0.11.2
- expose zip_file_set_external_attributes + zip_file_get_external_attributes
  with new methods:
	ZipArchive::setExternalAttributesName
	ZipArchive::setExternalAttributesIndex
	ZipArchive::getExternalAttributesName
	ZipArchive::getExternalAttributesIndex
2013-12-30 07:35:30 +01:00
Xinchen Hui 6b34343479 Merge branch 'PHP-5.6' 2013-12-30 11:07:42 +08:00
Xinchen Hui 5a756afcf1 Merge branch 'PHP-5.5' into PHP-5.6 2013-12-30 11:07:37 +08:00
Xinchen Hui 8b72df0608 Merge branch 'PHP-5.6' 2013-12-30 10:58:56 +08:00
Xinchen Hui 31d4d11432 Fix one more test in dos style eol 2013-12-30 10:58:40 +08:00
Xinchen Hui f204df9a7f Merge branch 'PHP-5.5' into PHP-5.6 2013-12-30 10:58:23 +08:00
Xinchen Hui 408ae9a452 Merge branch 'PHP-5.6' 2013-12-30 10:52:21 +08:00
Xinchen Hui a88543a106 Fixed bug #66298 (ext/opcache/Optimizer/zend_optimizer.c has dos-style ^M as lineend) 2013-12-30 10:51:47 +08:00
Xinchen Hui a8548d9765 Merge branch 'PHP-5.5' into PHP-5.6 2013-12-30 10:51:36 +08:00
Anatol Belski b923ee32c9 added ZEND_ABS and revamped some related stuff 2013-12-29 16:39:15 +01:00
Anatol Belski 1085d21693 Merge remote-tracking branch 'origin/master' into str_size_and_int64 2013-12-28 17:30:23 +01:00
Remi Collet bd3e5aab1d Merge branch 'PHP-5.6'
* PHP-5.6:
  minor fix on previous
2013-12-28 14:29:38 +01:00
Remi Collet 809eb77689 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  minor fix on previous
2013-12-28 14:29:27 +01:00
Remi Collet 8785e22bca Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop())
2013-12-28 14:26:24 +01:00
Remi Collet 46809869a3 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #66356 (Heap Overflow Vulnerability in imagecrop())
2013-12-28 14:26:06 +01:00
Anatol Belski 4aca887f8b other place with 64 bit << and hash size 2013-12-28 13:58:22 +01:00
Anatol Belski 10cd3f86b7 Merge remote-tracking branch 'origin/master' into str_size_and_int64 2013-12-28 02:36:45 +01:00
Anatol Belski b8b4591265 fix bit shift 64 vs 32 bit vars 2013-12-28 00:38:49 +01:00
Anatol Belski e2df932ef0 revamp the hash api once more 2013-12-27 23:28:22 +01:00
krakjoe 2712d7e224 update version 2013-12-27 18:10:58 +00:00
krakjoe 50f09d8256 Merge branch 'PHP-5.6'
* PHP-5.6:
  update version output
2013-12-27 18:04:06 +00:00
krakjoe c8dedaf2dc update version output 2013-12-27 18:03:11 +00:00
Anatol Belski 173bd989cd fix macros conflicts when included intsafe.h 2013-12-27 17:32:46 +01:00
Anatol Belski d0ab1e4ea4 Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	ext/gd/gd.c
2013-12-27 17:01:29 +01:00
Xinchen Hui fb4678f1ac Merge branch 'PHP-5.6' 2013-12-27 20:46:08 +08:00
Xinchen Hui a8cd9b417c Fixed bug #66358 (fpm starts segfault) 2013-12-27 20:45:43 +08:00
Xinchen Hui c0476ff44b Merge branch 'PHP-5.6' 2013-12-27 14:11:41 +08:00
Xinchen Hui 6908dc3e97 Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
	main/php_version.h
2013-12-27 14:11:35 +08:00
Xinchen Hui 1a4863d560 Merge branch 'PHP-5.6' 2013-12-27 14:07:15 +08:00
Xinchen Hui 04a52443e7 Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
	main/php_version.h
2013-12-27 14:06:35 +08:00
Anatol Belski 8d0b174eea removed accidentially merged in files 2013-12-26 13:33:38 +01:00
Anatol Belski 3e65d7dad0 Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	Zend/zend_compile.c
2013-12-26 13:06:49 +01:00
Dmitry Stogov 65fd18fd88 Merge branch 'PHP-5.6'
* PHP-5.6:
  Improved empty string handling. Now ZE uses an interned string instead of allocation new empty string each time. (Some extensions might need to be fixed using str_efree() instead of efree() to support interned strings).

Conflicts:
	NEWS
	Zend/zend_extensions.h
	Zend/zend_modules.h
2013-12-26 14:51:05 +04:00
Dmitry Stogov 03a37de9b3 Improved empty string handling. Now ZE uses an interned string instead of allocation new empty string each time. (Some extensions might need to be fixed using str_efree() instead of efree() to support interned strings). 2013-12-26 14:47:13 +04:00
Xinchen Hui d6713f3989 Fixed warning "No new line at end of file" 2013-12-26 17:45:37 +08:00
Dmitry Stogov ef56cfb991 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed ZEND_MM_MEM_TYPE=mmap_zero
2013-12-26 11:53:03 +04:00
Dmitry Stogov 0ff0e82f26 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed ZEND_MM_MEM_TYPE=mmap_zero

Conflicts:
	NEWS
2013-12-26 11:52:39 +04:00
Anatol Belski a5720b4493 Merge remote-tracking branch 'origin/master' into str_size_and_int64 2013-12-25 23:45:53 +01:00
Anatol Belski c676f5b36d Merge branch 'PHP-5.6'
* PHP-5.6:
  fix c89 compat
2013-12-25 23:44:24 +01:00
Anatol Belski 1e411ebdf5 fix c89 compat 2013-12-25 23:43:20 +01:00
Anatol Belski 734c28d242 Merge branch 'PHP-5.6'
* PHP-5.6:
  brought the ext/sybase_ct/config.w32 up to date
2013-12-25 23:31:17 +01:00
Anatol Belski 9f9179cc62 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  brought the ext/sybase_ct/config.w32 up to date
2013-12-25 23:30:59 +01:00
Anatol Belski d031758b49 Merge remote-tracking branch 'origin/master' into str_size_and_int64 2013-12-25 22:40:03 +01:00
Anatol Belski 1dc85bfa6c revamp ext/sybase_ct 2013-12-25 22:33:11 +01:00
Joe Watkins 1d3a53a18d upstream merge 2013-12-25 18:50:25 +00:00
Xinchen Hui 43cfa7f12a Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2013-12-25 15:36:55 +08:00
Xinchen Hui bd0a8f31a4 Merge branch 'master' of git.php.net:php-src 2013-12-25 15:36:45 +08:00
Xinchen Hui 03e36cd5b8 Merge branch 'PHP-5.6' 2013-12-25 15:35:02 +08:00
Xinchen Hui d316040857 Fix test 2013-12-25 15:34:39 +08:00
Stanislav Malyshev b3c43a1aec Merge branch 'PHP-5.6'
* PHP-5.6:
  5.4.25 next
2013-12-24 22:23:55 -08:00
Stanislav Malyshev c6df27db0f Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  5.4.25 next
2013-12-24 22:23:42 -08:00
Anatol Belski 79eb697f48 Merge branch 'master' into str_size_and_int64 2013-12-24 22:04:07 +01:00
Anatol Belski 0493099786 next wave on fixes for ext/phpdbg 2013-12-24 21:59:44 +01:00
Anatol Belski 3af0ee0ea3 Merge branch 'PHP-5.6'
* PHP-5.6:
  fixed incompatible pointer in phpdbg on win64
2013-12-24 21:09:45 +01:00
Anatol Belski 00c7b973bb fixed incompatible pointer in phpdbg on win64 2013-12-24 21:08:33 +01:00
Bob Weinand c02acf3c29 Merge branch 'PHP-5.6' 2013-12-24 13:20:12 +01:00
Bob Weinand ddf733fa69 Fixed #18
Errors not displaying in some configurations
2013-12-24 13:19:18 +01:00
Bob Weinand 2b98abd9a8 Merge branch 'master' of sapi/phpdbg into PHP-5.6
merge is necessary,
2013-12-24 13:18:18 +01:00
Bob Weinand 8064d8dfd6 Fixed #18
Errors not displaying in some configurations
2013-12-24 13:11:57 +01:00
Anatol Belski 5ae8f624a1 basic fixes to sapi/phpdbg 2013-12-24 02:44:53 -08:00
Anatol Belski 713b69adf8 added credits note 2013-12-24 02:44:53 -08:00
Anatol Belski 87f348a1e7 basic fixes to sapi/fpm 2013-12-24 02:44:53 -08:00
Anatol Belski 4267b15630 Z_STRLEN vs Z_STRSIZE 2013-12-24 02:44:53 -08:00
Joe Watkins 5aba79affa update credits 2013-12-24 02:44:53 -08:00
Bob Weinand 62f0ffb34e Added breaking upon fatal-ish error 2013-12-24 02:44:53 -08:00
Stanislav Malyshev 4363b38657 fix NEWS file for master 2013-12-24 02:44:53 -08:00
Bob Weinand 09e6ef3986 Fixed credits in phpdbg.* files 2013-12-24 02:44:52 -08:00
Joe Watkins ca8ff0725b update credits 2013-12-24 09:04:32 +00:00
Joe Watkins e07dfa96b3 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Fixed credits in phpdbg.* files
  Added breaking upon fatal-ish error
  fix NEWS file for master
  credits file for phpdbg
  Fixed credits in phpdbg.* files
  reformat
  credits file
2013-12-24 09:03:55 +00:00
Joe Watkins e538c1ad3f update credits headers 2013-12-24 09:03:22 +00:00
Joe Watkins 7b17d6c4bf Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
* 'PHP-5.6' of https://git.php.net/repository/php-src:
  Fixed credits in phpdbg.* files
  Added breaking upon fatal-ish error
  credits file for phpdbg
  Fixed credits in phpdbg.* files
  reformat
  credits file
2013-12-24 09:02:52 +00:00
Bob Weinand ad358593a8 Merge branch 'PHP-5.6' 2013-12-24 00:37:20 +01:00
Bob Weinand ca882858f4 Fixed credits in phpdbg.* files 2013-12-24 00:34:23 +01:00
Bob Weinand ebfe304d6a Merge branch 'master' of sapi/phpdbg into PHP-5.6 2013-12-24 00:33:25 +01:00
Bob Weinand 0577ccad28 Added breaking upon fatal-ish error 2013-12-24 00:30:37 +01:00
Stanislav Malyshev 6daa84f199 fix NEWS file for master 2013-12-23 15:25:38 -08:00
Joe Watkins 617aefbcda credits file for phpdbg 2013-12-24 00:16:47 +01:00
Bob Weinand 6f63609251 Fixed credits in phpdbg.* files 2013-12-23 23:55:07 +01:00
Anatol Belski 2f77629f72 Merge remote-tracking branch 'origin/master' into str_size_and_int64 2013-12-23 23:41:29 +01:00
Anatol Belski e540839c8b Merge branch 'master' into str_size_and_int64
Conflicts:
	Zend/zend_vm_execute.h
	ext/opcache/Optimizer/pass1_5.c
	ext/opcache/ZendAccelerator.h
2013-12-23 23:39:42 +01:00
Joe Watkins 056f6fd895 Merge branch 'PHP-5.6'
* PHP-5.6:
  credits file for phpdbg
2013-12-23 22:37:36 +00:00
Joe Watkins 265fdd9139 credits file for phpdbg 2013-12-23 22:36:30 +00:00
Anatol Belski 63ea29a206 fixed tests using 'expected to be long' vs 'expected to be integer' 2013-12-23 14:28:02 -08:00
Anatol Belski a06a89dba6 removed the all style function arg formats 'l', 's', 'p' 2013-12-23 14:24:34 -08:00
Stanislav Malyshev 392f6830a1 Merge branch 'PHP-5.6'
* PHP-5.6:
  restore NEWS to the state of 6c5e93fe17
2013-12-23 14:10:44 -08:00
Stanislav Malyshev 571ac34393 restore NEWS to the state of 6c5e93fe17 2013-12-23 14:10:08 -08:00
krakjoe 7b215b36bc reformat 2013-12-23 21:54:45 +00:00
krakjoe 2d82e994b6 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-12-23 21:52:32 +00:00
krakjoe d82e7ee7f8 credits file 2013-12-23 21:52:22 +00:00
krakjoe 433bc142a6 credits file 2013-12-23 21:51:00 +00:00
Anatol Belski 389b4d411e fix typo after merge 2013-12-23 20:31:40 +01:00
Dmitry Stogov 276b9767e4 Fixed bug #66338 (Optimization binding of class constants is not safely opcacheable) 2013-12-23 20:30:30 +01:00
Dmitry Stogov c699696c43 Fixed bug #66334 (Memory Leak in new pass1_5.c optimizations). (Terry) 2013-12-23 20:30:27 +01:00
krakjoe 8d64f0ee71 missing, apparently 2013-12-23 20:25:58 +01:00
Dmitry Stogov 67eccf8617 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #66338 (Optimization binding of class constants is not safely opcacheable)
2013-12-23 16:54:54 +04:00
Dmitry Stogov a00e7f22d2 Fixed bug #66338 (Optimization binding of class constants is not safely opcacheable) 2013-12-23 16:53:34 +04:00
Dmitry Stogov fff72bc93b Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src:
  removed outdated IsDebuggerPresent declaration
2013-12-23 16:05:59 +04:00
Dmitry Stogov bd88bed670 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  removed outdated IsDebuggerPresent declaration
2013-12-23 16:05:38 +04:00
Dmitry Stogov 209ec406ca Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #66334 (Memory Leak in new pass1_5.c optimizations). (Terry)
2013-12-23 16:05:18 +04:00
Dmitry Stogov ccb29a6e41 Fixed bug #66334 (Memory Leak in new pass1_5.c optimizations). (Terry) 2013-12-23 16:04:10 +04:00
Anatol Belski ea7a70708f removed outdated IsDebuggerPresent declaration
This piece of code seems to retain compatibility with some windows
versions before 2000. Today it's not relevant anymore and only
produces a warning C4273 because of the conflicting prototype. In
VC9 the declaration is present in winbase.h:4142, but available
is it already in winxp. Here's the doc link
http://msdn.microsoft.com/en-us/library/windows/desktop/ms680345(v=vs.85).aspx
2013-12-23 12:34:30 +01:00
Dmitry Stogov 1c462a4e4d Added suggestion about opcache.revalidate_freq setting in development environment 2013-12-23 12:34:27 +01:00
Dmitry Stogov 9c5a902106 Fixed Issue #140: "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq" 2013-12-23 12:34:26 +01:00
Sara Golemon 78f2ded86a Bump ZEND_MODULE_API_NO due to the TSRMLS change to zend_is_true() 2013-12-23 12:30:16 +01:00
krakjoe a2e77fb258 opcodes 2013-12-23 12:29:01 +01:00
krakjoe 07e97f919d missing, apparently 2013-12-23 12:28:59 +01:00
krakjoe f9affb5ae9 stop warnings from unused opcode map 2013-12-23 12:24:11 +01:00
Felipe Pena aaca4ede15 - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com 2013-12-23 12:17:15 +01:00
Anatol Belski f4a96983e1 Merge branch 'PHP-5.6'
* PHP-5.6:
  removed outdated IsDebuggerPresent declaration
2013-12-23 12:01:26 +01:00
Anatol Belski 19039984e2 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  removed outdated IsDebuggerPresent declaration
2013-12-23 12:01:10 +01:00
Dmitry Stogov 62fa84a031 Merge branch 'PHP-5.6'
* PHP-5.6:
  Added suggestion about opcache.revalidate_freq setting in development environment
2013-12-23 13:11:22 +04:00
Dmitry Stogov 8650d2dda6 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Added suggestion about opcache.revalidate_freq setting in development environment
2013-12-23 13:10:42 +04:00
Dmitry Stogov 5bc9e006e8 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed Issue #140: "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq"
  fix news
  opcodes
  opcodes

Conflicts:
	NEWS
2013-12-23 12:52:27 +04:00
Dmitry Stogov f5c200fce9 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed Issue #140: "opcache.enable_file_override" doesn't respect "opcache.revalidate_freq"
  opcodes
2013-12-23 12:50:42 +04:00
Sara Golemon 6a2a2b52f9 Bump ZEND_MODULE_API_NO due to the TSRMLS change to zend_is_true() 2013-12-22 14:10:59 -08:00
krakjoe befdd1770a fix news 2013-12-22 14:34:29 +00:00
krakjoe ee55edf5e4 fix news 2013-12-22 13:30:41 +00:00
krakjoe 523a6b50ae fix news file 2013-12-22 13:27:38 +00:00
krakjoe d455377fad opcodes 2013-12-22 13:20:17 +00:00
krakjoe 8ce521a6a7 missing, apparently 2013-12-22 13:19:35 +00:00
krakjoe df9f2ad2e9 Merge branch 'PHP-5.6' of https://github.com/php/php-src into PHP-5.6 2013-12-22 13:17:21 +00:00
krakjoe 621862a192 Merge branch 'PHP-5.6'
* PHP-5.6:
  stop warnings from unused opcode map
  - BFN

Conflicts:
	NEWS
	Zend/zend_vm_opcodes.h
2013-12-22 13:15:40 +00:00
krakjoe 2a1b60569f Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  stop warnings from unused opcode map
  - BFN
  - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
  Included new .c file in build too
  Fixed little typo in zend_vm_gen.php
  Moved to new file, killing a lot of warnings
2013-12-22 13:11:20 +00:00
Felipe Pena e700cbff22 Merge branch 'PHP-5.6'
* PHP-5.6:
  - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
2013-12-22 09:43:29 -02:00
Felipe Pena 9f1075bb29 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
2013-12-22 09:43:10 -02:00
Anatol Belski 85251eccaf Merge remote-tracking branch 'origin/master' into str_size_and_int64 2013-12-22 11:57:14 +01:00
Anatol Belski e11fbd979f next wave of revamp in Zend 2013-12-22 11:54:30 +01:00
Bob Weinand 2bf271bbb0 Merge branch 'PHP-5.6' 2013-12-22 01:08:47 +01:00
Bob Weinand 0525dce3c8 Merge branch 'master' of sapi/phpdbg into PHP-5.6 2013-12-22 01:04:31 +01:00
Bob Weinand 5b1f6caaf0 Merge branch 'PHP-5.6' 2013-12-22 00:57:31 +01:00
Bob Weinand 129fb22b37 Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
	Zend/zend_vm_opcodes.c
2013-12-22 00:55:46 +01:00
Bob Weinand 2874eba714 Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
	Zend/zend_vm_opcodes.h
2013-12-21 23:54:38 +01:00
Bob Weinand 20318c4960 Added breaking upon fatal-ish error 2013-12-21 22:42:11 +01:00
Anatol Belski 94fcc9e8c7 Merge branch 'master' into str_size_and_int64 2013-12-21 21:49:03 +01:00
Bob Weinand 0cc89be244 Merge branch 'PHP-5.6' 2013-12-21 21:33:15 +01:00
Bob Weinand b14f31872b Merge branch 'PHP-5.5' into PHP-5.6 2013-12-21 21:32:42 +01:00
Anatol Belski b77d6bb2b4 Merge remote-tracking branch 'origin/master' into str_size_and_int64 2013-12-21 20:46:42 +01:00
Bob Weinand e2b75e5bb7 Merge branch 'PHP-5.6' 2013-12-21 19:32:41 +01:00
Bob Weinand 9b4b5fa737 Merge branch 'PHP-5.5' into PHP-5.6 2013-12-21 19:31:27 +01:00
krakjoe a1a57827e1 Merge branch 'watchpoints' of https://github.com/krakjoe/phpdbg into watchpoints 2013-12-21 09:39:59 +00:00
Bob Weinand 6ee1da1f55 ZTS fixed 2013-12-20 22:17:30 -05:00
Bob Weinand e2172ba39c ZTS fixed 2013-12-20 22:10:03 -05:00
Christopher Jones 1b1b706818 Merge branch 'PHP-5.6'
* PHP-5.6:
  Align 'configure --help' columns
  Added NEWS and UPGRADING info for phpdbg
2013-12-20 10:05:52 -08:00
Christopher Jones 794df91c35 Align 'configure --help' columns 2013-12-20 10:02:46 -08:00
Bob Weinand 6c5e93fe17 Added NEWS and UPGRADING info for phpdbg 2013-12-20 14:56:03 +01:00
Anatol Belski 3f2f1b2661 Merge remote-tracking branch 'origin/master' into str_size_and_int64 2013-12-20 14:47:15 +01:00
Bob Weinand 3926362d30 Merge branch 'master' of https://git.php.net/push/php-src 2013-12-20 14:36:28 +01:00
Bob Weinand f500be8838 Merge branch 'PHP-5.6' 2013-12-20 14:35:40 +01:00
Bob Weinand 4ae4b7bf47 Merge branch 'PHP-5.6' of http://git.php.net/repository/php-src into PHP-5.6 2013-12-20 14:29:35 +01:00
Bob Weinand cee72c13d7 Merge branch 'master' of sapi/phpdbg into PHP-5.6
Including phpdbg.
2013-12-20 14:27:51 +01:00
krakjoe ef3e0119b8 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-12-20 13:20:40 +00:00
krakjoe 37eac64e36 update readme 2013-12-20 13:20:17 +00:00
Bob Weinand f06ac6a531 Bumped version number to 0.3.0 2013-12-20 14:03:51 +01:00
Bob Weinand 937cc7c80a Recreated test.php 2013-12-20 13:56:21 +01:00
krakjoe d5c685adba tidy up readme 2013-12-20 12:52:18 +00:00
krakjoe 329e16a250 tidy up repository for merging 2013-12-20 12:51:24 +00:00
Anatol Belski b0a551ee14 final remove of the temporary int64/strlen configure options 2013-12-20 09:06:31 +01:00
Anatol Belski f2fc935502 next wave on semantical replacements long vs. int 2013-12-19 23:32:58 -08:00
Bob Weinand 3f70e9f8bd Fixed deletion of watchpoints 2013-12-19 22:21:08 -05:00
Anatol Belski 98e273bb03 Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	ext/zip/php_zip.c
2013-12-19 22:18:18 +01:00
Boris Lytochkin 5ce843abcb Merge branch '5.6' into PHP-5.6
* 5.6:
  Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytochkin)
2013-12-20 01:02:08 +04:00
Boris Lytochkin ba51a375ae Merge branch '5.6'
* 5.6:
  Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytochkin)
2013-12-20 00:47:26 +04:00
Boris Lytochkin 285c0bcec0 Merge branch '5.5' into 5.6
* 5.5:
  Fixed SNMP_ERR_TOOBIG handling for bulk walk operations. (Boris Lytochkin)
  Fixed SNMP_ERR_TOOBIG handling for bulk walk operations
2013-12-20 00:39:15 +04:00
Derick Rethans db025b3789 Merge branch 'PHP-5.6' 2013-12-19 19:01:08 +00:00
Derick Rethans d4f4b66d43 Merge branch 'PHP-5.5' into PHP-5.6 2013-12-19 19:01:00 +00:00
Derick Rethans e1a5edaac2 Merge branch 'PHP-5.5' 2013-12-19 18:58:48 +00:00
Anatol Belski 88456894b9 Merge branch 'str_size_and_int64' of https://git.php.net/push/php-src into str_size_and_int64 2013-12-19 08:44:56 -08:00
Anatol Belski 6125278290 more semantical replacements LONG vs. INT 2013-12-19 08:40:41 -08:00
Bob Weinand 5e351695b6 Added deleting of watchpoints 2013-12-19 11:05:38 -05:00
Anatol Belski 6b8a78eb5f added comment 2013-12-19 14:28:00 +01:00
Anatol Belski f58d0b35ed massive update semantical LONG vs INT replacements 2013-12-19 05:07:37 -08:00
Remi Collet e75b967610 Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  save a few memory
  Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
2013-12-19 10:56:25 +01:00
Remi Collet 0fe9a9019b Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
2013-12-19 10:56:16 +01:00
Remi Collet f6ffecbd2d save a few memory 2013-12-19 10:55:26 +01:00
Remi Collet 99b91f98b1 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)
2013-12-19 10:54:06 +01:00
Michael Wallner 551569262b Merge branch 'PHP-5.6'
* PHP-5.6:
  Update NEWS handling section of README.GIT-RULES
2013-12-19 10:10:09 +01:00
krakjoe ce4ba54583 test commit 2013-12-19 10:08:51 +01:00
Michael Wallner 17470df2a5 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Update NEWS handling section of README.GIT-RULES
2013-12-19 10:08:27 +01:00
Anatol Belski 5d263adf4c fixed duplicated include 2013-12-19 08:48:27 +01:00
Anatol Belski a16217d4a4 added file header 2013-12-19 08:43:11 +01:00
Anatol Belski a981798d8e add missing header 2013-12-18 15:31:06 -08:00
Anatol Belski cfb76d53f7 correct fix for ext/opcache regarding zend_size_t replacements 2013-12-18 15:29:04 -08:00
Anatol Belski e9224fc81b reverted the previous wrong patch 2013-12-18 15:28:23 -08:00
Anatol Belski 5f3e76dfe5 fixes ext/opcache after too much replacement 2013-12-18 15:21:34 -08:00
Anatol Belski ba5a1995bb Merge branch 'str_size_and_int64' of https://git.php.net/push/php-src into str_size_and_int64 2013-12-18 15:08:07 -08:00
Anatol Belski af362b20c6 zend_size_t for *.cpp files as well 2013-12-18 15:07:30 -08:00
Anatol Belski f62aa10f3e Merge branch 'str_size_and_int64' of git.php.net:php-src into str_size_and_int64 2013-12-19 00:03:49 +01:00
Anatol Belski 942f91ff0f fix zend_size_t type def 2013-12-19 00:03:12 +01:00
Anatol Belski 8709cc6d60 size_t part for *.l files 2013-12-18 14:56:40 -08:00
Anatol Belski 0b8f946ea5 size_t part for *.y files 2013-12-18 14:53:48 -08:00
Anatol Belski d5daea505f size_t part for win32/ 2013-12-18 14:50:32 -08:00
Anatol Belski b1abe4ca21 mass replacement for zend_size_t/php_size_t 2013-12-18 14:46:44 -08:00
Anatol Belski 6d938321ff prepare for zend_size_t 2013-12-18 14:22:47 -08:00
krakjoe 08393ad2ac disregard leading slash 2013-12-18 17:00:26 +00:00
krakjoe 944ebb36c8 version in userland 2013-12-18 16:33:21 +00:00
Anatol Belski df7db6519c Merge remote-tracking branch 'origin/master' into str_size_and_int64 2013-12-18 17:07:00 +01:00
Bob Weinand b11b3d201f Fixed ZTS build. Needed to bump API version number. 2013-12-18 16:44:20 +01:00
Dmitry Stogov 26096aa73f Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed reavlidate_path=1 behavior to avoid caching of symlinks values.
2013-12-18 19:22:05 +04:00
Dmitry Stogov 436ca2d019 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed reavlidate_path=1 behavior to avoid caching of symlinks values.

Conflicts:
	NEWS
2013-12-18 19:21:21 +04:00
Bob Weinand d850deca94 Merge pull request #44 from Hywan/option_zend_version
Add Zend version and copyright (oops, I merged the last PR too early)
2013-12-18 07:20:11 -08:00
Ivan Enderlin 1bc35a70d5 Add Zend version and copyright. 2013-12-18 16:15:24 +01:00
Bob Weinand 117d5e38e3 Merge pull request #43 from Hywan/option_version
Add the `-V` option to print the version number
2013-12-18 07:11:37 -08:00
Ivan Enderlin abf68be7a4 Add the -V option to print the version number. 2013-12-18 16:05:11 +01:00
Anatol Belski 74aea4e471 fix after merge 2013-12-18 15:18:02 +01:00
Anatol Belski 8432557dcd Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	Zend/zend.c
	Zend/zend.h
	Zend/zend_execute.h
	Zend/zend_vm_execute.h
	main/SAPI.h
2013-12-18 15:07:42 +01:00
krakjoe fc5f533c6f ... 2013-12-18 12:03:07 +00:00
Joe Watkins 5ccd5739f4 Merge pull request #40 from Hywan/fix_typo
In english, no horizontal space before “!”
2013-12-18 03:37:05 -08:00
Ivan Enderlin e5263aa3f0 In english, no horizontal space before “!”. 2013-12-18 11:53:30 +01:00
krakjoe 7e0d1938f9 fix warnings/50700 stuff 2013-12-18 10:31:14 +00:00
Felipe Pena a8a36b7d52 - Fixed build 2013-12-18 08:28:44 -02:00
krakjoe 5cc9a35f1b ... 2013-12-18 10:18:22 +00:00
krakjoe 6ac3a4ab41 50700 change 2013-12-18 10:17:43 +00:00
krakjoe 8b0e1c6191 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-12-18 10:12:28 +00:00
krakjoe db9bbf1147 fix build 2013-12-18 10:12:17 +00:00
Bob Weinand 3043bd285c Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-12-18 11:08:32 +01:00
krakjoe ef89fe37ca fix build error zts 2013-12-18 10:06:42 +00:00
Bob Weinand 94d5334bca Added myself as author where I was not author yet 2013-12-18 11:02:50 +01:00
Anatol Belski fcb28ea97f automated platform dependent zend_int_t declarations 2013-12-18 10:52:14 +01:00
Kalle Sommer Nielsen aed4b086ac Eliminate the TSRMLS_FETCH() calls in the ticks functions and hook 2013-12-18 09:32:26 +01:00
Kalle Sommer Nielsen c83598119b Kill a TSRMLS_FETCH() in php_stream_context_set() by passing TSRMLS_CC to it
# For mysqlnd: Relevant PHP_API_VERSION are put in place for cross version compatibility
2013-12-18 09:19:24 +01:00
Kalle Sommer Nielsen d02340bb39 Kill a TSRMLS_FETCH() call in sapi/caudium 2013-12-18 09:11:15 +01:00
Kalle Sommer Nielsen f883d3cc7a We might as well re-use the TSRMLS parameters here as they are available in PHP_FUNCTION anyway to save a TSRMLS_FETCH() call 2013-12-18 09:10:45 +01:00
Kalle Sommer Nielsen ed5a8d510f Pass the TSRMLS parameters to the sapi flush hook, this shaves off a few TSRMLS_FETCH() calls in our various SAPIs 2013-12-18 09:06:39 +01:00
Kalle Sommer Nielsen f70f89c1b1 Kill another TSRMLS_FECH() in sapi/roxen 2013-12-18 09:05:01 +01:00
Kalle Sommer Nielsen 520d969fea Fix these SAPI hooks so that the TSRMLS parameters are correctly passed as required by the sapi struct
# Not sure if this builds either
2013-12-18 09:01:44 +01:00
krakjoe 64dabffd08 fix crash on clean in nts 2013-12-18 07:57:27 +00:00
Bob Weinand 0dbc5c2087 first working version of wildcard watchpoints 2013-12-18 02:56:20 -05:00
Kalle Sommer Nielsen 432e91f112 Bump year
# Wonder if this is even working anymore
2013-12-18 08:55:19 +01:00
Kalle Sommer Nielsen e6b471933c Kill yet another TSRMLS_FETCH() inside the CLI HTTP server 2013-12-18 08:17:49 +01:00
Kalle Sommer Nielsen bd58146ad6 Kill another TSRMLS_FETCH() in the zend extension loading code 2013-12-18 07:59:47 +01:00
Kalle Sommer Nielsen 2eb9bd316d Merge branch 'master' of https://git.php.net/push/php-src 2013-12-18 07:27:14 +01:00
Kalle Sommer Nielsen d14670ccdb Eliminate another TSRMLS_FETCH() in i_zend_is_true()
# Affected extensions have all been updated, ext/opcache and ext/zip
# both have macros for cross version compatibility
2013-12-18 07:25:05 +01:00
Anatol Belski 9576330979 updated libmagic.patch 2013-12-17 13:30:17 -08:00
Anatol Belski 4cdcbeec76 basic fixes to ext/interbase 2013-12-17 11:17:12 +01:00
Anatol Belski 8aa7f84dd2 basic fixes to ext/sybase_ct 2013-12-17 10:58:13 +01:00
Anatol Belski 83edc59d13 fix datatype to hold read bytes 2013-12-17 10:20:34 +01:00
Anatol Belski dc45cfe401 fix function signature 2013-12-17 10:17:14 +01:00
Anatol Belski b90cc170b6 revamp ext/pdo_firebird 2013-12-17 10:14:55 +01:00
Anatol Belski 1337ba8a62 fixed conflicting function signatures in ext/com_dotnet 2013-12-17 10:06:11 +01:00
Anatol Belski 170c4d1fe6 Z_STRLEN vs Z_STRSIZE 2013-12-17 09:26:07 +01:00
Anatol Belski 167fdaa0e7 regenerated zend_vm_execute.h after merge 2013-12-17 09:05:29 +01:00
Anatol Belski 3e90132341 Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	Zend/zend_compile.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/opcache/Optimizer/pass1_5.c
	ext/pdo_odbc/odbc_stmt.c
2013-12-17 09:01:11 +01:00
Anatol Belski c0f1e6946d Merge branch 'PHP-5.6'
* PHP-5.6:
  fixed possibly uninitialized value usage
2013-12-17 08:45:49 +01:00
Anatol Belski beed28844b Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fixed possibly uninitialized value usage
2013-12-17 08:45:30 +01:00
Xinchen Hui 72389dd53f Merge branch 'PHP-5.6' 2013-12-17 15:37:26 +08:00
Xinchen Hui b331a219be Use memcmp here is better 2013-12-17 15:37:10 +08:00
Xinchen Hui a9c503bc27 Merge branch 'PHP-5.6' 2013-12-17 15:10:56 +08:00
Xinchen Hui eeb37c40e6 Save one char compare 2013-12-17 15:09:52 +08:00
Xinchen Hui ac719610f4 Merge branch 'PHP-5.6' 2013-12-17 15:06:36 +08:00
Xinchen Hui 143ae34f29 Fixed test failed after rev 57c1335f 2013-12-17 15:05:31 +08:00
Stanislav Malyshev 5613d70ee8 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix bug #65873 - Integer overflow in exif_read_data()
2013-12-16 11:38:00 -08:00
Stanislav Malyshev de4a2c3cbd Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix bug #65873 - Integer overflow in exif_read_data()
2013-12-16 11:37:29 -08:00
David Soria Parra d7d0ceb90d Merge branch 'PHP-5.6' 2013-12-16 10:28:11 -08:00
David Soria Parra 85a10166e1 Merge branch 'PHP-5.5' into PHP-5.6 2013-12-16 10:27:51 -08:00
Anatol Belski a56274b3f1 Merge branch 'str_size_and_int64' of git.php.net:php-src into str_size_and_int64 2013-12-16 17:31:13 +01:00
Anatol Belski 68d3353e5c basic fixes to ext/mssql 2013-12-16 17:26:32 +01:00
Anatol Belski 409498f03c fixed conflicting types in func definition 2013-12-16 08:13:35 -08:00
Bob Weinand 0a8c20e740 Handle automatic removing of watchpoints and cleanup at the end 2013-12-16 10:29:31 -05:00
Anatol Belski d51ff1322d revamp ext/opcache 2013-12-16 12:56:32 +01:00
Dmitry Stogov 43f11165b8 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src:
  Fix tests expecting specific resource IDs
  fixed parameter order for zend_throw_exception_ex call
  Fix doc (svn -> git)
  Test pushing
  Updated release process
2013-12-16 13:13:18 +04:00
Dmitry Stogov 82d67af60d Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Fix tests expecting specific resource IDs
  fixed parameter order for zend_throw_exception_ex call
  Fix doc (svn -> git)
  Fix tests expecting specific resource IDs
  Test pushing
  Updated release process
2013-12-16 13:12:55 +04:00
Bob Weinand a7b0dfb7b1 Preventing possible segfault 2013-12-15 09:15:34 -05:00
Bob Weinand d3c8d76e5b Merge branch 'watchpoints' of ssh://github.com/krakjoe/phpdbg into watchpoints
Conflicts:
	phpdbg_watch.c
2013-12-15 09:10:28 -05:00
Bob Weinand 9ce9f48fb6 Moved btree to separate file; minor fixes and completitions 2013-12-15 09:05:50 -05:00
Felipe Pena 75b4b4676b - Staticfy some functions 2013-12-15 11:58:14 -02:00
Felipe Pena 0ca7f72130 - Fixed build 2013-12-15 11:55:03 -02:00
Anatol Belski ca25f3d829 revamp ext/phar 2013-12-15 13:58:39 +01:00
Anatol Belski 34848ccae7 Merge remote-tracking branch 'origin/master' into str_size_and_int64 2013-12-15 12:08:39 +01:00
Xinchen Hui 5eb8d9d700 Merge branch 'PHP-5.6' of https://git.php.net/push/php-src into PHP-5.6 2013-12-15 16:55:29 +08:00
Xinchen Hui 48dcc43488 Merge branch 'PHP-5.6' 2013-12-15 16:51:43 +08:00
Xinchen Hui 10964b7854 Merge branch 'PHP-5.5' into PHP-5.6 2013-12-15 16:51:32 +08:00
Xinchen Hui 304d97933f Merge branch 'issue-phpt-resourceid-wincache' of https://github.com/EricSten/php-src 2013-12-15 16:26:11 +08:00
Anatol Belski 897d11658a fixed parameter order for zend_throw_exception_ex call 2013-12-14 20:55:32 +01:00
DQNEO 964141f781 Fix doc (svn -> git) 2013-12-14 20:55:31 +01:00
Anatol Belski fc4761a07c Merge branch 'PHP-5.6'
* PHP-5.6:
  fixed parameter order for zend_throw_exception_ex call
  Fix doc (svn -> git)
  Test pushing
2013-12-14 20:48:44 +01:00
Anatol Belski 904721189f Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fixed parameter order for zend_throw_exception_ex call
  Fix doc (svn -> git)
2013-12-14 20:47:37 +01:00
Anatol Belski 2cfb1c5bb9 basic fixes to ext/pdo_oci 2013-12-14 11:49:42 +01:00
Anatol Belski e0c5db0970 basic fixes to ext/oci8 2013-12-14 11:39:47 +01:00
Bob Weinand f312f6bad2 First semi-working version of a single watchpoint 2013-12-14 05:39:09 -05:00
Anatol Belski 4c68e81018 fixed sapi/embed 2013-12-14 00:26:56 +01:00
Bob Weinand 85b97c0f70 Finished working for today, continuing tomorrow (not working) 2013-12-13 17:57:36 -05:00
Anatol Belski 009528ba43 revamp sapi/cgi 2013-12-13 22:24:23 +01:00
Anatol Belski 7266938012 use php_socket_t where possible in ext/cli 2013-12-13 22:16:12 +01:00
Eric Stenson 50377b5bf2 Fix tests expecting specific resource IDs
When Wincache or APC are installed, the resource IDs are not the same.
This is because Wincache takes a few resource objects for itself.  As a
result, these tests become false positives.

On Windows boxes, the microtime precision is not granular enough
to reliably register a difference if two calls to uniqid() are made
concurrently.  This is a fix to the uniqid() test to avoid the false
positive when run on Windows machines.  Also, added a test to exercise
the 'more_entropy' variant of uniqid().
2013-12-13 10:42:32 -08:00
Anatol Belski 389188df7f Merge remote-tracking branch 'origin/master' into str_size_and_int64 2013-12-13 17:54:17 +01:00
Anatol Belski 3c494e25e3 Merge branch 'str_size_and_int64' of git.php.net:php-src into str_size_and_int64 2013-12-13 17:49:16 +01:00
Anatol Belski f4d27d83ac basic fixes to ext/imap 2013-12-13 17:47:23 +01:00
Anatol Belski bb5f5e1671 fix function signature 2013-12-13 07:19:16 -08:00
Anatol Belski 4973f3a312 fixed ext/pdo_dblib 2013-12-13 07:19:16 -08:00
Anatol Belski 37594963b3 Merge branch 'str_size_and_int64' of git.php.net:php-src into str_size_and_int64 2013-12-13 15:36:36 +01:00
Anatol Belski 4651c74405 fixed ext/skeleton 2013-12-13 15:35:37 +01:00
Anatol Belski d2ed9b3d30 fixed ext/sysvsem and ext/sysvshm 2013-12-13 06:32:08 -08:00
Anatol Belski 79c06bb896 fixed ext/sysvmsg 2013-12-13 06:15:47 -08:00
Anatol Belski e64e7e6ffc fixed ext/recode 2013-12-13 06:02:59 -08:00
Anatol Belski 872734be58 fix datatype 2013-12-13 05:58:12 -08:00
Anatol Belski 1040cdf8fc fixed ext/readline 2013-12-13 05:51:49 -08:00
Xinchen Hui 41eaac3491 Test pushing 2013-12-13 21:32:14 +08:00
Julien Pauli 735f930bac Merge branch 'PHP-5.6'
* PHP-5.6:
  Updated release process
2013-12-13 13:30:30 +01:00
Julien Pauli d67fbaa74d Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Updated release process
2013-12-13 13:27:45 +01:00
Anatol Belski 985d8f0436 Merge branch 'str_size_and_int64' of https://git.php.net/push/php-src into str_size_and_int64 2013-12-13 04:10:45 -08:00
Anatol Belski 512cbad00c basic fixes to ext/pspell 2013-12-13 04:10:17 -08:00
Anatol Belski 316fd8aab6 Merge branch 'str_size_and_int64' of git.php.net:php-src into str_size_and_int64 2013-12-13 12:28:18 +01:00
Anatol Belski 931071aa97 fixed function signature 2013-12-13 12:27:58 +01:00
Anatol Belski d87dc25b71 fixed ext/pcntl 2013-12-13 03:26:29 -08:00
Anatol Belski 3a8ee7800c fixed ext/posix 2013-12-13 03:26:04 -08:00
Anatol Belski 73a7351a2c fixed ext/dba 2013-12-13 02:55:38 -08:00
Anatol Belski 936124742b fixed function signature 2013-12-13 11:09:30 +01:00
Anatol Belski 1007374254 Merge branch 'str_size_and_int64' of git.php.net:php-src into str_size_and_int64 2013-12-13 11:03:14 +01:00
Anatol Belski f806f4d060 Merge branch 'master' into str_size_and_int64 2013-12-13 10:45:27 +01:00
Dmitry Stogov af66b20781 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src:
  Use zend_error_noreturn here
  OCI8 build change: Fix source variable definition for C89 compatibility
  Add Tests for #65784 in 5.5
  Disallowed JMP into a finally block.
  Update NEWS for 5.5.7 release
  Fixed bug #65784 (Segfault with finally).
2013-12-13 11:17:50 +04:00
Dmitry Stogov 9b829c92b5 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Use zend_error_noreturn here
  OCI8 build change: Fix source variable definition for C89 compatibility
  Kill another TSRMLS_FETCH() in zend_indent()
  Eliminate another straight forward TSRMLS_FETCH() in zend_startup_module()
  Fix build
  Add Tests for #65784 in 5.5
  Disallowed JMP into a finally block.
  Update NEWS for 5.5.7 release
  Fixed bug #65784 (Segfault with finally).
2013-12-13 11:15:38 +04:00
Xinchen Hui 914de05bf5 Merge branch 'PHP-5.6' 2013-12-13 11:37:53 +08:00
Xinchen Hui 6f95a07c41 Merge branch 'PHP-5.5' into PHP-5.6 2013-12-13 11:37:43 +08:00
Christopher Jones e92ea13bff Merge branch 'PHP-5.6'
* PHP-5.6:
  OCI8 build change: Fix source variable definition for C89 compatibility
2013-12-12 15:23:23 -08:00
Christopher Jones bc748ba38c OCI8 build change: Fix source variable definition for C89 compatibility 2013-12-12 15:22:55 -08:00
Kalle Sommer Nielsen 1433dec2d0 Kill another TSRMLS_FETCH() in zend_indent() 2013-12-12 22:09:38 +01:00
Kalle Sommer Nielsen 0fc8e6af0a Eliminate another straight forward TSRMLS_FETCH() in zend_startup_module()
# For THTTPD:
# The code that uses a call to this function is for older versions of PHP anyway so its not covered

# For Zend OpCache:
# Added a new define for 5.6 and wrapped the code around that so its still compatible with older version
2013-12-12 20:30:45 +01:00
Kalle Sommer Nielsen 4411641b1e Fix build 2013-12-12 20:25:10 +01:00
Xinchen Hui 8708b13d62 Merge remote-tracking branch 'origin/PHP-5.6' 2013-12-13 01:50:22 +08:00
Xinchen Hui c9d00a23ae Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6 2013-12-13 01:48:17 +08:00
Xinchen Hui ab12ccd16a Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6 2013-12-13 01:46:28 +08:00
Xinchen Hui 6a299514f8 Merge branch 'PHP-5.6'
Conflicts:
	NEWS
2013-12-13 00:54:36 +08:00
Xinchen Hui 794a888a48 Fixed bug #65784 (Segfault with finally). 2013-12-13 00:16:08 +08:00
Xinchen Hui 0fbb421ec1 Merge branch 'PHP-5.6' 2013-12-13 00:15:11 +08:00
Dmitry Stogov 3bddcc13b5 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src:
  fix test
2013-12-12 16:46:37 +04:00
Dmitry Stogov fd4a7388d7 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  fix test
2013-12-12 16:46:15 +04:00
Michael Wallner c0e87e9bb1 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix test
2013-12-12 12:10:08 +01:00
Michael Wallner 1dfbe99ce4 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix test
2013-12-12 12:09:54 +01:00
Anatol Belski bdc565e67a revamp ext/dom 2013-12-12 11:50:45 +01:00
Dmitry Stogov 9d08f09e06 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  remove always_populate_raw_post_data INI entries from master, UPGRADING.INTERNALS coming shortly
2013-12-12 14:42:19 +04:00
Michael Wallner bc1c2b3b31 remove always_populate_raw_post_data INI entries from master, UPGRADING.INTERNALS coming shortly 2013-12-12 11:33:06 +01:00
Dmitry Stogov 463dbc3490 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src:
  Fixed bug #65486 mysqli_poll() is broken on Win x64
2013-12-12 13:59:51 +04:00
Dmitry Stogov a23bcba875 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Fixed bug #65486 mysqli_poll() is broken on Win x64
2013-12-12 13:59:37 +04:00
Dmitry Stogov 8738e6d86f Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed tests
  Fixed ext/soap/tests/bugs/bug54911.phpt
2013-12-12 13:55:42 +04:00
Dmitry Stogov 9850d57fd9 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed tests
  Fixed ext/soap/tests/bugs/bug54911.phpt
2013-12-12 13:55:23 +04:00
Anatol Belski e0c7899ddd Merge branch 'master' into str_size_and_int64 2013-12-12 10:52:52 +01:00
Anatol Belski 58b754ca4a Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #65486 mysqli_poll() is broken on Win x64
2013-12-12 10:46:36 +01:00
Anatol Belski 39a2dcdeac Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #65486 mysqli_poll() is broken on Win x64
2013-12-12 10:46:21 +01:00
Anatol Belski fa2a2c88fd revamp ext/pdo_mysql 2013-12-11 23:39:43 +01:00
Anatol Belski 6d5c56367d revamp ext/pdo 2013-12-11 23:39:18 +01:00
Bob Weinand 2e5d78192e Committed the damned new files 2013-12-11 21:31:22 +01:00
Bob Weinand 488dd317fe First non-working test of segfault handlers 2013-12-11 21:27:03 +01:00
Anatol Belski a1803faea2 revamp ext/pgsql 2013-12-11 20:04:04 +01:00
Anatol Belski adb70b9923 Merge branch 'master' into str_size_and_int64 2013-12-11 19:29:21 +01:00
Anatol Belski 05fe153f49 revamp ext/soap 2013-12-11 19:23:17 +01:00
Bob Weinand 98d929290c Merge branch 'PHP-5.6'
* PHP-5.6:
  Added one more test for constant scalar expressions
2013-12-11 19:20:10 +01:00
Bob Weinand 324291ebf2 Added one more test for constant scalar expressions 2013-12-11 19:17:07 +01:00
Anatol Belski fa1802381f Merge branch 'PHP-5.6'
* PHP-5.6:
  added missing prototype
2013-12-11 14:16:22 +01:00
Anatol Belski f0cf312d8c Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  added missing prototype
2013-12-11 14:16:07 +01:00
Anatol Belski 2301e190e7 Merge branch 'master' into str_size_and_int64 2013-12-11 13:48:38 +01:00
Anatol Belski 2f707bf246 Merge branch 'PHP-5.6'
* PHP-5.6:
  fix dir separator in cve-2013-6420 test
2013-12-11 13:33:59 +01:00
Anatol Belski e9efc16660 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix dir separator in cve-2013-6420 test
2013-12-11 13:33:37 +01:00
Anatol Belski d3f9debcae Merge branch 'master' into str_size_and_int64 2013-12-11 12:44:05 +01:00
Anatol Belski 4670d46a42 additional range checks for ext/sockets 2013-12-11 12:41:12 +01:00
Ard Biesheuvel 9a5944d960 Merge branch 'PHP-5.6' 2013-12-11 08:51:27 +01:00
Ard Biesheuvel d6ecc4105a Merge branch 'PHP-5.5' into PHP-5.6 2013-12-11 08:51:10 +01:00
Stanislav Malyshev 35b8f57906 Merge branch 'PHP-5.6'
* PHP-5.6:
  5.3.29-dev
  Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
2013-12-10 11:36:33 -08:00
Stanislav Malyshev 293984ac33 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  5.3.29-dev
  Fix CVE-2013-6420 - memory corruption in openssl_x509_parse
2013-12-10 11:36:06 -08:00
Anatol Belski 19161b8d4e fix function params 2013-12-10 20:00:59 +01:00
Anatol Belski 27990438f1 Merge branch 'master' into str_size_and_int64
Conflicts:
	Zend/zend_builtin_functions.c
	ext/opcache/Optimizer/pass1_5.c
	ext/reflection/php_reflection.c
	ext/soap/soap.c
2013-12-10 19:46:40 +01:00
Remi Collet 8e29235b6c Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  Fixed Bug #66218 zend_register_functions breaks reflection
2013-12-10 16:10:48 +01:00
Remi Collet 45d8802441 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  Fixed Bug #66218 zend_register_functions breaks reflection
2013-12-10 16:10:20 +01:00
Anatol Belski 34e5236836 more range checks for ext/sqlite3 2013-12-10 15:40:19 +01:00
Dmitry Stogov ad4f0c7812 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #66112 (Use after free condition in SOAP extension). (martin dot koegler at brz dot gv dot at)
2013-12-10 17:59:20 +04:00
Dmitry Stogov fe93347ba0 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #66112 (Use after free condition in SOAP extension). (martin dot koegler at brz dot gv dot at)

Conflicts:
	NEWS
2013-12-10 17:58:22 +04:00
Anatol Belski 77d4db3957 fixed return 2013-12-10 14:15:29 +01:00
Dmitry Stogov d439b3970a Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #66251 (Constants get statically bound at compile time when Optimized)
2013-12-10 17:05:23 +04:00
Dmitry Stogov 73f13f439b Fixed bug #66251 (Constants get statically bound at compile time when Optimized) 2013-12-10 17:04:17 +04:00
Anatol Belski a697297f5f more range checks for ext/tidy 2013-12-10 13:41:49 +01:00
Dmitry Stogov 90c5689b59 Merge branch 'PHP-5.6'
* PHP-5.6:
  Revered func_get_args() changes, because they were not completly transparent and broke some tricky PHP code that worked because of luck before php-5.5.6 (see Bug #66107). The changes are going to be kept in PHP-5.6.
2013-12-10 16:08:56 +04:00
Dmitry Stogov 1e161a9c0f Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Revered func_get_args() changes, because they were not completly transparent and broke some tricky PHP code that worked because of luck before php-5.5.6 (see Bug #66107). The changes are going to be kept in PHP-5.6.
2013-12-10 16:08:46 +04:00
Dmitry Stogov 6eaf57eb3c Merge branch 'PHP-5.6'
* PHP-5.6:
2013-12-10 16:07:53 +04:00
Dmitry Stogov 4c3492b050 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src:
  Zend: fix overflow handling bug in non-x86 fast_add_function()
2013-12-10 15:16:30 +04:00
Dmitry Stogov 1dafdaa31b Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Zend: fix overflow handling bug in non-x86 fast_add_function()
2013-12-10 15:15:46 +04:00
Dmitry Stogov 78265a44c5 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed memory leaks introdused by: 	commit 611da37617 	Author: Igor Wiedler <igor@wiedler.ch> 	Date:   Sat Nov 9 13:48:23 2013 -0500
2013-12-10 15:15:11 +04:00
Dmitry Stogov 49d7e98025 Fixed memory leaks introdused by:
commit 611da37617
	Author: Igor Wiedler <igor@wiedler.ch>
	Date:   Sat Nov 9 13:48:23 2013 -0500
2013-12-10 15:13:53 +04:00
Ard Biesheuvel c786c30108 Merge branch 'PHP-5.6' 2013-12-10 12:12:44 +01:00
Ard Biesheuvel 60d2e70c06 Zend: fix overflow handling bug in non-x86 fast_add_function()
The 'result' argument of fast_add_function() may alias with either
of its operands (or both). Take care not to write to 'result' before
reading op1 and op2.
2013-12-10 12:12:14 +01:00
Anatol Belski 5acc0c0c5b revamp ext/xmlreader 2013-12-10 11:42:56 +01:00
Dmitry Stogov b260cb92e4 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #66252 (Problems in AST evaluation invalidating valid parent:: reference. Constant expessions have to be evaluated in context of defining class).
2013-12-10 14:21:38 +04:00
Dmitry Stogov 5a87b7ff39 Fixed bug #66252 (Problems in AST evaluation invalidating valid parent:: reference. Constant expessions have to be evaluated in context of defining class). 2013-12-10 14:19:17 +04:00
Anatol Belski da62a38244 revamp ext/xsl 2013-12-10 10:15:47 +01:00
Dmitry Stogov 6b6a4e466a Merge branch 'PHP-5.6'
* PHP-5.6:
  Arguments passed to user function have to be properly allocated on heap
2013-12-10 13:03:24 +04:00
Dmitry Stogov 5ad1117419 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Arguments passed to user function have to be properly allocated on heap
2013-12-10 13:03:09 +04:00
Anatol Belski f195339006 revamp range checks in ext/xml 2013-12-10 09:34:45 +01:00
Bob Weinand baceff6ad4 Tiny whitespace fix in makefile (aligning with other "Installing" messages) 2013-12-09 19:58:19 +01:00
Ard Biesheuvel 21fd125343 Merge branch 'PHP-5.6' 2013-12-09 17:04:05 +01:00
Ard Biesheuvel f33265d572 cli: don't cast away const in select() timeout argument
The timeout argument to select() is modified to reflect the time
remaining when the function returns on a non-timeout condition.
Passing a pointer to const data and casting away the const-ness is
asking for trouble, but for some reason, this trouble manifests
itself only on non-x86 architectures [whose implementation of select()
in glibc is different from the one supplied for x86]

Fix this by passing a stack copy of the timeout argument to select()
2013-12-09 16:54:42 +01:00
Bob Weinand 2fa3479df5 Added conditional opline num support 2013-12-09 13:25:00 +01:00
Felipe Pena bba73628e6 - Fix compiler warning 2013-12-09 09:46:33 -02:00
Bob Weinand 97604918ba Fixed segfault (removed superfluous NUL-byte insertion) 2013-12-09 12:23:44 +01:00
Anatol Belski f7f8c590a5 Merge remote-tracking branch 'bukka/str_size_and_int64_openssl' into str_size_and_int64 2013-12-09 11:30:07 +01:00
Anatol Belski 757c93dd85 Z_STRLEN vs Z_STRSIZE after automerge 2013-12-09 11:18:40 +01:00
krakjoe af979393fc resolve all warnings 2013-12-09 10:15:16 +00:00
krakjoe 058b59bb58 update cl 2013-12-09 09:49:50 +00:00
krakjoe cbaf610ee4 fix test 2013-12-09 09:43:26 +00:00
krakjoe 64194ef652 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-12-09 09:35:54 +00:00
krakjoe 12d071fa7c remove zend extension 2013-12-09 09:33:32 +00:00
Anatol Belski 325224832b Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
	Zend/zend_compile.c
	Zend/zend_compile.h
2013-12-09 10:20:04 +01:00
Stanislav Malyshev 912be12432 Merge branch 'PHP-5.6'
* PHP-5.6:
  Replace invalid code with a proper #error
2013-12-08 16:26:34 -08:00
Stanislav Malyshev cfd5ea4301 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Replace invalid code with a proper #error
2013-12-08 15:53:41 -08:00
Bob Weinand b35f6ee723 Pssst, compiler! 2013-12-08 22:11:50 +01:00
Bob Weinand 71ae30f1b8 WS 2013-12-08 21:58:01 +01:00
Bob Weinand e3bf7ad5b5 Renumbered frames in backtrace for internal functions 2013-12-08 21:43:19 +01:00
Felipe Pena cd3b070d7e - Added variadic support to prototype dumping 2013-12-08 18:04:39 -02:00
Felipe Pena b655a0bc7e - Fix argname printing order 2013-12-08 17:52:14 -02:00
Felipe Pena 50e8a47c90 - Added argument name to backtrace dump 2013-12-08 17:37:35 -02:00
Felipe Pena 508772840e - CS 2013-12-08 16:48:20 -02:00
Felipe Pena 1fc10b5706 - Splitting prototype dumping code 2013-12-08 16:47:53 -02:00
Felipe Pena e5a2d2efbd - Change phpdbg_dump_backtrace prototype 2013-12-08 16:33:19 -02:00
Felipe Pena 3ec948bca3 - Fixed build 2013-12-08 16:30:52 -02:00
Felipe Pena bae424dbb7 - Moved frame related code to phpdbg_frame.c 2013-12-08 16:29:15 -02:00
Felipe Pena c987e46b6f - CS + ws 2013-12-08 16:07:49 -02:00
Jakub Zelenka d3acd878d0 Merge branch 'str_size_and_int64' into str_size_and_int64_openssl 2013-12-08 16:21:40 +00:00
Jakub Zelenka f9816d6729 Remove explicit casts to and from 64bit types 2013-12-08 16:17:55 +00:00
Adam Harvey b97156113e Merge branch 'PHP-5.6'
* PHP-5.6:
  Switch to using freetype-config for freetype detection.
2013-12-07 19:42:00 -08:00
Adam Harvey d40a5a2797 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Switch to using freetype-config for freetype detection.
2013-12-07 19:41:44 -08:00
Bob Weinand 9cd9356523 Added mapping... 2013-12-07 20:28:23 +01:00
Felipe Pena 4715988c70 Merge branch 'opline_num_support' of github.com:krakjoe/phpdbg into opline_num_support 2013-12-07 16:20:37 -02:00
Felipe Pena d2ded767c6 - CS 2013-12-07 16:18:44 -02:00
Bob Weinand 2555fbfc4e Renumbered phpdbg.h correctly 2013-12-07 16:03:01 +01:00
Bob Weinand 422f80e87d Merge branch 'master' of https://github.com/krakjoe/phpdbg into opline_num_support
Conflicts:
	phpdbg.c
	phpdbg_bp.c
2013-12-07 15:42:17 +01:00
Bob Weinand 50db4919ce Adapted opline_num breakpoints to master branch 2013-12-07 15:35:35 +01:00
Felipe Pena 793f1d7c4a - Fix compiler warning + ws 2013-12-07 12:31:10 -02:00
Felipe Pena 6e85e711de - Fix compiler warning 2013-12-07 12:17:29 -02:00
Anatol Belski 31a4d08d37 fix repeated compiler warnings 2013-12-07 08:57:02 +01:00
Anatol Belski 20217b04b4 added macros for integer constants to append appropriate suffix 2013-12-07 08:55:31 +01:00
Anatol Belski 3982b3eccf recap fixes for ext/standard 2013-12-07 00:53:14 +01:00
Phil Sturgeon 39cb92da16 Update README.md 2013-12-06 17:04:49 -05:00
Phil Sturgeon 6085597984 Added libedit reference to README 2013-12-06 16:57:52 -05:00
Phil Sturgeon 9cd5d75f4c Provide commands for getting started 2013-12-06 16:44:24 -05:00
Anatol Belski 0494cf46cf fixes to rand 2013-12-06 22:12:28 +01:00
krakjoe 8939d0da49 make simple 2013-12-06 21:04:20 +00:00
krakjoe faf1013681 more tests
add phpdbg_exec userland function
2013-12-06 20:56:16 +00:00
krakjoe ad2ea99c3e fix registered commands during init, add test 2013-12-06 20:18:44 +00:00
Anatol Belski 8b7a8aff13 Merge branch 'str_size_and_int64' of git.php.net:php-src into str_size_and_int64 2013-12-06 11:43:45 +01:00
Anatol Belski 9510451fb1 remaining fixes to ext/zlib
datatypes for globals
%pd format
2013-12-06 11:42:30 +01:00
Ferenc Kovacs e3ebe995c9 Merge branch 'PHP-5.6' 2013-12-06 11:07:36 +01:00
Ferenc Kovacs 9feb87b017 Merge branch 'igorw-use-function' into PHP-5.6 2013-12-06 11:06:41 +01:00
Michael Wallner d81d61fcc4 Merge branch 'PHP-5.6'
* PHP-5.6:
  BFN
2013-12-06 10:39:18 +01:00
Michael Wallner 1135f3a042 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  BFN
2013-12-06 10:39:10 +01:00
Michael Wallner 01a13bb8c1 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #61645 (fopen and O_NONBLOCK)
  fix possibly uninitialized value
  Use 'user@example.com' rather than 'user@company.com' in tests
2013-12-06 10:34:11 +01:00
Michael Wallner 9ea2489f5c Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #61645 (fopen and O_NONBLOCK)
  fix possibly uninitialized value
2013-12-06 10:33:47 +01:00
Anatol Belski 7fdf6b51d2 Merge branch 'master' into str_size_and_int64 2013-12-06 09:55:50 +01:00
Ferenc Kovacs 562fa252ad Merge branch 'use-function' of git://github.com/igorw/php-src into igorw-use-function 2013-12-06 05:39:49 +01:00
Anatol Belski c253fbda9a fix conflicting types 2013-12-05 16:13:30 -08:00
krakjoe 4562eb0bc8 doh, I'm tired 2013-12-05 23:41:20 +00:00
krakjoe 9dcdca8cc6 travis build status image 2013-12-05 23:28:42 +00:00
krakjoe 3750cea9e1 use current build of php 2013-12-05 23:12:02 +00:00
krakjoe 78a0a2ad76 travis 2013-12-05 22:59:34 +00:00
krakjoe ee5393ebf9 ... 2013-12-05 22:56:20 +00:00
krakjoe c4c9119a35 remove code directory 2013-12-05 22:53:03 +00:00
krakjoe 6817683027 cleanup 2013-12-05 22:50:26 +00:00
krakjoe 3108b28dc1 add format tests 2013-12-05 22:43:14 +00:00
krakjoe 35bf233550 ... 2013-12-05 15:46:40 +00:00
Anatol Belski adb1e38468 integrated %pd into more ported extensions 2013-12-05 14:35:06 +01:00
krakjoe e4e764c1e6 ... 2013-12-05 12:29:17 +00:00
Anatol Belski e881537089 integrated %pd into ext/spl 2013-12-05 13:28:22 +01:00
krakjoe 39d74a2edc printing test 2013-12-05 12:27:47 +00:00
krakjoe 6fc2ed61c4 add moar 2013-12-05 12:23:49 +00:00
krakjoe ef33b77897 change default options for tests 2013-12-05 12:06:35 +00:00
krakjoe 8c499c072d organize 2013-12-05 11:43:27 +00:00
krakjoe 9df1bc1b9c add test-phpdbg makefile rule 2013-12-05 11:39:55 +00:00
Anatol Belski 122805100a removed warnings in newly implemented pcre range cehcks 2013-12-05 12:38:11 +01:00
krakjoe 33e88e0dad update cl 2013-12-05 11:24:56 +00:00
krakjoe 752aac61f3 ... 2013-12-05 11:20:40 +00:00
krakjoe f4f17d6e32 fix crash on startup errors 2013-12-05 11:20:16 +00:00
Anatol Belski 4d703a4225 added range check for pcre ini entries 2013-12-05 12:08:19 +01:00
Anatol Belski a0622d7c68 implemented %pd format for snprintf and spprintf
php_int_t var = 42;
php_printf("%pd", var);
2013-12-05 12:05:46 +01:00
krakjoe 56da409801 update cl 2013-12-05 08:18:20 +00:00
Anatol Belski 42b1222754 Merge branch 'master' into str_size_and_int64 2013-12-05 08:37:37 +01:00
krakjoe 11b3a5ec05 tests 2013-12-05 02:42:04 +00:00
krakjoe 3341e219c9 don't use emalloc there 2013-12-04 23:26:14 +00:00
Adam Harvey de3b9bc77c Renumber the comments in php_request_shutdown() to be in order.
What, me OCD?
2013-12-04 14:29:45 -08:00
Jakub Zelenka fbfae33e39 Add missing overflow checks 2013-12-04 19:01:39 +00:00
Andrey Hristov 0cb38a3d26 Merge branch 'master' of git.php.net:php-src
Conflicts:
	NEWS
2013-12-04 18:32:32 +02:00
Sara Golemon 9adfcea241 Use 'user@example.com' rather than 'user@company.com' in tests
Using some arbitrary 3rd party's domain name is clowny,
even if it never tries to send.
2013-12-04 07:51:43 -08:00
Michael Wallner ecf95a4cc5 BFN 2013-12-05 11:30:52 +01:00
Michael Wallner 44ff944b37 Merge branch 'dba'
* dba:
  fix bug #62490
  more test fixes
  fix test
  fix php_stream_copy_to_stream_ex usage
  add missing clean section
  remove test for already removed feature
2013-12-05 11:27:26 +01:00
Michael Wallner 5a420c8680 fix bug #62490
inifiles delete handler did not return false if the key was not found
2013-12-05 11:04:25 +01:00
Sara Golemon f0248bdce5 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Use 'user@example.com' rather than 'user@company.com' in tests
2013-12-04 07:50:45 -08:00
krakjoe 1fb67f1eda fix #36 add more info to conditional breakpoint output 2013-12-04 14:20:13 +00:00
Andrey Hristov 406d5a5ecc Merge branch 'PHP-5.6'
Conflicts:
	NEWS
	UPGRADING
2013-12-04 16:20:03 +02:00
Anatol Belski 7228ac190a fixed ext/bcmath 2013-12-04 15:06:32 +01:00
Anatol Belski 3142989a14 finer fixes for ext/opcache 2013-12-04 14:07:27 +01:00
Anatol Belski 3930766e79 basic fixes to ext/opcache 2013-12-04 12:04:07 +01:00
Andrey Hristov 97909ef4ef Merge branch 'PHP-5.5' into PHP-5.6 2013-12-04 12:39:11 +02:00
Anatol Belski 55023a87b0 Merge branch 'master' into str_size_and_int64 2013-12-04 09:10:43 +01:00
Sara Golemon e51ddf9dc8 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix php_module_startup() when loading more than one additional module
2013-12-03 18:21:40 -08:00
Sara Golemon df755deb45 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix php_module_startup() when loading more than one additional module
2013-12-03 18:21:12 -08:00
Adam Harvey 8f11f7f179 Merge branch 'PHP-5.6'
* PHP-5.6:
  Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
2013-12-03 14:54:24 -08:00
Adam Harvey 44697c115b Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Remove 128.0.0.0/16 and 191.255.0.0/16 from the reserved list.
2013-12-03 14:52:35 -08:00
Anatol Belski 72e7a63485 basic fixes for ext/ldap 2013-12-03 22:43:37 +01:00
Anatol Belski c14d14e0d6 fix uninitialized variable 2013-12-03 22:03:11 +01:00
Anatol Belski fbb87ace85 basic fixes to ext/snmp 2013-12-03 21:31:55 +01:00
Anatol Belski fd6e5766ce basic fixes for ext/pdo_pgsql 2013-12-03 18:21:06 +01:00
Michael Wallner f0c85fab45 more test fixes 2013-12-03 18:18:40 +01:00
Michael Wallner b0415856fd fix test 2013-12-03 17:55:26 +01:00
Michael Wallner 9e309a2d10 fix php_stream_copy_to_stream_ex usage 2013-12-03 17:55:18 +01:00
Michael Wallner a7f0465c0b add missing clean section 2013-12-03 17:07:40 +01:00
Michael Wallner f4912e3a96 remove test for already removed feature 2013-12-03 16:57:35 +01:00
Anatol Belski 8e11fa2251 basic fixes to ext/odbc 2013-12-03 16:54:15 +01:00
Bob Weinand 3ffb4aaf9b Fixed file opline num resolving 2013-12-03 16:10:57 +01:00
krakjoe 4a35c1d460 update cl 2013-12-03 12:27:22 +00:00
krakjoe acf76ae619 fix loading of zend_extensions from command line arguments 2013-12-03 12:26:19 +00:00
Bob Weinand 76f889569f Nearly finished opline num support patch 2013-12-03 12:31:25 +01:00
Anatol Belski 727d14b8dd basic fixes to ext/ftp 2013-12-03 12:09:12 +01:00
Anatol Belski b13e715581 basic fixes to ext/pdo_mysql 2013-12-03 11:44:18 +01:00
Anatol Belski 0ee45382cd basic fixes to ext/pdo_firebird 2013-12-03 11:18:12 +01:00
Anatol Belski 71be6bc5ec more fixes to ext/pdo and ext/pdo_pgsql 2013-12-03 10:52:55 +01:00
Sebastian Bergmann d1baf6c9d7 Leftover: Bump version to 5.7.0 2013-12-03 10:19:11 +01:00
Nikita Popov b3265e2108 Support gmp_remroot() on GMP 4.1 2013-12-03 10:19:10 +01:00
Anatol Belski e23b051be0 basic fixes to ext/pdo_pgsql 2013-12-03 09:53:22 +01:00
Anatol Belski 7193efebed basic fixes to ext/pdo_sqlite 2013-12-03 09:51:01 +01:00
Anatol Belski da7d62ea8a basic fixes for ext/pdo 2013-12-03 09:24:45 +01:00
Sebastian Bergmann 48cc47d55a Leftover: Bump version to 5.7.0 2013-12-03 07:42:37 +01:00
krakjoe 8fa376a028 break at image 2013-12-03 00:56:40 +00:00
krakjoe 54724e29cc update image 2013-12-03 00:56:16 +00:00
krakjoe 4d6d0d8f05 improve print conditional breaks 2013-12-03 00:43:05 +00:00
krakjoe 8f835060df export both types of conditional breakpoint properly 2013-12-03 00:35:20 +00:00
Anatol Belski 2fc14d515e some more fixes to ext/pgsql 2013-12-03 01:33:43 +01:00
krakjoe fd9026b948 extended conditional breakpoints 2013-12-03 00:15:33 +00:00
Bob Weinand 0a72ee087d Added deleting and printing 2013-12-02 21:56:25 +01:00
Anatol Belski f7df15ea53 basic fixes for ext/pgsql 2013-12-02 21:10:33 +01:00
Jakub Zelenka 8710929b78 Fix typo 2013-12-02 19:54:25 +00:00
Jakub Zelenka 1488acb304 Add digest data_len overflow checks and few other fixes 2013-12-02 19:50:23 +00:00
Nikita Popov a87233f98a Merge branch 'PHP-5.6' 2013-12-02 20:11:34 +01:00
Nikita Popov 00c74ccf69 Support gmp_remroot() on GMP 4.1 2013-12-02 20:11:06 +01:00
Bob Weinand 2d230254de Added note about const scalar exprs in UPGRADING file 2013-12-02 18:39:01 +01:00
Anatol Belski ce6945eb55 basic fixes to ext/shmop 2013-12-02 18:18:24 +01:00
Anatol Belski a68477f758 Merge remote-tracking branch 'origin/master' into str_size_and_int64 2013-12-02 17:48:31 +01:00
Michael Wallner c23a1f78b4 Merge branch 'PHP-5.6'
* PHP-5.6:
  BFN
  Fix bug #65196
2013-12-02 17:03:30 +01:00
Michael Wallner f254476f99 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  BFN
  Fix bug #65196
2013-12-02 17:02:13 +01:00
krakjoe 0e7118f666 update docs etc 2013-12-02 14:56:15 +00:00
krakjoe 6e7c1ed0c8 added ability to override sapi name 2013-12-02 14:45:41 +00:00
Michael Wallner 7cd702640d Fix Bug #64776 The XSLT extension is not thread safe. 2013-12-02 15:01:24 +01:00
krakjoe 9b4e855d72 cs 2013-12-02 13:43:21 +00:00
krakjoe fed41baf28 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-12-02 13:25:20 +00:00
krakjoe e05b4977c5 added set break [id] <on|off> 2013-12-02 13:19:13 +00:00
Michael Wallner df484b0008 Merge branch 'PHP-5.6'
* PHP-5.6:
  BFN
  fix bug #49634x
2013-12-02 12:19:03 +01:00
Michael Wallner 733259c211 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  BFN
  fix bug #49634x
2013-12-02 12:15:27 +01:00
Dmitry Stogov f8148a3905 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed tests
2013-12-02 12:05:49 +04:00
Dmitry Stogov 0f39089384 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed tests
2013-12-02 12:05:29 +04:00
Dmitry Stogov 86c806a36e Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed ability to build non-specialized GOTO VM
2013-12-02 11:03:57 +04:00
Dmitry Stogov 9447181d0c Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed ability to build non-specialized GOTO VM
2013-12-02 11:03:17 +04:00
Anatol Belski d7827068e8 fix the length var datatype 2013-12-01 23:17:47 +01:00
Anatol Belski 8f91e77245 Merge branch 'master' into str_size_and_int64 2013-12-01 23:10:01 +01:00
Jakub Zelenka 7e85b12b53 Merge branch 'str_size_and_int64' into str_size_and_int64_openssl
Conflicts:
	ext/openssl/openssl.c
2013-12-01 20:04:58 +00:00
Jakub Zelenka b34ce97417 add some overflow checks and use correct msg formatting in openssl 2013-12-01 19:53:45 +00:00
Bob Weinand 518519b8ed Separated opline address improvements from this branch 2013-12-01 19:05:30 +01:00
Felipe Pena e6970ade6d - Fix compiler warning 2013-12-01 15:03:39 -02:00
Felipe Pena 4dda2980ff - CS 2013-12-01 15:00:28 -02:00
Felipe Pena 9ca817eb0f - Fixed compiler warning 2013-12-01 14:57:11 -02:00
Bob Weinand 25f2d4eca1 Several fixes and cleanups on opline num support 2013-12-01 15:58:59 +01:00
krakjoe f6efce9f13 ws 2013-12-01 13:17:54 +00:00
krakjoe 01ed1f436c ... 2013-12-01 13:12:51 +00:00
krakjoe 800ec7836b init.d for redhat and derivatives 2013-12-01 12:48:43 +00:00
Nikita Popov 1acee05579 Merge branch 'PHP-5.6' 2013-12-01 13:48:09 +01:00
Nikita Popov b3546e64bd Merge branch 'PHP-5.5' into PHP-5.6 2013-12-01 13:45:22 +01:00
Anatol Belski 6b9396bd8e Merge branch 'master' into str_size_and_int64
Conflicts:
	ext/date/php_date.c
2013-12-01 12:31:48 +01:00
Anatol Belski 66a42402d9 more fixes for ext/mysql 2013-12-01 12:22:52 +01:00
krakjoe 723b721fb9 update version 2013-12-01 10:23:37 +00:00
krakjoe 083cce9162 tag correct version 2013-12-01 10:22:41 +00:00
krakjoe d76e24b2db fix windows build 2013-12-01 08:55:37 +00:00
Anatol Belski ae2103ba40 basic fixes for ext/mysql 2013-12-01 09:45:26 +01:00
krakjoe 2c216ec648 update version 2013-12-01 08:40:31 +00:00
krakjoe 7e528a36b6 tag v2.0 2013-12-01 08:38:33 +00:00
krakjoe cbc774723a add info memory 2013-12-01 08:34:17 +00:00
Anatol Belski eb922c6c9c more fixes for ext/mysqli 2013-11-30 21:51:21 +01:00
Anatol Belski d76d415f55 fix mysqlnd for bigint 2013-11-30 21:49:41 +01:00
krakjoe 8a826dc07b cs/ws 2013-11-30 17:29:33 +00:00
krakjoe 835446e632 support all colors and underline in java ui 2013-11-30 17:19:01 +00:00
Anatol Belski f3703d86f7 started to fix ext/mysqli 2013-11-30 15:58:57 +01:00
krakjoe df0091c445 phpdbg_rlog for logging while in remote mode (only) 2013-11-30 14:34:16 +00:00
Anatol Belski ef216c21fd started to fix ext/mysqlnd 2013-11-30 14:59:18 +01:00
Felipe Pena 841dddb3c2 Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6 2013-11-30 11:43:51 -02:00
Felipe Pena cb9000f15e Merge branch 'master' of git.php.net:/php-src 2013-11-30 11:41:23 -02:00
Felipe Pena 52611a2c7e Merge branch 'PHP-5.6'
* PHP-5.6:
  - Fixed bug #65923 (ext/socket assumes AI_V4MAPPED is defined)
2013-11-30 11:41:01 -02:00
Felipe Pena a2f478cd94 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  - Fixed bug #65923 (ext/socket assumes AI_V4MAPPED is defined)
2013-11-30 11:40:42 -02:00
Nikita Popov 508738251f Merge branch 'PHP-5.6' 2013-11-30 13:41:22 +01:00
Nikita Popov e2a8d7dc17 Merge branch 'PHP-5.5' into PHP-5.6 2013-11-30 13:40:17 +01:00
Anatol Belski 004d4630b4 basic fixes to ext/sqlite3 2013-11-30 12:39:09 +01:00
krakjoe 4fa2f01c4e add systray and logo 2013-11-30 07:27:11 +00:00
krakjoe 16edd155cb ... 2013-11-30 00:44:34 +00:00
krakjoe b03f1fdb3e update jar 2013-11-30 00:29:31 +00:00
krakjoe 8963bbe26a ... 2013-11-30 00:29:16 +00:00
krakjoe b6de073b00 ... 2013-11-30 00:25:05 +00:00
krakjoe af3d792c78 improvements to jui, use nonblocking i/o in stdout thread 2013-11-30 00:16:24 +00:00
Nikita Popov 2e0a960e97 Merge branch 'PHP-5.6' 2013-11-29 23:59:21 +01:00
ArunSK 2e6d830590 Fixed unused value compiler warning 2013-11-29 23:58:41 +01:00
Nikita Popov 065c8e77e2 Merge branch 'PHP-5.6' 2013-11-29 23:32:14 +01:00
Nikita Popov 66b0d17f04 Merge branch 'PHP-5.5' into PHP-5.6 2013-11-29 23:31:13 +01:00
krakjoe 53eb91d05e update image 2013-11-29 22:09:26 +00:00
Anatol Belski 628135641d basic fixes ext/xmlrpc 2013-11-29 23:06:40 +01:00
krakjoe c94ae50063 updates for java app ... delicious ... 2013-11-29 22:03:08 +00:00
Anatol Belski 22779fa66b fixed ext/tokenizer 2013-11-29 22:54:58 +01:00
Anatol Belski 9c16a4b96d fixed ext/tidy 2013-11-29 22:48:55 +01:00
krakjoe 8c28d94a4e update images 2013-11-29 20:19:08 +00:00
krakjoe 195c518dd1 ... 2013-11-29 20:03:50 +00:00
Anatol Belski f119cd8f2d basic fixes to ext/sockets 2013-11-29 21:02:36 +01:00
krakjoe 31c4861f67 correction 2013-11-29 19:57:10 +00:00
krakjoe 4b6c8adea0 remote tutorial 2013-11-29 19:54:55 +00:00
krakjoe de84aba976 improve -l, add -a 2013-11-29 19:42:41 +00:00
Anatol Belski e094c64b67 finer fixes to ext/soap 2013-11-29 20:26:07 +01:00
krakjoe 41f93d4c15 allow setting both ports from command line: 2013-11-29 18:55:15 +00:00
Anatol Belski 9a834807bc fixed compilation after merging master 2013-11-29 17:12:35 +01:00
Anatol Belski d8fa7f4990 Merge branch 'str_size_and_int64' of git.php.net:php-src into str_size_and_int64 2013-11-29 17:00:24 +01:00
Anatol Belski 40f9958c08 Merge branch 'master' into str_size_and_int64
Conflicts:
	Zend/zend_hash.c
	ext/gmp/gmp.c
	ext/pcre/php_pcre.c
2013-11-29 17:00:11 +01:00
Anatol Belski 132bd2130d basic fix for ext/soap 2013-11-29 16:55:00 +01:00
Anatol Belski eabdd0e4a5 fixed ext/mcrypt 2013-11-29 16:12:36 +01:00
krakjoe c56a25b50a update java ui 2013-11-29 14:50:44 +00:00
krakjoe 76bb4bbe00 update image 2013-11-29 13:22:40 +00:00
krakjoe 22fd520fb5 update ui
echo checkbox
	move input to bottom like a normal console
2013-11-29 13:20:26 +00:00
Anatol Belski 23019318b1 finer fixes for ext/json 2013-11-29 13:00:29 +01:00
Anatol Belski 3ffecac916 basic fixes for ext/json 2013-11-29 11:47:48 +01:00
Bob Weinand 2e7c695c05 I give up 2013-11-29 11:38:28 +01:00
krakjoe e1af08c4e7 ... 2013-11-29 10:22:20 +00:00
krakjoe 9b498765ab ... 2013-11-29 10:22:02 +00:00
krakjoe 2885406590 update image with colours :) 2013-11-29 09:46:20 +00:00
krakjoe 921c73aeda fix layout 2013-11-29 09:44:25 +00:00
krakjoe 167f6e0c25 ... 2013-11-29 09:38:07 +00:00
krakjoe 3495e78274 ... 2013-11-29 09:38:00 +00:00
krakjoe 216e3668d6 ... 2013-11-29 09:35:33 +00:00
Anatol Belski e6bf5ffeba fixed ext/gmp 2013-11-29 10:19:40 +01:00
krakjoe bd49a0f144 ... 2013-11-29 09:19:08 +00:00
krakjoe 5f0a0f12e1 ... 2013-11-29 09:16:07 +00:00
krakjoe 883f34f487 add ANSI colour support to output pane 2013-11-29 08:57:29 +00:00
Dmitry Stogov f65e652f9f Merge branch 'PHP-5.6'
* PHP-5.6:
  Added validation of class names in the autoload process
2013-11-29 12:55:38 +04:00
Dmitry Stogov 2cb0e1e4c1 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Added validation of class names in the autoload process

Conflicts:
	NEWS
2013-11-29 12:55:11 +04:00
Anatol Belski 9f9e691c28 fixed ext/gettext 2013-11-29 09:47:00 +01:00
Anatol Belski 3659dcd98c further fixes for ext/gd 2013-11-29 09:18:13 +01:00
Anatol Belski 51d78c2533 basic fixes for ext/gd 2013-11-29 08:53:32 +01:00
krakjoe f822764129 always unset unclean_shutdown 2013-11-29 02:42:34 +00:00
krakjoe 734fe5508a update java example 2013-11-29 01:48:21 +00:00
Nikita Popov 0eb519de66 Merge branch 'PHP-5.6' 2013-11-29 00:10:13 +01:00
Nikita Popov f54f308f71 Clean up GMP arginfos
Removed duplicate arginfos, specified number of required args
everywhere and removed weird pass-by-ref arguments.
2013-11-29 00:05:28 +01:00
Nikita Popov 6d38090c8d Add gmp_root() and gmp_rootrem() functions 2013-11-29 00:01:59 +01:00
Nikita Popov 1c8cbe4b4e Use class handlers for GMP serialization
A bit faster and less boilerplate
2013-11-29 00:01:59 +01:00
Nikita Popov 8860758a74 Remove duplicate / commented code in GMP 2013-11-29 00:01:59 +01:00
krakjoe 8a63a99d2e tidy 2013-11-28 22:58:39 +00:00
krakjoe f342ca88fa java example stuff 2013-11-28 22:55:07 +00:00
Anatol Belski 57db68e03d fixed ext/fileinfo
XXX update libmagic.patch
2013-11-28 23:44:24 +01:00
krakjoe 371ccf8ab9 remove windows support for remote console, never gonna happen 2013-11-28 22:06:27 +00:00
Bob Weinand 24585722b1 Small bug fix on error 2013-11-28 22:03:59 +01:00
Dmitry Stogov 36bd7296c8 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src:
  Fixed bug #65199 (Wrong Day of Week) and fixed bug #63391 (Incorrect/inconsistent day of week prior to the year 1600)
  Marking those two as XFAIL for now.
  Fixed a few DST changeover issues.
  Move add/sub to timelib.
  Fix backwards transition diffs.
  Split up tests into their different categories.
  Group those tests a bit better, as some of the bd ones wanted a "ST" feature that doesn't exist yet.
  Fixed forward transitions in diffs.
  Always reset those parameters.
  Fixed "Forward Transition" construction of DateTime objects.
2013-11-29 01:00:14 +04:00
Dmitry Stogov f92eba241e Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Fixed bug #65199 (Wrong Day of Week) and fixed bug #63391 (Incorrect/inconsistent day of week prior to the year 1600)
  Marking those two as XFAIL for now.
  Fixed a few DST changeover issues.
  Move add/sub to timelib.
  Fix backwards transition diffs.
  Split up tests into their different categories.
  Group those tests a bit better, as some of the bd ones wanted a "ST" feature that doesn't exist yet.
  Fixed forward transitions in diffs.
  Always reset those parameters.
  Fixed "Forward Transition" construction of DateTime objects.
2013-11-29 00:59:47 +04:00
Dmitry Stogov 77cdda452d Merge branch 'PHP-5.6'
* PHP-5.6:
  Avoid interned hash key duplication and hash key length recaclulation
2013-11-29 00:59:26 +04:00
Dmitry Stogov 6c2a806820 Avoid interned hash key duplication and hash key length recaclulation 2013-11-29 00:57:49 +04:00
Bob Weinand d7f6e88493 First semi-working version of oplines 2013-11-28 21:36:45 +01:00
Anatol Belski ef54a95b71 fixed ext/wddx 2013-11-28 20:00:27 +01:00
Anatol Belski 262fca3a39 fixed ext/xml 2013-11-28 19:46:08 +01:00
krakjoe 55f210c83b windows ... 2013-11-28 18:22:30 +00:00
Anatol Belski d9a036cc30 fixed ext/xsl 2013-11-28 19:18:38 +01:00
Anatol Belski 9e5c10e487 fixed ext/zip 2013-11-28 19:02:34 +01:00
krakjoe c464b011de windows fixes 2013-11-28 17:30:27 +00:00
krakjoe 022c621f96 windows fixes 2013-11-28 17:21:34 +00:00
krakjoe 26e1d57e8c add set colors command to assist remote console 2013-11-28 17:02:38 +00:00
Anatol Belski d8fbc23002 Merge remote-tracking branch 'origin/master' into str_size_and_int64 2013-11-28 17:44:47 +01:00
Anatol Belski 91e6fb75d5 fix after automerge 2013-11-28 17:44:05 +01:00
krakjoe b2af85a445 more on remote mode
some logging info to stderr
	only quit on sigint in remote mode
2013-11-28 16:41:21 +00:00
Derick Rethans 38574614c5 Merge branch 'PHP-5.6' 2013-11-28 16:33:23 +00:00
Derick Rethans c3ac86c569 Merge branch 'PHP-5.5' into PHP-5.6 2013-11-28 16:33:17 +00:00
Anatol Belski 5ced3db971 Merge branch 'master' into str_size_and_int64
Conflicts:
	Zend/zend.h
	Zend/zend_hash.c
	Zend/zend_hash.h
	Zend/zend_language_parser.y
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
2013-11-28 17:27:59 +01:00
Anatol Belski a7862de2db fixed ext/filter 2013-11-28 17:16:25 +01:00
krakjoe daeb5e2963 resolve #30 #31 2013-11-28 15:51:11 +00:00
krakjoe 68776e376d work on remote mode 2013-11-28 14:54:06 +00:00
Derick Rethans cf88fc857e Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2013-11-28 14:46:21 +00:00
Derick Rethans 0d65cd50dd Merge branch 'master' of git.php.net:php-src 2013-11-28 14:45:56 +00:00
Derick Rethans b6ef87f803 Merge branch 'PHP-5.6' 2013-11-28 14:45:38 +00:00
Derick Rethans 3bf71b42b1 Merge branch 'PHP-5.5' into PHP-5.6 2013-11-28 14:45:26 +00:00
Dmitry Stogov a1193b23b6 Merge branch 'PHP-5.6'
* PHP-5.6:
  Removed unused "pHashFunction" argument in _zend_hash_init() and family (must be 99% source compatible)
2013-11-28 18:42:57 +04:00
Dmitry Stogov 5d25762646 Removed unused "pHashFunction" argument in _zend_hash_init() and family (must be 99% source compatible) 2013-11-28 18:40:46 +04:00
Anatol Belski fd7d31973a basic fixes for ext/exif 2013-11-28 14:36:20 +01:00
Dmitry Stogov 5d6b20f66b Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src:
  Updated NEWS for Constant Scalar Exprs RFC
  Moved arrays again to "static_scalar:" & little cleanup
  Renaming
  Constant expressions refactoring
  Removed operations on constant arrays. They make no sense as constants are not allowed to be arrays. And as just properties are allowed to; no problem, we still don't need operations on any constant array.
  Added a few more operators
  Whitespace fix
  converted several switches to ifs and made more opcache friendly
  Fatal error about self referencing constants fixed
  Fixed mem leaks, added tests and ternary operator
  Working commit for constant scalar expressions (with constants). Tests will follow.
2013-11-28 17:04:54 +04:00
Dmitry Stogov 609efa2623 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Updated NEWS for Constant Scalar Exprs RFC
  Moved arrays again to "static_scalar:" & little cleanup
  Renaming
  Constant expressions refactoring
  Removed operations on constant arrays. They make no sense as constants are not allowed to be arrays. And as just properties are allowed to; no problem, we still don't need operations on any constant array.
  Added a few more operators
  Whitespace fix
  converted several switches to ifs and made more opcache friendly
  Fatal error about self referencing constants fixed
  Fixed mem leaks, added tests and ternary operator
  Working commit for constant scalar expressions (with constants). Tests will follow.
2013-11-28 17:03:59 +04:00
Dmitry Stogov 7fa9032d0b Merge branch 'PHP-5.6'
* PHP-5.6:
  Some rare deprecated cases replaced by ZEND_ASSERT() (some extensions might need to be fixed)
  Removed duplicated hash function implementation (100% source compatible)
2013-11-28 17:03:28 +04:00
Dmitry Stogov b63b81815f Some rare deprecated cases replaced by ZEND_ASSERT() (some extensions might need to be fixed) 2013-11-28 17:02:01 +04:00
Dmitry Stogov aa427a10d4 Removed duplicated hash function implementation (100% source compatible) 2013-11-28 17:01:10 +04:00
Anatol Belski 4e2ddbc397 fixed ext/enchant 2013-11-28 13:59:55 +01:00
Bob Weinand be5b98ef0d Merge branch 'PHP-5.6' 2013-11-28 13:53:00 +01:00
Bob Weinand 0652edfed3 Updated NEWS for Constant Scalar Exprs RFC 2013-11-28 13:46:51 +01:00
Anatol Belski 1e2cc15845 fixed ext/curl 2013-11-28 13:45:09 +01:00
Bob Weinand d36cf90291 Merge branch 'const_scalar_exprs' into PHP-5.6
Conflicts:
	Zend/zend_extensions.h
2013-11-28 13:41:42 +01:00
krakjoe f80a09ede7 add option in help for remote console 2013-11-28 09:36:42 +00:00
krakjoe 8d1594d01e Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-28 09:31:39 +00:00
krakjoe 6bb080a7e1 made server persist, support disconnect and reconnect 2013-11-28 09:31:06 +00:00
Anatol Belski 46448539b0 fixed ext/ctype 2013-11-28 09:53:00 +01:00
Anatol Belski 3f7522a652 Merge branch 'master' into str_size_and_int64 2013-11-28 09:29:12 +01:00
Anatol Belski de453dbef6 reverted a couple of things in ext/phar for now, but all tests pass now 2013-11-28 09:23:02 +01:00
Dmitry Stogov 9d060e8d48 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src:
  Fixed bug #53879 (DateTime::createFromFormat() fails to parse cookie expiration date)
2013-11-28 11:46:28 +04:00
Dmitry Stogov 98f3c410d9 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Fixed bug #53879 (DateTime::createFromFormat() fails to parse cookie expiration date)
2013-11-28 11:46:11 +04:00
Dmitry Stogov fe451e9a72 Merge branch 'PHP-5.6'
* PHP-5.6:
  Don't check argument types for internal functions without type hinting
2013-11-28 11:45:47 +04:00
Dmitry Stogov 57c1335fec Don't check argument types for internal functions without type hinting 2013-11-28 11:44:14 +04:00
Felipe Pena 7c972480ad - Fixed compiler warnings + CS 2013-11-27 20:59:02 -02:00
Anatol Belski d135198559 next portion of fixes for ext/phar 2013-11-27 23:35:42 +01:00
Anatol Belski 2c3cc2e107 fixed the rdev stat array member again for streams 2013-11-27 23:34:27 +01:00
Derick Rethans e7a6d0b163 Merge branch 'PHP-5.6' 2013-11-27 22:01:16 +00:00
Derick Rethans d3a12317cf Merge branch 'PHP-5.5' into PHP-5.6 2013-11-27 22:01:09 +00:00
krakjoe 50da1ffdb6 example java app for testingz 2013-11-27 19:31:55 +00:00
krakjoe b43377dd4a java example 2013-11-27 19:23:34 +00:00
Anatol Belski ef52220617 basic fixes for ext/phar 2013-11-27 20:08:34 +01:00
krakjoe db12998998 fix remote mode when readline is enabled 2013-11-27 17:32:15 +00:00
Dmitry Stogov 45d399b96e Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed tests
2013-11-27 21:04:23 +04:00
Dmitry Stogov fcb98cbce8 Fixed tests 2013-11-27 21:04:00 +04:00
krakjoe 87b556e3a1 simple tcp interface for phpdbg 2013-11-27 16:49:51 +00:00
Dmitry Stogov fca64efd62 Merge branch 'PHP-5.6'
* PHP-5.6:
  Removed deprecated AI_SET_PTR()s
2013-11-27 20:32:21 +04:00
Dmitry Stogov 43e3933fa3 Removed deprecated AI_SET_PTR()s 2013-11-27 20:30:35 +04:00
Anatol Belski 0fd48b2f48 final ext/session fixes 2013-11-27 15:33:40 +01:00
krakjoe 2299584963 fix find breakpoint function 2013-11-27 13:32:38 +00:00
krakjoe 0fad595a1f housework 2013-11-27 13:28:53 +00:00
krakjoe c8145da0b2 reset hit counters implicitly on run 2013-11-27 13:15:52 +00:00
krakjoe 0deced5a7a more improvements to breakpoint api
separate printing logic, always return base
add hit count to breakpoints, displayed on hit
2013-11-27 13:01:57 +00:00
Anatol Belski bec270ffc8 fix function definition 2013-11-27 04:58:57 -08:00
Anatol Belski b9c19f5d74 first shot for ext/calendar
At the first glance the extension could be fixed for bigger timestamps,
but that's not the goal right now. One test fail yet on win 64
2013-11-27 13:35:26 +01:00
krakjoe 4216cb2840 make conditional breakpoint structure consistent with others 2013-11-27 12:15:37 +00:00
Dmitry Stogov 5e8bb519f0 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src:
  NEWS
  Fixed bug #66060 (Heap buffer over-read in DateInterval)
2013-11-27 14:58:23 +04:00
Dmitry Stogov bc68ab8b57 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  NEWS
  Fixed bug #66060 (Heap buffer over-read in DateInterval)
2013-11-27 14:58:08 +04:00
Dmitry Stogov a3cb536d24 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #65969 (Chain assignment with T_LIST failure)
2013-11-27 14:56:48 +04:00
Dmitry Stogov a908afeaa5 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #65969 (Chain assignment with T_LIST failure)

Conflicts:
	NEWS
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
2013-11-27 14:56:18 +04:00
Remi Collet 42a35c9b8b Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  Fixed bug #66060 (Heap buffer over-read in DateInterval)
2013-11-27 11:16:18 +01:00
Remi Collet 56909e7d9d Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  Fixed bug #66060 (Heap buffer over-read in DateInterval)
2013-11-27 11:15:58 +01:00
krakjoe 37b3a21cf4 improve api 2013-11-27 09:55:16 +00:00
Anatol Belski 8115844674 basic fixes to ext/hash 2013-11-27 10:33:08 +01:00
Julien Pauli e9f2de918d Merge branch 'PHP-5.6'
* PHP-5.6:
  5.5.8-dev now
2013-11-27 10:33:05 +01:00
Julien Pauli 1daa1ab4d1 Merge branch 'PHP-5.5' into PHP-5.6 2013-11-27 10:32:05 +01:00
Stanislav Malyshev 3baad45b21 Merge branch 'PHP-5.6'
* PHP-5.6:
2013-11-27 00:19:30 -08:00
Stanislav Malyshev 22ad8e1b1a Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  5.4.24-dev now
  merge fix
  add test
  Fix for Bug #66141 (mysqlnd quote function is wrong with NO_BACKSLASH_ESCAPES after failed query)
2013-11-27 00:18:54 -08:00
Stanislav Malyshev b64ac1faa3 Merge branch 'PHP-5.5'
* PHP-5.5:
  5.4.24-dev now
2013-11-27 00:15:03 -08:00
George Wang 9960ecc5cd update to LSAPI 6.6 2013-11-26 18:53:35 -05:00
krakjoe 3df8e29b0d many improvements in breakpoints
make file breakpoints faster
make exports happen in correct order
make deletes simpler, set flags correctly
fix info vars when no scope is set
2013-11-26 22:20:52 +00:00
Anatol Belski 0336763311 fixed ext/xmlwriter 2013-11-26 22:47:36 +01:00
Anatol Belski def8981190 fixed ext/xmlwriter 2013-11-26 22:36:35 +01:00
Anatol Belski 74f9e6309c fixed ext/dom for int64 branch 2013-11-26 22:25:22 +01:00
Anatol Belski 1d2150ca4f fixed some warning in ext/openssl 2013-11-26 21:36:41 +01:00
Anatol Belski 358fae9347 more param parsing fixes, overseen stuff 2013-11-26 21:13:14 +01:00
Anatol Belski 54797a9b15 fixed intl calendar param parsing 2013-11-26 21:13:13 +01:00
Andrey Hristov dd7c33d0c9 Merge branch 'master' of git.php.net:php-src 2013-11-26 20:10:17 +02:00
Anatol Belski 4c96b94873 Merge branch 'master' into str_size_and_int64 2013-11-26 19:09:31 +01:00
Anatol Belski 943ba2bf07 first x64 fixes for ext/openssl 2013-11-26 19:05:35 +01:00
Dmitry Stogov 0d61202427 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed opcahce_reset() crash when opcache.protect_memory is set
2013-11-26 21:59:19 +04:00
Dmitry Stogov 834eaae52d Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed opcahce_reset() crash when opcache.protect_memory is set
2013-11-26 21:59:02 +04:00
Dmitry Stogov 19f0e188f2 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:php-src:
  Fixed a wrong test
2013-11-26 21:44:32 +04:00
Dmitry Stogov ccd1babbfc Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Fixed a wrong test
2013-11-26 21:43:51 +04:00
Dmitry Stogov bbdcbbdba5 Merge branch 'PHP-5.6'
* PHP-5.6:
  Added an optimization of class constants and constant calls to some internal functions
  Added an optimization of class constants and constant calls to some internal functions

Conflicts:
	NEWS
2013-11-26 21:43:19 +04:00
Dmitry Stogov ee3c7b70c3 Added an optimization of class constants and constant calls to some internal functions 2013-11-26 21:38:40 +04:00
Andrey Hristov 9c036b13f9 Merge branch 'PHP-5.5' 2013-11-26 19:37:43 +02:00
Dmitry Stogov f000624864 Added an optimization of class constants and constant calls to some internal functions 2013-11-26 21:37:31 +04:00
Dmitry Stogov 1d65e8f135 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #66176 (Invalid constant substitution)
  Fixed bug #66176 (Invalid constant substitution)
2013-11-26 21:03:34 +04:00
Dmitry Stogov e7132597a6 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #66176 (Invalid constant substitution)
  Fixed bug #66176 (Invalid constant substitution)
2013-11-26 21:01:01 +04:00
Julien Pauli 8b83b48e98 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed a wrong test
2013-11-26 17:44:52 +01:00
Julien Pauli aa33da6a51 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed a wrong test
2013-11-26 17:43:45 +01:00
Anatol Belski e5998bbda2 correct error datatype 2013-11-26 17:36:34 +01:00
Anatol Belski d508a094ae fixed 32 bit unsigned to int64 casts 2013-11-26 17:35:25 +01:00
krakjoe f8e7685975 fix #28 2013-11-26 16:02:39 +00:00
krakjoe 969e659c4a Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-26 16:00:28 +00:00
krakjoe 6d95449e0a fix #27 2013-11-26 15:58:27 +00:00
Dmitry Stogov 34a55790f2 Merge branch 'PHP-5.6'
* PHP-5.6:
  Revert NEWS
  Fixed bug #66176 (Invalid constant substitution)
2013-11-26 17:49:38 +04:00
Dmitry Stogov 52630e3ced Revert NEWS 2013-11-26 17:48:59 +04:00
Dmitry Stogov 0999d85049 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #66176 (Invalid constant substitution)

Conflicts:
	NEWS
2013-11-26 17:48:11 +04:00
Anatol Belski f88a3e7fb9 first shot fixing ext/com_dotnet 2013-11-26 12:43:58 +01:00
Bob Weinand 6ba73338dd Enormous whitespace fix 2013-11-26 11:02:58 +01:00
Anatol Belski e2f2a3fcb5 Merge branch 'master' into str_size_and_int64 2013-11-26 10:59:55 +01:00
Anatol Belski 7e856fb09b fixed ext/bz2 2013-11-26 10:54:36 +01:00
Bob Weinand 9663ef0c1c ZEND_STRS - 1 => PHPDBG_STRL 2013-11-26 09:26:13 +01:00
Bob Weinand 485966252a Export conditional breaks 2013-11-26 09:21:04 +01:00
Dmitry Stogov 854c9abcd4 Merge branch 'PHP-5.6'
* PHP-5.6:
  Added test
2013-11-26 12:14:22 +04:00
Dmitry Stogov 8fdc973afa Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Added test
2013-11-26 12:14:12 +04:00
krakjoe bc7df607ab fix windows build
build shared on windows
2013-11-26 07:53:08 +00:00
Dmitry Stogov b3ce714cbf Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed bug #65559 (Opcache: cache not cleared if changes occur while running)
2013-11-26 11:37:05 +04:00
Dmitry Stogov 621f83e35c Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed bug #65559 (Opcache: cache not cleared if changes occur while running)
  bring the news

Conflicts:
	NEWS
2013-11-26 11:36:23 +04:00
krakjoe 2942caff29 ws 2013-11-26 07:11:34 +00:00
krakjoe feaec0ec73 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-25 23:03:52 +00:00
krakjoe 87a29a96aa nope 2013-11-25 23:02:54 +00:00
Bob Weinand b5b5bba492 Merge branch 'master' of https://github.com/krakjoe/phpdbg
Conflicts:
	phpdbg.c
2013-11-25 23:47:21 +01:00
Bob Weinand 02ae3f8de1 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-25 23:45:55 +01:00
Bob Weinand 4e6a8eeffa Breakpoints are now persistent over cleans 2013-11-25 23:38:43 +01:00
krakjoe 017beb002b remove comment 2013-11-25 22:20:26 +00:00
krakjoe 01181d194f use tsrm_shutdown 2013-11-25 22:19:21 +00:00
Felipe Pena bd87039a91 - Rename command to "set break" 2013-11-25 19:46:06 -02:00
Felipe Pena d50e2546c7 - Added command "set breakpoint <on|off>" 2013-11-25 19:39:17 -02:00
Anatol Belski a45082e78d fixed ext/intl 2013-11-25 21:59:09 +01:00
Bob Weinand 2be5a1e3da Enable backwards reading in list command 2013-11-25 20:33:52 +01:00
Andrey Hristov 36a3011613 Merge branch 'PHP-5.5' 2013-11-25 21:33:14 +02:00
krakjoe 6932eb76e3 correction in help 2013-11-25 18:39:27 +00:00
krakjoe 754fe82216 export opcode breakpoints 2013-11-25 18:27:58 +00:00
krakjoe ba37fd24bc export method breakpoints 2013-11-25 18:16:31 +00:00
krakjoe 3e14ff7cee symbol breakpoint export 2013-11-25 18:03:38 +00:00
krakjoe 7ac64cdf46 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-25 17:58:43 +00:00
krakjoe 19b1f7b5f9 ... 2013-11-25 17:58:36 +00:00
Bob Weinand be8adbb231 Fix segfault in source command 2013-11-25 18:58:03 +01:00
krakjoe 781bd90de3 swap PROMPT for phpdbg_get_prompt in help 2013-11-25 17:43:49 +00:00
krakjoe a947c890a0 add source export functionality, only files working, buggy source 2013-11-25 17:41:09 +00:00
Anatol Belski 8e50280163 updated datatypes in apache handler globals 2013-11-25 18:06:09 +01:00
krakjoe 3d6a4cbc63 consistent ordering 2013-11-25 16:43:23 +00:00
krakjoe 5295833b75 ... 2013-11-25 16:41:33 +00:00
krakjoe be6fbb07bb update changelog 2013-11-25 16:39:53 +00:00
krakjoe feabdfcf3f Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-25 16:39:24 +00:00
krakjoe 3078834098 add source command 2013-11-25 16:39:14 +00:00
Bob Weinand eac26190aa Support also multiple directories in additional ini scan dir 2013-11-25 17:15:51 +01:00
Anatol Belski 0938a6266a fixes so file_get_contents() works again, and some more 2013-11-25 16:21:14 +01:00
Bob Weinand 4aab420c5f .phpdbginit also possible in ini dirs 2013-11-25 13:19:01 +01:00
krakjoe 36c09510fb ... 2013-11-25 10:25:42 +00:00
krakjoe 905911b0b6 ... 2013-11-25 10:24:19 +00:00
krakjoe 6eabb69064 add session image 2013-11-25 10:20:00 +00:00
krakjoe 0f8c4630f2 consistent in ___ for info/print 2013-11-25 10:17:57 +00:00
Dmitry Stogov 704b24d048 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fixed compatibility with old PHP versions
  Fixed bug #65915 (Inconsistent results with require return value)
2013-11-25 14:12:11 +04:00
Dmitry Stogov b3c2c2bcb1 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed compatibility with old PHP versions
  Fixed bug #65915 (Inconsistent results with require return value)

Conflicts:
	NEWS
2013-11-25 14:11:45 +04:00
Anatol Belski 923518fab8 fix erroneous paste in 2013-11-25 07:39:37 +01:00
Anatol Belski 5300caade1 Merge remote-tracking branch 'origin/master' into str_size_and_int64 2013-11-25 00:46:03 +01:00
Anatol Belski c6adc039a1 more datatype fixes 2013-11-25 00:44:33 +01:00
Anatol Belski a218f8f3a4 ZEND_INT_FMT and some more for ext/standard 2013-11-25 00:43:05 +01:00
Bob Weinand 2318883446 a prompt with an % == nice segfault 2013-11-24 22:45:50 +01:00
Bob Weinand f81a621f6f Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-24 22:37:16 +01:00
Bob Weinand cc51537e5e Do not mix long and int 2013-11-24 22:36:39 +01:00
krakjoe fbfb216966 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-24 21:34:38 +00:00
krakjoe 99f32e845e change # for J/L 2013-11-24 21:34:25 +00:00
Bob Weinand ce05e41c14 Fixed backtrace class<->method order 2013-11-24 22:30:48 +01:00
Anatol Belski 3198533e92 ZEND_INT_FMT again 2013-11-24 22:28:58 +01:00
Anatol Belski d8c7d69543 printf int format fixes 2013-11-24 22:10:57 +01:00
krakjoe c41ef19c3b compiler warning 2013-11-24 21:07:53 +00:00
krakjoe be2f097b63 remove annoying blinking 2013-11-24 21:04:52 +00:00
Jakub Zelenka 215811e3fd fix openssl (testing required) 2013-11-24 21:03:55 +00:00
krakjoe e0c4922635 blink/underline 2013-11-24 20:59:22 +00:00
krakjoe 4d735404cf add black 2013-11-24 20:52:39 +00:00
krakjoe e8a7a46faf spelling correction 2013-11-24 20:30:28 +00:00
krakjoe 873ce08d6b add element help for set color command 2013-11-24 20:20:23 +00:00
krakjoe beea71bd25 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-24 20:16:55 +00:00
krakjoe 5596b2e716 example colour output 2013-11-24 20:16:46 +00:00
Felipe Pena ae7d408acc - Update changelog 2013-11-24 18:15:27 -02:00
Felipe Pena d21e7f5aa0 - CS 2013-11-24 18:14:33 -02:00
Felipe Pena 70cf09bf5b Merge branch 'master' of github.com:krakjoe/phpdbg 2013-11-24 18:12:06 -02:00
Felipe Pena 63e53c8ca8 - Added yellow color 2013-11-24 18:11:54 -02:00
Felipe Pena ef7841fb09 Merge branch 'master' of github.com:krakjoe/phpdbg 2013-11-24 18:01:26 -02:00
Felipe Pena 7371142ca6 - Fix memory leak on exit 2013-11-24 18:01:14 -02:00
krakjoe de61c0c28a Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-24 20:01:10 +00:00
krakjoe d2e634c1bc userland api for prompt/color commands 2013-11-24 20:00:56 +00:00
krakjoe e62450725c use lowercase alias 2013-11-24 19:47:28 +00:00
Felipe Pena fb88d79cfb - Use macro here 2013-11-24 17:41:00 -02:00
krakjoe c122a3921c correction 2013-11-24 19:35:26 +00:00
krakjoe ddcfa42f15 get good control over colors and prompt 2013-11-24 19:34:18 +00:00
Anatol Belski 08bbd2b510 fixed ini and functions in assert.c 2013-11-24 19:56:32 +01:00
Anatol Belski 9cc9a10efd one more walk through in Zend, fixed (or broken) things being overseen 2013-11-24 18:55:26 +01:00
krakjoe c85f247eac make api function and format structure for color management 2013-11-24 17:50:22 +00:00
Anatol Belski cbf40edf06 fixed range check 2013-11-24 18:47:03 +01:00
Felipe Pena bb134a4059 - Missing return 2013-11-24 15:11:15 -02:00
Felipe Pena 5b89e181aa - Added more colors 2013-11-24 15:09:41 -02:00
Felipe Pena 8589c0af91 - Initial work on setting color to prompt 2013-11-24 15:00:30 -02:00
Felipe Pena bfccc292a6 - Fix checking 2013-11-24 13:51:29 -02:00
Felipe Pena 19a923de46 - Keep the color 2013-11-24 13:49:30 -02:00
krakjoe c72c2687da ... 2013-11-24 15:26:02 +00:00
krakjoe e99fd22866 move oplog command to set commands
add help for set commands
move set down in the list of prompt commands
2013-11-24 15:24:12 +00:00
Anatol Belski a73c8812a1 one more walk through in Zend, fixed things being overseen 2013-11-24 16:06:47 +01:00
Felipe Pena c7ef093095 - CS 2013-11-24 12:57:53 -02:00
Felipe Pena 900bc9104c - Oppss, forgot to add new files 2013-11-24 12:56:59 -02:00
Felipe Pena 795e12b85e - Added "set prompt" command 2013-11-24 12:54:14 -02:00
Felipe Pena 97f733e60d - Moved information about breakpoints to "info break" 2013-11-24 11:36:29 -02:00
Bob Weinand e10bfd3b79 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-24 13:27:38 +01:00
Bob Weinand 2800af6e47 Pssst, compiler! 2013-11-24 13:27:22 +01:00
krakjoe 4eb63d996d Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-24 12:18:00 +00:00
krakjoe 682164ae99 fix windows build warning 2013-11-24 12:17:51 +00:00
Bob Weinand fcdae5867f Added opcode break deleting 2013-11-24 13:14:53 +01:00
krakjoe d9c94663c1 update changelog 2013-11-24 12:09:03 +00:00
krakjoe 3d168401ea Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-24 12:07:06 +00:00
krakjoe 72ffef13a1 help for delete breakpoint
remove redundant decl
2013-11-24 12:06:45 +00:00
Bob Weinand 81eaf1fe08 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-24 13:03:31 +01:00
Bob Weinand e8aab62d4d Prevent segfault when no execution context set with "b <num>" 2013-11-24 13:03:00 +01:00
Felipe Pena dfbde3de5e Merge branch 'master' of github.com:krakjoe/phpdbg 2013-11-24 10:02:37 -02:00
Felipe Pena 94cc258715 - Fixed format string according to data type 2013-11-24 10:02:23 -02:00
Felipe Pena f4db0669d0 - Passing strlen to phpdbg_set_breakpoint_symbol 2013-11-24 10:00:12 -02:00
Bob Weinand 7c51efd473 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-24 12:58:19 +01:00
Bob Weinand 2b5c929153 Add breakpoint deleting 2013-11-24 12:58:08 +01:00
Felipe Pena 46c899ba30 - Moved conditional bp checking 2013-11-24 09:45:05 -02:00
Felipe Pena 90ff693d62 - Added print information about opcode breakpoint 2013-11-24 09:43:05 -02:00
Felipe Pena 089bf5e112 - Missing cleaning for opcode bp 2013-11-24 09:25:08 -02:00
Felipe Pena 89d5a3f8b4 Merge branch 'master' of github.com:krakjoe/phpdbg 2013-11-24 08:17:22 -02:00
Felipe Pena 0edbf74d4e - Update 2013-11-24 08:17:07 -02:00
krakjoe abef3fccc2 typo
set last command/param more carefully
2013-11-24 07:37:54 +00:00
krakjoe 6e8eeea3bc add memory usage info to print 2013-11-24 07:28:54 +00:00
krakjoe b80baeb25e add help for break op command 2013-11-24 07:01:50 +00:00
Felipe Pena c1e140d087 - Fix data type 2013-11-23 23:49:48 -02:00
Felipe Pena f4f6c8f517 - Added gcc attribute to check formatting parameters 2013-11-23 21:58:32 -02:00
Felipe Pena 46f5da1dc1 - Moved breakpoint checking to phpdbg_bp.c file 2013-11-23 21:46:24 -02:00
Felipe Pena 9d9182dfef - Typo 2013-11-23 21:18:21 -02:00
Felipe Pena 70d4ac8ef3 - Moved catch cmd to "break op" cmd 2013-11-23 21:14:16 -02:00
Felipe Pena 6fbffc68ac - Update changelog 2013-11-23 20:07:50 -02:00
Felipe Pena a86d52d81d Merge branch 'master' of github.com:krakjoe/phpdbg 2013-11-23 20:03:31 -02:00
Felipe Pena f5c07f61e1 - Added catch command 2013-11-23 20:03:17 -02:00
Bob Weinand a5fb0ae10e Shut up, compiler! 2013-11-23 20:50:25 +01:00
Felipe Pena 603df4a48f Merge pull request #24 from PeeHaa/patch-1
FIX ALL THE TYPOS!
2013-11-23 10:55:09 -08:00
Pieter Hordijk 233c06d129 FIX ALL THE TYPOS! 2013-11-23 19:54:11 +01:00
krakjoe 9712387fc9 update version after release 2013-11-23 18:41:10 +00:00
krakjoe e7fa292493 change version for release 2013-11-23 18:40:28 +00:00
krakjoe cafafb0e01 API decls 2013-11-23 18:12:51 +00:00
krakjoe 1c6e54ecdf support shared build on unix 2013-11-23 17:56:16 +00:00
Felipe Pena 61b484524a Merge pull request #23 from bwoebi/info_literal_fix
Info literal fix
2013-11-23 09:40:59 -08:00
Bob Weinand 003fbd096e Merge branch 'master' of https://github.com/krakjoe/phpdbg into frames 2013-11-23 18:36:39 +01:00
Bob Weinand eb67cb6914 Fixed info literal 2013-11-23 18:36:33 +01:00
Felipe Pena 22b2478f83 Merge pull request #22 from heuripedes/master
fix whitespace in phpdbg.c
2013-11-23 09:33:42 -08:00
Higor Eurípedes ba0b2ad466 fix whitespace in phpdbg.c 2013-11-23 14:30:10 -03:00
krakjoe b76b543cae fix sigint when executing 2013-11-23 17:09:52 +00:00
krakjoe 351a0ac761 fix sigint 2013-11-23 17:01:18 +00:00
krakjoe 97424c4bb9 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-23 16:59:47 +00:00
Felipe Pena f62098ee27 - Exit debugger when hitting ctrl-c in no execution 2013-11-23 15:01:14 -02:00
krakjoe f7ae1126f8 quit on CTRL+C when interactive 2013-11-23 16:59:31 +00:00
Felipe Pena cf227df957 - Fix comment again and checking 2013-11-23 14:51:19 -02:00
Felipe Pena e289dc464a - err, revert 2013-11-23 14:46:38 -02:00
Felipe Pena c8448d7e06 - Fix typo 2013-11-23 14:45:03 -02:00
Felipe Pena b1dab16735 - Include fixed issues 2013-11-23 14:11:59 -02:00
Felipe Pena b3f295c40d - Missing register command 2013-11-23 14:07:04 -02:00
Felipe Pena 32d666b1c1 - Change version 2013-11-23 14:05:30 -02:00
Felipe Pena a8338c1c7c - Update changelog 2013-11-23 14:04:14 -02:00
Felipe Pena fc8b7cb369 Merge branch 'master' of github.com:krakjoe/phpdbg 2013-11-23 13:35:42 -02:00
Felipe Pena 3a72677e83 - Fix compiler warning 2013-11-23 13:35:30 -02:00
Felipe Pena b0f7344919 - Fixed typo 2013-11-23 13:34:36 -02:00
krakjoe 7cd0ed51ed fix ignore php.ini and override path 2013-11-23 15:11:09 +00:00
krakjoe eafaa65a08 fix infruritating segfault 2013-11-23 14:25:45 +00:00
krakjoe 62cf2bea55 shut up valgrind 2013-11-23 13:42:08 +00:00
krakjoe 86faf2e1b6 fix memory error 2013-11-23 13:35:54 +00:00
krakjoe 42b372431b hardcode log_errors setting 2013-11-23 13:11:47 +00:00
krakjoe 1ce2cdbfc8 -... 2013-11-23 13:05:36 +00:00
krakjoe fc5af4620c do not destroy opcodes on resetting same context 2013-11-23 13:04:27 +00:00
Anatol Belski 9238345922 started to fix ext/session 2013-11-23 10:06:42 +01:00
Anatol Belski 4a6981433d fixed ini_set for integers 2013-11-23 09:52:33 +01:00
Ingo Walz 880ecd603c Fixed bug 64604 2013-11-23 02:31:23 +01:00
Felipe Pena 968421c145 - Removed unused var 2013-11-22 21:30:26 -02:00
Felipe Pena 4a6f7373a3 - Added support to set breakpoint in the current place 2013-11-22 21:05:25 -02:00
Felipe Pena 7a6ed70552 - Reset frame num here 2013-11-22 20:15:04 -02:00
krakjoe 94ecb5a75f fix windows build 2013-11-22 20:42:57 +00:00
krakjoe 6bf06ac0ba argv example in phpdbginit 2013-11-22 20:11:06 +00:00
krakjoe 88a95efdfa compress help menu 2013-11-22 19:50:13 +00:00
krakjoe e662fd9eb0 merge frame/trace commands from bwoebi
tidy up
add help for frame command
fix help made incorrect by additions
2013-11-22 19:06:31 +00:00
Bob Weinand 0917c754f9 Shut up, compiler! 2013-11-22 19:24:27 +01:00
Bob Weinand 202c1cee39 Fixed segfault + ZTS 2013-11-22 19:16:25 +01:00
Bob Weinand c46a413697 Merge branch 'master' of https://github.com/krakjoe/phpdbg into frames
Conflicts:
	phpdbg.h
	phpdbg_prompt.c
2013-11-22 18:32:00 +01:00
Bob Weinand 5b51fb40e9 Added frames and beautified backtrace 2013-11-22 18:27:55 +01:00
krakjoe 022eb18d1d ... 2013-11-22 16:15:24 +00:00
Anatol Belski 639924fa2c first shot to fix session 2013-11-22 15:55:21 +01:00
krakjoe e0c4f87a89 another tut 2013-11-22 13:49:35 +00:00
krakjoe 4fd2edbeb4 initializing tut 2013-11-22 12:38:40 +00:00
Anatol Belski db40b1c037 fix return datatype 2013-11-22 12:26:39 +01:00
krakjoe f1042cb028 ... 2013-11-22 10:40:24 +00:00
Anatol Belski 52afd818eb fixed apache2 handler 2013-11-22 11:39:33 +01:00
krakjoe c51e7e26e9 add readline completion tip to phpdbginit 2013-11-22 10:39:21 +00:00
krakjoe 46a67d15fe better info literal 2013-11-22 09:56:17 +00:00
krakjoe a6bd3807c4 better handling of sigint
info literals command
2013-11-22 09:09:54 +00:00
Anatol Belski 28cb72f480 made zend list to use 64 bit indexes 2013-11-22 08:51:13 +01:00
Felipe Pena ae505ca339 Merge branch 'master' of github.com:krakjoe/phpdbg 2013-11-21 21:24:21 -02:00
Felipe Pena 601b75731a - WS 2013-11-21 21:19:55 -02:00
Felipe Pena 3db99f7d20 Merge pull request #14 from aurora/master
Fixed typo in Makefile.frag
2013-11-21 13:23:15 -08:00
Felipe Pena 62a104170c - Fixed compiler warning 2013-11-21 19:20:10 -02:00
Harald Lapp bea935f56e Fixed typo in Makefile.frag 2013-11-21 22:15:47 +01:00
krakjoe 8350ca4621 ... 2013-11-21 20:56:28 +00:00
Anatol Belski 7f0d637de4 Merge branch 'PHP-5.6'
* PHP-5.6:
  fixed test
  export more Zend API
2013-11-21 21:29:51 +01:00
Anatol Belski 696d286911 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fixed test
  And here is the real fix for #66124
  Fix for Bug #66124 (mysqli under mysqlnd loses precision when bind_param with 'i')
2013-11-21 21:29:35 +01:00
krakjoe cdd72cfda7 housekeeping, moving stuff to appropriate units 2013-11-21 19:47:31 +00:00
Andrey Hristov e09e45eb86 Merge branch 'PHP-5.5' 2013-11-21 21:30:36 +02:00
Anatol Belski f88c30507c fixed param parsing in mbstring 2013-11-21 18:33:16 +01:00
krakjoe 8743afbaa4 move opcode stuff to opcode.c 2013-11-21 16:45:12 +00:00
krakjoe a13583d1df use constant numbers 2013-11-21 16:41:41 +00:00
krakjoe a3bcdba660 ws 2013-11-21 16:30:27 +00:00
krakjoe 916164c808 more on disassembler 2013-11-21 16:10:48 +00:00
Anatol Belski 015d179e49 converted simplexml ext 2013-11-21 16:17:10 +01:00
Anatol Belski 607f97cefa fixed libxml 2013-11-21 15:08:39 +01:00
krakjoe 0488640f4c better output for disassembler 2013-11-21 13:52:20 +00:00
krakjoe c8d408ffac left justify oplines 2013-11-21 13:38:32 +00:00
krakjoe fdde4aa80a var and temp var numbers 2013-11-21 13:35:39 +00:00
Anatol Belski 51003463ef first shot for php-cgi for size_t and php_int_t 2013-11-21 13:26:56 +01:00
krakjoe ed8f64cc80 some work on opline output, incomplete 2013-11-21 11:16:14 +00:00
Anatol Belski fb27e16f01 fixed the skipif part 2013-11-21 11:54:35 +01:00
krakjoe f68fee5054 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-21 09:12:17 +00:00
krakjoe 2001acc372 spelling correcting 2013-11-21 09:12:03 +00:00
Felipe Pena d9b6f06aa0 - Removed unused var 2013-11-20 22:06:44 -02:00
krakjoe e36b718004 fix broken subs 2013-11-20 22:23:34 +00:00
krakjoe 1c046c02b8 tidy 2013-11-20 22:03:36 +00:00
krakjoe 5ec586ce94 restore sanity to commands/handlers/the universe 2013-11-20 21:47:44 +00:00
krakjoe 75e2e7ddf5 stop break on condition from bugging out 2013-11-20 20:29:14 +00:00
Felipe Pena 3c36fb99f2 - Drop unneeded code 2013-11-20 17:28:27 -02:00
Felipe Pena daf2b3e9ae - Update Changelog 2013-11-20 17:26:51 -02:00
Felipe Pena c3f43f0a6e - Added support to break when signaling ctrl+c 2013-11-20 17:16:07 -02:00
Felipe Pena 9ba9abfa2a Merge branch 'master' of github.com:krakjoe/phpdbg 2013-11-20 16:52:42 -02:00
Felipe Pena ed16d3b608 - Initial code for signal handling 2013-11-20 16:52:34 -02:00
krakjoe a0c824955c clean build on windows 2013-11-20 18:07:45 +00:00
krakjoe 17baeaa932 fix 2013-11-20 17:48:54 +00:00
krakjoe a81cc6c552 remove unused mshutdown 2013-11-20 17:43:42 +00:00
krakjoe 004249cec9 fix bug, allow init access to vm uninterrupted 2013-11-20 17:09:06 +00:00
krakjoe fdddde0d03 step through eval option 2013-11-20 17:01:37 +00:00
krakjoe 6d0991bad6 ... 2013-11-20 16:52:14 +00:00
krakjoe 311c22277d fix stepping into code from command line 2013-11-20 16:50:12 +00:00
Anatol Belski c63f8bdfba now, as it works correct, fix the test 2013-11-20 17:49:40 +01:00
krakjoe 3e8235e988 ... 2013-11-20 16:41:14 +00:00
krakjoe 63c0db3a1d fix eval 2013-11-20 16:32:30 +00:00
krakjoe a0e3cb08e6 Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6 2013-11-20 16:26:21 +00:00
krakjoe 1a1e83a5d9 export more Zend API 2013-11-20 16:24:22 +00:00
krakjoe 12d969558d -r option 2013-11-20 16:19:37 +00:00
Anatol Belski 5e3d047a07 removed debugbreak 2013-11-20 17:15:01 +01:00
Anatol Belski 7156c5cb39 datatype fixes for iconv 2013-11-20 17:11:10 +01:00
krakjoe 53cddbca33 fix Makefile.frag on multicore builds ... possibly 2013-11-20 15:27:35 +00:00
krakjoe 96ae27eee0 update .phpdbginit with more info/example 2013-11-20 15:10:00 +00:00
krakjoe 734bc68375 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-20 14:59:41 +00:00
krakjoe c3444a294e add help for -q 2013-11-20 14:59:28 +00:00
Felipe Pena 0ce0c45191 Merge branch 'master' of github.com:krakjoe/phpdbg 2013-11-20 12:55:22 -02:00
Felipe Pena 7384570bb2 - Fix extra byte allocation 2013-11-20 12:55:07 -02:00
krakjoe 54d6a99d83 fix strange chars on method breakpoint 2013-11-20 14:47:52 +00:00
krakjoe d5af8a0e48 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-20 14:40:21 +00:00
krakjoe 1ab45b4cce fix broken sub command error 2013-11-20 14:40:08 +00:00
Felipe Pena e3b3dfd7be - Update README 2013-11-20 12:36:48 -02:00
Felipe Pena 54f3dfa6fa - Added option to hide banner 2013-11-20 12:35:25 -02:00
krakjoe 640bf973ce correct help for register command 2013-11-20 14:30:56 +00:00
krakjoe e717662730 fix eval for new input handling 2013-11-20 14:25:15 +00:00
krakjoe 4f5c7a963c ... 2013-11-20 14:21:17 +00:00
krakjoe 7a81ed4b74 fix #13 output buffering not working during execution 2013-11-20 14:19:15 +00:00
krakjoe f92de15a1c align 2013-11-20 13:56:31 +00:00
krakjoe baff6e1d65 tidy alias menu 2013-11-20 13:51:47 +00:00
krakjoe d5388bac79 fix shell command to use new input 2013-11-20 13:43:58 +00:00
Felipe Pena de3b594156 - Fix conflict 2013-11-20 11:31:00 -02:00
Felipe Pena febeeea4ba - Fix conflict 2013-11-20 11:29:58 -02:00
Felipe Pena a0b75a24e5 - Passing input ptr to handlers 2013-11-20 11:28:41 -02:00
krakjoe 13e98cd2c7 don't allocate that, static inline this 2013-11-20 13:09:36 +00:00
krakjoe c10796e7e9 zend expects this to be clean memory 2013-11-20 13:00:28 +00:00
krakjoe 38679621bb Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-20 12:51:57 +00:00
krakjoe cad9fb826b registered functions able to accept any number of arguments 2013-11-20 12:49:47 +00:00
Felipe Pena 4ad50af9ac - CS 2013-11-20 10:10:27 -02:00
Felipe Pena 31e35c2671 - CS 2013-11-20 09:16:02 -02:00
Felipe Pena e7d0032bea - CS 2013-11-20 09:11:23 -02:00
krakjoe 80386a329b improve R 2013-11-20 10:49:39 +00:00
krakjoe dd71744d48 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-20 10:06:29 +00:00
krakjoe 6417e472b4 use new input handling everywhere 2013-11-20 10:04:05 +00:00
Anatol Belski 6a60a03859 Merge branch 'master' into str_size_and_int64
Conflicts:
	Zend/zend_operators.h
2013-11-20 10:17:19 +01:00
Anatol Belski 6f2d32fd1f Merge branch 'PHP-5.6'
* PHP-5.6:
  permanently deactivate that place, not on runtime only
2013-11-20 10:12:29 +01:00
Anatol Belski c694d1df7b Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  permanently deactivate that place, not on runtime only
2013-11-20 10:12:06 +01:00
Felipe Pena 3e6f942d1a - Missing function prototype 2013-11-19 20:26:31 -02:00
Yasuo Ohgaki bccead024d Merge branch 'PHP-5.6'
* PHP-5.6:
  added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean
2013-11-20 07:25:45 +09:00
Yasuo Ohgaki bf91f101a6 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean
2013-11-20 07:25:04 +09:00
Felipe Pena a1adc8124e - Removed unnecessary check and allocation 2013-11-19 20:13:51 -02:00
Felipe Pena bc278c7013 - Removed unused var 2013-11-19 20:09:19 -02:00
krakjoe 3709ea995c Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-19 21:58:03 +00:00
krakjoe b65cef950a more on functions 2013-11-19 21:54:58 +00:00
Felipe Pena dace704d15 - Check for PHPDBG_DEBUG 2013-11-19 19:53:27 -02:00
Felipe Pena 4672313057 - Removed unused var 2013-11-19 19:40:01 -02:00
Felipe Pena 2e3723f08f - Cosmetic changes 2013-11-19 19:35:45 -02:00
Felipe Pena 3853f5b370 - Added phpdbg_trim() 2013-11-19 19:26:40 -02:00
Jeff Welch b2ca20312d Fixed tests that fail with non-default serialize_precision configurations.
See:

 * https://bugs.php.net/bug.php?id=64760
 * 4dc4302
2013-11-20 06:17:57 +09:00
Jeff Welch b4210efe76 Fixed tests that fail with non-default serialize_precision configurations.
See:

 * https://bugs.php.net/bug.php?id=64760
 * 4dc4302
2013-11-20 06:14:32 +09:00
Felipe Pena dee048c22a - WS, removed unused var 2013-11-19 19:02:38 -02:00
krakjoe 5af371409c debugging new input stuff 2013-11-19 20:27:23 +00:00
krakjoe 1a2618b229 avoid memory error 2013-11-19 19:36:39 +00:00
krakjoe 99a1414924 show where 2013-11-19 19:35:48 +00:00
krakjoe cfc62cdbe0 cleanup 2013-11-19 19:24:21 +00:00
krakjoe 13b0ef71b5 ... 2013-11-19 19:11:18 +00:00
krakjoe 690a3202fd escaped strings 2013-11-19 19:10:09 +00:00
krakjoe 8ac46de2cf argc/argv started 2013-11-19 17:18:58 +00:00
krakjoe 71811f1f7f include registered functions in help for register command 2013-11-19 14:28:57 +00:00
krakjoe b237401167 fix broken repeat command 2013-11-19 14:06:33 +00:00
Anatol Belski 726d803375 fixed key length datatype 2013-11-19 14:51:20 +01:00
krakjoe b2a19a42d1 removed a loop 2013-11-19 13:22:46 +00:00
Anatol Belski e7b54a3aa7 fixed datatypes for some basic globals members 2013-11-19 14:13:23 +01:00
krakjoe cf4b451d39 bail on fail for console input, fix - ./phpdbg 2013-11-19 13:11:45 +00:00
krakjoe 73e7f5c645 more tidy 2013-11-19 13:00:04 +00:00
Anatol Belski f7bd3db224 Merge branch 'master' into str_size_and_int64 2013-11-19 13:42:51 +01:00
Anatol Belski aee386bb30 fix range check related to #45877 2013-11-19 13:40:43 +01:00
krakjoe d906613eb5 tidy up reading input, avoid leaks, restore sanity 2013-11-19 12:39:48 +00:00
Remi Collet b41a2755c4 Merge branch 'PHP-5.6'
* PHP-5.6:
  avoid doing a stream_select on a closed stream
2013-11-19 12:43:00 +01:00
Remi Collet 8c05e861d6 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  avoid doing a stream_select on a closed stream
2013-11-19 12:42:44 +01:00
krakjoe 924d5bdbe6 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-19 10:59:45 +00:00
krakjoe 2ebb9e48be better call register 2013-11-19 10:56:50 +00:00
Felipe Pena d45e882573 - Fixed memory issue 2013-11-19 08:53:51 -02:00
Felipe Pena e863e71234 - Removed unused variable 2013-11-19 08:49:44 -02:00
Anatol Belski d34f4454f0 fixed zlib param parsing 2013-11-19 10:38:54 +01:00
krakjoe 7c077f7040 ordering 2013-11-19 01:56:33 +00:00
krakjoe 54aaf898ca ... 2013-11-19 01:51:56 +00:00
krakjoe fb6df2fa08 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-19 01:50:38 +00:00
krakjoe 9ebc61f282 help for register better formatting for help menu 2013-11-19 01:48:21 +00:00
Felipe Pena db8f825414 - Fix build 2013-11-18 23:30:57 -02:00
krakjoe 0250a0992c don't dtor that 2013-11-19 01:22:02 +00:00
krakjoe dc1cd94dec Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-19 01:19:01 +00:00
krakjoe 599047f153 register functions, needs work 2013-11-19 01:18:43 +00:00
Felipe Pena 11b8fcf974 - Update changelog 2013-11-18 22:21:02 -02:00
krakjoe a37de13a20 correction to print stack 2013-11-18 23:49:57 +00:00
krakjoe af20f1a474 fix memory errors when printing execution context 2013-11-18 23:48:10 +00:00
krakjoe 407ab7d57e make errors stand out more, don't duplicate output 2013-11-18 23:41:57 +00:00
krakjoe d82eca8c86 add resource type to info 2013-11-18 23:18:22 +00:00
krakjoe 1051564059 changes to info 2013-11-18 23:04:20 +00:00
krakjoe 7f73c7486a no data in variable info, too messy with normal objects 2013-11-18 22:45:16 +00:00
krakjoe f141481cf2 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-18 22:18:29 +00:00
Felipe Pena 3660929530 - WS, removed unused var 2013-11-18 20:12:27 -02:00
krakjoe 2bd7ed4288 tidy vars 2013-11-18 22:10:41 +00:00
Felipe Pena 723c671750 Merge branch 'master' of github.com:krakjoe/phpdbg 2013-11-18 20:08:31 -02:00
krakjoe 7b65a29471 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-18 22:04:36 +00:00
krakjoe a582d2793d fix memory errors 2013-11-18 21:59:42 +00:00
Felipe Pena b4d9fbdbff - WS 2013-11-18 19:59:15 -02:00
Felipe Pena 8951406678 - Fix valgrind reports + CS 2013-11-18 19:55:29 -02:00
Andrea Faulds e68792dbb2 Merge branch 'PHP-5.6'
* PHP-5.6:
  Updated NEWS
  Removed UPGRADING note
  Rewrote test using tcp instead of http:// stream
  Implemented FR #65917 (getallheaders() is not supported by the built-in...)
2013-11-18 21:54:00 +00:00
Andrea Faulds 35b463a2c5 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Updated NEWS
  Removed UPGRADING note
  Rewrote test using tcp instead of http:// stream
  Implemented FR #65917 (getallheaders() is not supported by the built-in...)
2013-11-18 21:43:59 +00:00
Felipe Pena a1156cae5c - Avoid to show number of variable 2013-11-18 19:36:25 -02:00
Felipe Pena b649693a90 - Removed unused variable 2013-11-18 19:32:28 -02:00
krakjoe 9b30877d56 fix memory error 2013-11-18 20:20:07 +00:00
krakjoe 9190e783a2 no more allocing params 2013-11-18 18:05:37 +00:00
krakjoe 75bc53d7de avoid leaks from parameters 2013-11-18 17:51:14 +00:00
krakjoe c78d9bf283 update image 2013-11-18 17:15:44 +00:00
krakjoe 9a5d51555e remove changes 2013-11-18 17:05:34 +00:00
krakjoe 7a30a79fd4 improve uncaught exception handler 2013-11-18 17:00:26 +00:00
Anatol Belski 0cac40e879 moved the check to the right place and fixed wording 2013-11-18 17:28:48 +01:00
krakjoe e02c26d1f5 correction to aliases 2013-11-18 14:51:08 +00:00
krakjoe 93c5968e72 tidy help 2013-11-18 14:47:27 +00:00
krakjoe e349330a6f Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-18 14:25:29 +00:00
krakjoe 508ac961aa add stack printer
add alias examples in help
tidy up in help
2013-11-18 14:24:58 +00:00
Felipe Pena 4a1cb2262e - Removed unused variables 2013-11-18 12:09:25 -02:00
krakjoe 9b7b7c4a39 don't resize window on windows anymore, not required 2013-11-18 13:29:08 +00:00
krakjoe 8588f5cc84 compress text/tidy up 2013-11-18 13:23:28 +00:00
krakjoe a1478217ce corrections 2013-11-18 13:07:13 +00:00
Anatol Belski c398bdd4a3 runtime checks for various lengths in pcre 2013-11-18 14:03:55 +01:00
krakjoe d34f1e59c0 help for shell command 2013-11-18 13:03:33 +00:00
krakjoe e7e3dbccbf shell command 2013-11-18 12:46:10 +00:00
krakjoe 81e1f70e52 change message, it's wrong 2013-11-18 12:09:01 +00:00
krakjoe 858629b600 destroy displayed exception and reset eg 2013-11-18 12:06:06 +00:00
krakjoe 57b67d71b0 display uncaught exceptions 2013-11-18 11:51:41 +00:00
kovacs.ferenc a833f7d460 Merge branch 'PHP-5.6' 2013-11-18 12:39:40 +01:00
kovacs.ferenc 2042d78fce Merge branch 'JSONCaseFix' of git://github.com/TazeTSchnitzel/php-src into TazeTSchnitzel-JSONCaseFix 2013-11-18 12:12:24 +01:00
krakjoe 5cc88ca88a fix stack entry detection for symbol breakpoints
count yield as return for leave/finish
2013-11-18 11:04:24 +00:00
krakjoe c70c156ca1 seek ZEND_YIELD 2013-11-18 10:32:33 +00:00
Anatol Belski 365603916e fixed one more stat() occurrence 2013-11-18 09:39:42 +01:00
Anatol Belski 383ddcde2b Merge branch 'master' into str_size_and_int64 2013-11-18 09:10:22 +01:00
krakjoe 775376b362 better way to detect leave/finish 2013-11-18 03:18:37 +00:00
krakjoe 8ada4342a4 don't be lazy, scan for ZEND_RETURN when setting seek opline 2013-11-18 02:14:17 +00:00
krakjoe 5b4837846a clean flags on run 2013-11-18 01:50:28 +00:00
krakjoe a1620a7bb4 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-18 01:45:03 +00:00
krakjoe 07c0dc00cb fixup until/leave/finish 2013-11-18 01:44:46 +00:00
Felipe Pena 7e2a4bcc94 - WS 2013-11-17 23:18:12 -02:00
Felipe Pena a84ac64585 - WS 2013-11-17 23:08:53 -02:00
Felipe Pena f72b2d6c7c - Move phpdbg_welcome to phpdbg.c and staticfy it 2013-11-17 23:07:57 -02:00
Felipe Pena 66494ad94e - CS 2013-11-17 23:05:14 -02:00
Felipe Pena a7c4a6c21b - Removed unreached break stmt 2013-11-17 23:04:46 -02:00
Felipe Pena 44168c36a8 Merge branch 'master' of github.com:krakjoe/phpdbg 2013-11-17 22:56:07 -02:00
Felipe Pena 2941a4ab50 - print command has optional arguments 2013-11-17 22:55:52 -02:00
krakjoe f9a66f0d44 brifer 2013-11-18 00:42:07 +00:00
Kalle Sommer Nielsen 9e3551ba1f Eliminated the TSRMLS_FETCH() in zend_set_memory_limit() 2013-11-18 01:36:17 +01:00
krakjoe e97fcb4592 try another layout 2013-11-18 00:27:21 +00:00
Joe Watkins 27ae287c49 fix window size on windows
make window as big as possible on windows for readability
2013-11-18 00:23:04 +00:00
Joe Watkins 0966cad651 fix mmap in windows
fix mmap in windows
2013-11-17 23:48:07 +00:00
Joe Watkins ff2abccc4b fix windows build
fix windows build and add header
2013-11-17 23:34:11 +00:00
krakjoe f046189e34 export more Zend API 2013-11-17 22:39:31 +00:00
Felipe Pena eef21c186c - Rename has_args to arg_type 2013-11-17 20:07:19 -02:00
Felipe Pena 35601e6fec - Fix argument information 2013-11-17 20:05:21 -02:00
Felipe Pena 09391b1f72 - WS 2013-11-17 19:04:39 -02:00
Felipe Pena 0f7b4b3c30 Merge branch 'master' of github.com:krakjoe/phpdbg 2013-11-17 19:02:22 -02:00
Felipe Pena d054172a33 - Clean up command macros
- Added flag to specify no argument, required argument and optional argument
2013-11-17 19:01:41 -02:00
Felipe Pena e514804cac - WS 2013-11-17 17:40:49 -02:00
krakjoe dbe8b26ab7 force clean build every time, no room for error 2013-11-17 19:10:12 +00:00
krakjoe 635466b609 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-17 19:07:12 +00:00
krakjoe cf5ef86a86 correction 2013-11-17 19:07:02 +00:00
Felipe Pena f2e4e63b5e Merge branch 'master' of github.com:krakjoe/phpdbg 2013-11-17 17:01:19 -02:00
Felipe Pena 66588d7ff7 - Implemented "info error" command 2013-11-17 17:00:59 -02:00
krakjoe 25d24f2ed9 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-17 18:57:34 +00:00
krakjoe 6acf069c58 added info funcs 2013-11-17 18:55:06 +00:00
Felipe Pena 2c9dbc6b62 - Fix conflict 2013-11-17 16:45:08 -02:00
Felipe Pena 31f45d5457 - Added "info vars" to show active variables 2013-11-17 16:43:37 -02:00
krakjoe 0230f7cd18 tidy 2013-11-17 18:33:34 +00:00
krakjoe 7c76e45410 info classes + help 2013-11-17 18:26:56 +00:00
Felipe Pena 33098232dc - Fix conflict 2013-11-17 14:13:13 -02:00
Felipe Pena 478446b665 - Added macro for trailling command 2013-11-17 14:10:43 -02:00
krakjoe 02e3718ef9 fix segfault when autoglobals are not properly setup 2013-11-17 16:06:30 +00:00
Felipe Pena 4ee192ae3d - Use macro here 2013-11-17 14:05:10 -02:00
krakjoe a0151e91a5 fix list not working when exec is set but not executing 2013-11-17 15:57:49 +00:00
Felipe Pena 17cc942e7c Merge branch 'master' of github.com:krakjoe/phpdbg 2013-11-17 13:42:46 -02:00
Felipe Pena ca32181b1c - Initial code for info command 2013-11-17 13:42:34 -02:00
krakjoe 2ba9e9306f leave function + help 2013-11-17 15:39:23 +00:00
krakjoe e2f20c57c1 finish? 2013-11-17 15:01:22 +00:00
Felipe Pena f2b8cdc5be - Added finish/f command 2013-11-17 11:59:21 -02:00
Felipe Pena 146520f045 - Missing credits 2013-11-17 10:40:51 -02:00
Felipe Pena 180bb579bf - Fix trailling newline handling 2013-11-17 10:23:50 -02:00
Felipe Pena f51a08b6d6 - Fix conflict 2013-11-17 10:12:10 -02:00
Felipe Pena 4eb20ecfe7 - Drop unneeded parenthesis 2013-11-17 10:10:02 -02:00
krakjoe ced99e1b1d fix whitepsace in here first 2013-11-17 12:07:01 +00:00
Felipe Pena 677aa7baa7 - Change error message 2013-11-17 09:37:14 -02:00
krakjoe 605adfc613 phpdbg_default_switch_case(); in list lines 2013-11-17 11:31:09 +00:00
Felipe Pena 1e0d92975e Merge branch 'master' of github.com:krakjoe/phpdbg 2013-11-17 09:29:13 -02:00
Felipe Pena dd25fb44fd - Fix conflict 2013-11-17 09:28:14 -02:00
krakjoe f2edc066f2 fix compiler warning 2013-11-17 11:17:47 +00:00
Felipe Pena c302c94b0a - Use offset when listing active file and reuse list handler code 2013-11-17 09:15:53 -02:00
krakjoe dcead8ea90 add highlight param to file listing 2013-11-17 11:11:09 +00:00
krakjoe 5768e98cb0 correction 2013-11-17 09:36:14 +00:00
krakjoe 22ae0d51a1 add print exec command to show current execution context instructions
make phpdbg_compile public
2013-11-17 09:30:44 +00:00
Xinchen Hui b93f8e6277 Merge branch 'PHP-5.6' 2013-11-17 17:20:27 +08:00
Xinchen Hui 140a42f779 Merge branch 'PHP-5.5' into PHP-5.6 2013-11-17 17:20:13 +08:00
Xinchen Hui 5a282136a3 Merge branch 'PHP-5.5' 2013-11-17 17:11:20 +08:00
krakjoe 434949c5b4 consistency in prompt/list, do not return FAILURE from command handlers 2013-11-16 23:35:11 +00:00
krakjoe 8f4f4f0628 uniform code in print.c 2013-11-16 23:25:33 +00:00
krakjoe a28ea698b8 cleanup in list ... last time 2013-11-16 23:11:39 +00:00
krakjoe 7bc369399b switches in list.c, be consistent in all command handlers 2013-11-16 22:58:30 +00:00
krakjoe b424771ce8 stat before setting breakpoints on files
default switch case for command handlers
trace route through handler tree for debugging etc **selected
2013-11-16 22:40:01 +00:00
krakjoe 102e3477d7 remove more no expression provided messages 2013-11-16 21:28:59 +00:00
krakjoe f0ed181081 get rid of No Expression Provided messages, not required anymore 2013-11-16 21:25:22 +00:00
krakjoe 593e7b28e8 stat execution context and check it is a regular file or symlink 2013-11-16 21:23:14 +00:00
krakjoe 5a0422d8c6 establish relationship between parent and child commands
extend alias help
automatically invoke child commands
2013-11-16 20:57:10 +00:00
krakjoe dd89817362 include all alias and child command information in help 2013-11-16 19:39:14 +00:00
krakjoe 80b82cd538 add list class and method commands
update help text to be more specific
2013-11-16 18:53:12 +00:00
krakjoe f03b6b4433 update bootstrap 2013-11-16 15:37:00 +00:00
krakjoe 74651f8d68 ... 2013-11-16 14:58:16 +00:00
krakjoe 7acf88322b fix is_class_method (needs revision)
don't free last (needs revision)
2013-11-16 14:55:53 +00:00
krakjoe cf58c7cea3 make handlers take phpdbg_param_t 2013-11-16 14:34:49 +00:00
krakjoe 10ec0ee8b1 move phpdbg_param_t to phpdbg.c|h
add string length and type to param_t (made struct instead of union)
typedef enumerated param types
add some error messages when command recieves unsupported values
2013-11-16 13:15:00 +00:00
Felipe Pena bff5abfd95 - Fixed possible memleak 2013-11-16 10:02:35 -02:00
Felipe Pena 515f7806c5 - Fixed repeat-last-command feature for next and until command 2013-11-16 09:50:25 -02:00
Felipe Pena 44d27200f6 - Fix compiler warning 2013-11-16 09:34:23 -02:00
krakjoe 403072e488 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-16 11:12:22 +00:00
krakjoe 19ada893cb add phpdbg_debug function and --enable-phpdbg-debug configure option
added debug statement to do_cmd in preparation for updates
2013-11-16 11:11:47 +00:00
Felipe Pena 0629f32afc - Added changelog file 2013-11-16 09:08:54 -02:00
Felipe Pena 25b9a366e4 - Implemented issue #11 (until command) 2013-11-16 08:59:50 -02:00
krakjoe 3cb6af2cc1 add clean-phpdbg rule to Makefile.frag to aid development 2013-11-16 10:39:12 +00:00
krakjoe 7a56e9bc84 fix segfault on some implementations of atoi 2013-11-15 20:52:48 +00:00
Christopher Jones 3e4e173296 Merge branch 'PHP-5.6'
* PHP-5.6:
  Update NEWS
  This is CLI web server change.  Added some common MIME types to the existing lookup list, pending a more thorough lookup solution, if anyone wants to do that.  Ref http://news.php.net/php.internals/69990
2013-11-15 12:38:18 -08:00
Christopher Jones 81d0ba10ba Update NEWS 2013-11-15 12:37:52 -08:00
Christopher Jones 419bef3070 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  This is CLI web server change.  Added some common MIME types to the existing lookup list, pending a more thorough lookup solution, if anyone wants to do that.  Ref http://news.php.net/php.internals/69990
2013-11-15 12:37:17 -08:00
Felipe Pena 1cbc914406 - Back to development 2013-11-15 18:21:36 -02:00
Felipe Pena d83c7c27d2 - Preparing for first release 2013-11-15 18:10:04 -02:00
Felipe Pena cd8efea14d Merge branch 'master' of github.com:krakjoe/phpdbg 2013-11-15 14:24:34 -02:00
Felipe Pena d13c02bf68 - Fix compiler warning 2013-11-15 14:24:22 -02:00
krakjoe 95f5d779ba arginfo for userland functions 2013-11-15 16:22:20 +00:00
krakjoe 8c67cf30b5 cleanup 2013-11-15 16:17:57 +00:00
krakjoe 24c6e3c317 add oplog status to context information on print command 2013-11-15 16:12:27 +00:00
krakjoe ae5f0d0f27 ... 2013-11-15 16:09:40 +00:00
krakjoe 1b615298bf tidy example 2013-11-15 15:59:54 +00:00
krakjoe 057f11c4ca extend userland api phpdbg_break function 2013-11-15 15:54:14 +00:00
krakjoe 38ed8d89d0 remove additional switch 2013-11-15 15:34:48 +00:00
krakjoe a3f2137173 ... 2013-11-15 15:26:51 +00:00
krakjoe b63fd6d261 embed code in .phpdbginit 2013-11-15 14:53:40 +00:00
Felipe Pena 8b41387343 Merge branch 'master' of github.com:krakjoe/phpdbg 2013-11-15 09:27:18 -02:00
Felipe Pena 00159635ad - Removed unused var 2013-11-15 09:27:05 -02:00
krakjoe f304541589 ... 2013-11-15 11:21:30 +00:00
krakjoe aeeba85221 implement 5.4 support 2013-11-15 11:19:26 +00:00
Anatol Belski bfa6d8d87d Merge branch 'str_size_and_int64' of git.php.net:php-src into str_size_and_int64 2013-11-15 11:07:58 +01:00
Anatol Belski ae576a4309 fix zend_off_t when int64 is disabled 2013-11-15 01:44:18 -08:00
Anatol Belski 18e4e5b350 Merge branch 'master' into str_size_and_int64 2013-11-15 10:04:53 +01:00
Remi Collet a37ff1fa4b Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  Fix Bug #65714 	PHP cli forces the tty to cooked mode
2013-11-15 09:53:23 +01:00
Remi Collet 4508a84d0d Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  Fix Bug #65714 	PHP cli forces the tty to cooked mode
2013-11-15 09:53:07 +01:00
krakjoe 76ec5635a4 include conditional breakpoints in out 2013-11-14 23:06:31 +00:00
krakjoe ad73291405 swap welcome/init around 2013-11-14 21:51:55 +00:00
krakjoe 9516dc4269 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-14 21:40:44 +00:00
krakjoe 2a2c88cace change image on tutorial 2013-11-14 21:40:34 +00:00
Felipe Pena 99f35d72f1 Merge branch 'master' of github.com:krakjoe/phpdbg 2013-11-14 19:40:25 -02:00
Felipe Pena 0896236a7a - Change comment style 2013-11-14 19:39:59 -02:00
krakjoe 0144192e0b .. 2013-11-14 21:37:07 +00:00
krakjoe 918703ff94 tidy 2013-11-14 21:20:37 +00:00
krakjoe 04149df489 update image 2013-11-14 21:18:12 +00:00
krakjoe 4c62cc97e4 better description 2013-11-14 21:15:47 +00:00
krakjoe c3c95610c1 ... 2013-11-14 21:13:29 +00:00
krakjoe 582a84d728 correction 2013-11-14 21:12:51 +00:00
krakjoe f2212c05c7 add opline logging and setup including command line option 2013-11-14 21:10:44 +00:00
Adam Harvey 6cf46f49e3 Merge branch 'PHP-5.6' 2013-11-14 10:53:02 -08:00
Adam Harvey 3683713b2c Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
	NEWS
2013-11-14 10:52:43 -08:00
krakjoe 365b5db1f6 ... 2013-11-14 18:52:26 +00:00
krakjoe d948ea62cb correction 2013-11-14 18:51:45 +00:00
krakjoe cd956373ba help for command line options 2013-11-14 18:50:34 +00:00
krakjoe 5da544ecb3 correction 2013-11-14 17:32:10 +00:00
krakjoe 1e19001693 example .phpdbginit 2013-11-14 17:29:21 +00:00
krakjoe 6b864a8b0f fix crash when .phpdbginit quits 2013-11-14 17:03:36 +00:00
krakjoe 5147c87f2c updates 2013-11-14 17:00:51 +00:00
krakjoe 1ee3950747 implement init file and command line options 2013-11-14 16:58:50 +00:00
krakjoe 1544562b49 fix case sensitivity in print func command 2013-11-14 16:29:48 +00:00
krakjoe 6c6779d474 fix case sensitivity in print method command 2013-11-14 16:25:55 +00:00
krakjoe fb1ee0bbf6 ... 2013-11-14 16:17:22 +00:00
krakjoe e4fefee020 fix stepping 2013-11-14 16:14:20 +00:00
krakjoe b4de11a2b4 ... 2013-11-14 16:03:40 +00:00
krakjoe 6a3194a47d move listing commands out to their own command list
add TSRMLS_CC in clear_param for consistency
2013-11-14 15:46:06 +00:00
krakjoe 7763b0b383 phpdbg_init from file & command line option (no impl yet) 2013-11-14 14:14:13 +00:00
Anatol Belski a80567a929 fixed undefined behaviour in array_sum
The exact situation is when passing same pointer twice to
fast_add_function(). This prorably has to be fixed in mainstream too.
2013-11-14 14:59:08 +01:00
krakjoe 1107ccef99 fix for calculator hardware :) 2013-11-14 13:48:13 +00:00
krakjoe 22a3a2394f Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-14 13:05:37 +00:00
krakjoe 8e597eba07 additional checks in is_* 2013-11-14 13:04:59 +00:00
Felipe Pena b4ff86b79b Merge branch 'master' of github.com:krakjoe/phpdbg 2013-11-14 10:40:15 -02:00
Felipe Pena 1d7562bb99 - Added .gdbinit 2013-11-14 10:40:01 -02:00
krakjoe 187d1c726b fix duplicate message on print .func if no active class 2013-11-14 12:29:23 +00:00
krakjoe 4283b125c9 alias printing commands 2013-11-14 12:25:19 +00:00
krakjoe dc580c685f fix quit not working 2013-11-14 12:21:28 +00:00
krakjoe 801a575c47 fix crash on clean 2013-11-14 11:30:31 +00:00
krakjoe dcb6906bc4 fix crash when cleaning environment
fix crash when specifying exec on command line
2013-11-14 11:13:21 +00:00
krakjoe 6eba5c6664 clear conditional breaks in uapi 2013-11-14 09:18:06 +00:00
krakjoe 695decf7e1 TSRMLS_CC missing 2013-11-14 07:46:30 +00:00
Felipe Pena 2475207588 - Missing break 2013-11-13 22:30:03 -02:00
Felipe Pena 0eea7e4504 - Cosmetic changes 2013-11-13 22:29:44 -02:00
Felipe Pena b91a5053f8 - Cosmetics 2013-11-13 22:16:41 -02:00
Felipe Pena 782615ac1c - Use realpath on PHPDBG_G(exec) 2013-11-13 21:36:02 -02:00
Felipe Pena d074b7a9df Merge branch 'master' of github.com:krakjoe/phpdbg 2013-11-13 21:13:54 -02:00
Felipe Pena 4c59ad6e2e - Added parameter parsing functions 2013-11-13 21:13:41 -02:00
krakjoe 0c2a76ad5f Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-13 22:18:35 +00:00
krakjoe 453194d0ac change defaults for windows 2013-11-13 22:18:20 +00:00
Joe Watkins 667456529a windows preview image 2013-11-13 21:48:04 +00:00
Felipe Pena 9840c6ae97 - Unnesting some code 2013-11-13 19:43:54 -02:00
Felipe Pena b81236d694 - Removed double checking + ws changes 2013-11-13 19:31:33 -02:00
Felipe Pena 9bc6296fe0 Merge branch 'master' of github.com:krakjoe/phpdbg 2013-11-13 19:27:38 -02:00
Felipe Pena 0cc067aa81 - Added check for file context on "break lineno" and name length on "break func" 2013-11-13 19:27:24 -02:00
krakjoe a43bc6ef91 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-13 21:15:57 +00:00
krakjoe 3f927019cb updates for windows 2013-11-13 21:15:45 +00:00
Felipe Pena 388b132d31 - Fixed crash when supplied invalid syntax to "break file" 2013-11-13 19:11:45 -02:00
krakjoe 1c1cc51295 ... 2013-11-13 19:32:21 +00:00
krakjoe 0bc987c9b4 fix clashing 2013-11-13 18:17:06 +00:00
krakjoe 375c90324c ... 2013-11-13 17:39:53 +00:00
Anatol Belski e93c9ae26a fixed serialize/unserialize
- almost correct datatype fixes
2013-11-13 18:37:57 +01:00
krakjoe 188f4d3c51 aliasing commands 2013-11-13 17:35:51 +00:00
krakjoe a6a909101f ... 2013-11-13 14:53:28 +00:00
krakjoe f6d45107b2 show conditionals 2013-11-13 14:50:13 +00:00
krakjoe 072622e799 don't allow conditionals to be executed by eval()'d code 2013-11-13 14:41:25 +00:00
krakjoe b81005f94b ... 2013-11-13 14:32:36 +00:00
Anatol Belski 6b229d541a fixed ext/date for php_int_t usage 2013-11-13 15:22:56 +01:00
krakjoe 57ae58c9bf support conditional breakpoints 2013-11-13 14:22:01 +00:00
Remi Collet b6f76adef4 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix failed test with recent glibc
  5.5.7 now
2013-11-13 13:21:28 +01:00
Remi Collet 74ab30e216 fix merge 2013-11-13 13:21:12 +01:00
Joe Watkins bc610565fc Merge pull request #10 from salathe/patch-1
Small grammar changes
2013-11-13 03:47:10 -08:00
Anatol Belski bd81a99ab3 Merge branch 'master' into str_size_and_int64 2013-11-13 12:44:00 +01:00
Anatol Belski 15bb12b269 fixed "struct stat" usage in main, cli and ext/standard 2013-11-13 12:39:12 +01:00
Peter Cowburn 3bac20c598 Small grammar changes 2013-11-13 10:54:58 +00:00
krakjoe f55acc410c ... 2013-11-13 10:39:36 +00:00
krakjoe 03b43e3404 consistency 2013-11-13 10:35:25 +00:00
krakjoe 4def1ab3a9 ... 2013-11-13 10:32:54 +00:00
krakjoe 68ba58ee48 move image from root 2013-11-13 10:31:03 +00:00
krakjoe af1bb02dab ... 2013-11-13 10:26:27 +00:00
krakjoe ed3339f627 ... 2013-11-13 10:25:51 +00:00
krakjoe 9b616b17c9 ... 2013-11-13 10:25:14 +00:00
krakjoe ae1c05944c ... 2013-11-13 10:17:53 +00:00
krakjoe 7928d1f9e2 ... 2013-11-13 10:16:09 +00:00
krakjoe ae683043e2 ... 2013-11-13 10:10:47 +00:00
krakjoe b74dda9576 ... 2013-11-13 09:55:42 +00:00
krakjoe 0f2c75efb2 add intro tutorial 2013-11-13 09:55:06 +00:00
krakjoe 216c1f5e99 show printing image 2013-11-13 09:39:43 +00:00
krakjoe 34ca093f65 add show verbose execution image 2013-11-13 09:33:22 +00:00
krakjoe 459232e7b7 ... 2013-11-13 09:22:22 +00:00
krakjoe 2ee351d90b show break screen image 2013-11-13 09:17:58 +00:00
krakjoe 9967c7d6bb break help image 2013-11-13 09:03:58 +00:00
krakjoe f4f8246de9 help image 2013-11-13 08:29:00 +00:00
krakjoe b72a37dc5f tutorials directory for images and markdown 2013-11-13 08:23:40 +00:00
krakjoe 8b7ab83014 clean up build 2013-11-13 08:11:23 +00:00
krakjoe 5e266f34fc non readline fixes 2013-11-13 08:05:26 +00:00
krakjoe b6c4fbee1b ... 2013-11-13 05:39:18 +00:00
krakjoe 99bbc8e811 method printer 2013-11-13 05:36:01 +00:00
krakjoe 88ad7f9279 more detailed opline 2013-11-13 04:47:07 +00:00
krakjoe 63a0c1ca15 ... 2013-11-13 04:34:02 +00:00
krakjoe a6d08af06b fix leak from readline 2013-11-13 04:20:39 +00:00
krakjoe 176f995c24 activate globals 2013-11-13 04:04:41 +00:00
krakjoe 60a8d908ce ... 2013-11-13 03:04:47 +00:00
krakjoe 0354bab777 ... 2013-11-13 02:59:10 +00:00
krakjoe 2464629b5c fix 2013-11-13 02:50:00 +00:00
krakjoe fec3b77a0f ... 2013-11-13 02:48:22 +00:00
krakjoe 0ade5f0d9d fix list length lookup 2013-11-13 02:43:09 +00:00
krakjoe 94e887cf2a ... 2013-11-13 02:39:02 +00:00
krakjoe efee212045 class/func printers 2013-11-13 02:26:37 +00:00
krakjoe 0781e7b863 fix segfault on set break opline address 2013-11-13 01:44:59 +00:00
krakjoe 68cff82d8b class printer 2013-11-13 01:35:39 +00:00
krakjoe 43c2748dce fix bug in passing correct expression length
add class printer (half done)
2013-11-13 00:36:47 +00:00
krakjoe 5204026308 housework 2013-11-12 23:54:41 +00:00
krakjoe a8285e3bbf no more printf 2013-11-12 23:43:49 +00:00
krakjoe ce78503e15 remove more printf 2013-11-12 23:31:46 +00:00
krakjoe afa216fd7e deploy _write 2013-11-12 23:17:37 +00:00
krakjoe a712674964 added phpdbg_write to replace all the printf 2013-11-12 23:10:53 +00:00
Felipe Pena ff54d20b58 - Fix prototype and memory leak 2013-11-12 20:55:39 -02:00
Felipe Pena 5d435cb831 - Spred more some macro usage instead of phpdbg_print() 2013-11-12 20:48:52 -02:00
Felipe Pena 27f640d879 - Added phpdbg_notice() and phpdbg_error() 2013-11-12 20:39:39 -02:00
Felipe Pena bbd523e5cb - Cosmetic 2013-11-12 19:40:15 -02:00
Nikita Popov b8525baecf Merge branch 'PHP-5.6' 2013-11-12 22:04:45 +01:00
Nikita Popov dc4bf922d9 Allow $num=0 in array_fill()
Implemented request #49824.
2013-11-12 22:02:51 +01:00
Anatol Belski 468b2923ca fixed stat usage, yet core only
- defined php_stat_t as replacement for struct stat
- on _WIN64 use _fstat64
2013-11-12 21:10:23 +01:00
Felipe Pena e8cb646fed - Fix compiler warning 2013-11-12 16:53:48 -02:00
krakjoe 6b3b14e8dd ... 2013-11-12 16:13:14 +00:00
krakjoe b6f5b64c61 ... 2013-11-12 16:07:59 +00:00
krakjoe c43d5a558f ... 2013-11-12 16:04:41 +00:00
krakjoe 803303057a fix output from print command to show all breakpoints 2013-11-12 15:51:30 +00:00
Felipe Pena 9c37190876 - Fix allocation size 2013-11-12 13:17:24 -02:00
Felipe Pena edbb1313a1 - Simplify code 2013-11-12 13:10:29 -02:00
Felipe Pena 5a3285ae99 - Cosmetic change 2013-11-12 11:44:36 -02:00
Felipe Pena 2e14649c92 - Added check for malformed class::method syntax 2013-11-12 11:39:02 -02:00
Felipe Pena b133dbefe0 Merge branch 'master' of github.com:krakjoe/phpdbg 2013-11-12 11:34:09 -02:00
Felipe Pena af90b6d5c7 - Improved breakpoint code 2013-11-12 11:33:51 -02:00
krakjoe 4269b29c03 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-12 13:23:54 +00:00
krakjoe 277b10a5c0 ... 2013-11-12 13:21:55 +00:00
Felipe Pena fdf26eaa0f - Removed name member to opline breakpoints 2013-11-12 11:07:35 -02:00
Felipe Pena fe7a3ef578 Merge branch 'master' of github.com:krakjoe/phpdbg 2013-11-12 10:58:30 -02:00
Felipe Pena ffad3fa211 - Implemented "break N" where N is the line number on the current file 2013-11-12 10:58:19 -02:00
krakjoe 3168b7b057 more windows 2013-11-12 12:38:04 +00:00
krakjoe 9e47ce64ac windows 2013-11-12 12:11:02 +00:00
krakjoe 6cc7a5784e windows 2013-11-12 12:10:53 +00:00
Anatol Belski e9c7342a80 Merge branch 'master' into str_size_and_int64 2013-11-12 10:57:47 +01:00
Anatol Belski ef1c2ffaf0 more fixes to spl 2013-11-12 10:56:01 +01:00
krakjoe 7f743e1fca ... 2013-11-12 09:52:59 +00:00
krakjoe 1d373be4fb updates to helpers 2013-11-12 09:26:26 +00:00
Anatol Belski ae1fb8dc4b fixes to spl 2013-11-12 10:22:06 +01:00
krakjoe 83852d3bb7 ... 2013-11-12 08:28:03 +00:00
krakjoe c00abb0e75 printer commands 2013-11-12 08:26:11 +00:00
krakjoe ff4c0c9397 ... 2013-11-12 07:09:07 +00:00
krakjoe 6c5831aa09 ... 2013-11-12 07:08:00 +00:00
krakjoe 25475ff95e ... 2013-11-12 07:01:28 +00:00
krakjoe 4b2490426f web-bootstrap example 2013-11-12 06:57:56 +00:00
krakjoe bb715ac77d ... 2013-11-12 06:47:33 +00:00
krakjoe f566a6136b additional list option, class methods 2013-11-12 06:43:23 +00:00
krakjoe a29c0e5c96 ... 2013-11-12 06:31:29 +00:00
krakjoe f452364060 ... 2013-11-12 06:29:54 +00:00
krakjoe fd0aeb5b53 ... 2013-11-12 06:05:24 +00:00
krakjoe 78418cc38c ... 2013-11-12 06:04:32 +00:00
krakjoe 4112330bb5 colourfulness 2013-11-12 06:03:37 +00:00
krakjoe 12926b6aa9 ... 2013-11-12 04:54:41 +00:00
krakjoe 6c317b771e more command line options 2013-11-12 04:53:04 +00:00
krakjoe bf8a9c141f readline 2013-11-12 04:22:33 +00:00
krakjoe 33f0502f19 readline support #6 2013-11-12 04:20:14 +00:00
krakjoe 97d4052bb8 ... 2013-11-12 03:14:56 +00:00
krakjoe 08973a6bf5 ... 2013-11-12 03:04:12 +00:00
krakjoe 3097c36f30 more help 2013-11-12 03:02:42 +00:00
krakjoe ed690e1899 ... 2013-11-12 02:59:10 +00:00
krakjoe 94c32c7256 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-12 02:52:54 +00:00
Felipe Pena 5785df4957 Merge branch 'master' of github.com:krakjoe/phpdbg 2013-11-12 00:54:35 -02:00
Felipe Pena f704fdea57 - Not needed strlen() here 2013-11-12 00:54:22 -02:00
krakjoe 32acf4736b ... 2013-11-12 02:52:43 +00:00
krakjoe 69a8403175 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-12 02:50:44 +00:00
krakjoe b9c1c872f6 ... 2013-11-12 02:50:24 +00:00
Felipe Pena 6658f58d4a - Added phpdbg_is_empty function 2013-11-12 00:50:15 -02:00
krakjoe 79ab9a3f74 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-12 02:35:29 +00:00
krakjoe 8c91727484 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-12 02:35:07 +00:00
Felipe Pena bd432b995e - Update list cmd description 2013-11-12 00:34:10 -02:00
krakjoe c7b51537a0 fix 2013-11-12 02:29:56 +00:00
Felipe Pena 6aad2ee42c - Fix function 2013-11-12 00:28:52 -02:00
Felipe Pena 629b96295e - Fix conflict 2013-11-12 00:25:30 -02:00
Felipe Pena e32d511cec - Added "list func" support 2013-11-12 00:19:43 -02:00
krakjoe d7e09f9564 blurb/version/issues string 2013-11-12 02:04:54 +00:00
krakjoe fa3056c833 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-12 01:58:39 +00:00
krakjoe c2365d8283 compress globals 2013-11-12 01:51:50 +00:00
Felipe Pena 77cb82dd22 Merge branch 'master' of github.com:krakjoe/phpdbg 2013-11-11 23:41:29 -02:00
Felipe Pena 8ec5d30097 - Added PHPDBG_BP_MASK macro 2013-11-11 23:41:14 -02:00
krakjoe 8de21cb2e2 [Not running] 2013-11-12 01:31:51 +00:00
Felipe Pena 9d18e1dc3e Merge branch 'master' of github.com:krakjoe/phpdbg 2013-11-11 23:31:08 -02:00
krakjoe 8586a1b4cc ... 2013-11-12 01:27:48 +00:00
krakjoe 749e0cfc36 condense globals
introduce flags
sensible silence and stepping
2013-11-12 01:24:53 +00:00
krakjoe 0a6804a986 ... 2013-11-12 00:47:27 +00:00
krakjoe ef134e585f ... 2013-11-12 00:40:40 +00:00
krakjoe 179debd730 ... 2013-11-12 00:36:00 +00:00
Felipe Pena c9c61da288 Merge branch 'master' of github.com:krakjoe/phpdbg 2013-11-11 22:33:26 -02:00
Felipe Pena 217c906ea5 - Improve error message and added check for fstat return 2013-11-11 22:33:17 -02:00
krakjoe 95d33c18a0 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-12 00:28:48 +00:00
krakjoe e0cbd92fa4 break on class methods
don't dtor eval'd retval
more reliable break on methods
2013-11-12 00:27:48 +00:00
Felipe Pena bbc35b60f9 - Added check for no context file 2013-11-11 22:24:24 -02:00
Anatol Belski 266a428a59 use appropriate seek() and tell() on _WIN64 2013-11-12 00:41:58 +01:00
Felipe Pena 36d2329187 - Added initial code for list command 2013-11-11 21:40:03 -02:00
Anatol Belski f90fe17424 define platform dependent zend_off_t 2013-11-12 00:24:52 +01:00
Andrea Faulds 91779db95b Fixed case part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly") 2013-11-11 22:54:16 +00:00
Felipe Pena d61fa4cc52 Merge branch 'master' of github.com:krakjoe/phpdbg 2013-11-11 20:06:49 -02:00
Felipe Pena b5b7935d40 - Added lineno to breakpoint message 2013-11-11 20:06:36 -02:00
Felipe Pena dd4e962c56 - WS 2013-11-11 20:02:34 -02:00
krakjoe de3daf55c5 ... 2013-11-11 21:51:45 +00:00
krakjoe bce3481ed3 update 2013-11-11 17:37:59 +00:00
krakjoe 42eaa989af separation etc 2013-11-11 17:19:05 +00:00
krakjoe 5ef19b1b45 ws 2013-11-11 17:12:31 +00:00
krakjoe fb815caf7a fix segfault on empty eval 2013-11-11 17:09:08 +00:00
krakjoe f62b47c9ff fix opcode missing on eval 2013-11-11 17:06:30 +00:00
krakjoe 3c644612af typo 2013-11-11 17:01:33 +00:00
krakjoe 3e3a7babad stop multiple executions from occuring at once, #5 2013-11-11 15:54:33 +00:00
krakjoe da065d6fb2 no estrdup on opline breakpoints 2013-11-11 15:14:37 +00:00
krakjoe 632c89b65a fix output from userland break point insertion 2013-11-11 14:59:51 +00:00
krakjoe e8c98020ef fix breakpoint in userland 2013-11-11 14:55:36 +00:00
krakjoe 97fda0eaf2 precise break from userland 2013-11-11 14:38:11 +00:00
krakjoe 34ae94ad9a phpdbg_break userland 2013-11-11 14:33:53 +00:00
krakjoe dc3ef20964 ... 2013-11-11 14:11:06 +00:00
krakjoe 5fdae4612b ... 2013-11-11 14:07:07 +00:00
krakjoe 56957d9e25 output [] around phpdbg text 2013-11-11 14:03:14 +00:00
krakjoe 207e54a1c5 ... 2013-11-11 13:31:41 +00:00
Anatol Belski 570b1041e9 fixes to pow() 2013-11-11 14:23:58 +01:00
krakjoe be460647ef ... 2013-11-11 13:07:02 +00:00
krakjoe 764d7d492c fix break on opline 2013-11-11 13:04:21 +00:00
krakjoe 616cb9c35f ... 2013-11-11 12:09:57 +00:00
krakjoe 28848919cf break opline help 2013-11-11 12:07:11 +00:00
krakjoe 67dc98732e break on opline 2013-11-11 11:54:41 +00:00
Anatol Belski 2cbd452cfb fixed parse_url() 2013-11-11 12:49:57 +01:00
Anatol Belski ebc2816318 fixed range() 2013-11-11 11:52:44 +01:00
krakjoe cb24989f06 updates to break setting 2013-11-11 09:36:33 +00:00
krakjoe 3955dcf673 more output on setting break points
output breaks with print command
2013-11-11 09:14:30 +00:00
Anatol Belski c23baba693 fixed array_product() 2013-11-11 09:44:24 +01:00
Anatol Belski 7e20b13d86 fixed array_slice() 2013-11-11 09:40:29 +01:00
krakjoe 5f82f002f0 clean not destroy included files
remove argc, argv from phpdbg_interactive, unused
2013-11-11 08:08:26 +00:00
krakjoe b77508f250 noquit on fatal errors
clean command to clear environment
2013-11-11 08:02:04 +00:00
krakjoe b5da426776 ... 2013-11-10 23:44:16 +00:00
krakjoe f745c841b8 ... 2013-11-10 23:40:57 +00:00
krakjoe a6864679a2 ... 2013-11-10 23:38:55 +00:00
krakjoe 4f5096af3c register server vars 2013-11-10 23:30:52 +00:00
krakjoe 92c0fbebed ini working 2013-11-10 23:06:20 +00:00
krakjoe 4f9f86a15d update to default on 2013-11-10 22:55:07 +00:00
krakjoe aba249e5c7 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-10 22:46:49 +00:00
krakjoe 7de0b76ba8 ... 2013-11-10 22:44:28 +00:00
Felipe Pena 8ffa4025fb - Cosmetics 2013-11-10 20:04:22 -02:00
Felipe Pena f45f2ab8f8 - Fix comment 2013-11-10 20:01:40 -02:00
Felipe Pena 7886665b52 - Cosmetic changes 2013-11-10 19:57:43 -02:00
Felipe Pena e1931c14a5 - Move PHPDBG_NEXT to prompt header 2013-11-10 19:51:44 -02:00
krakjoe 587003ee48 exec last command automatically on enter 2013-11-10 21:49:37 +00:00
Felipe Pena 816925c7da Merge branch 'master' of github.com:krakjoe/phpdbg 2013-11-10 19:39:07 -02:00
Felipe Pena d141bf4ea8 - Get rid llist from symbol breakpoint 2013-11-10 19:38:58 -02:00
krakjoe 493e81e4c7 ... 2013-11-10 21:29:14 +00:00
krakjoe fedd47e383 ... 2013-11-10 21:28:12 +00:00
krakjoe 9ba19e8224 quiet 2013-11-10 21:23:18 +00:00
Adam Harvey 91cb087727 Merge branch 'PHP-5.6'
* PHP-5.6:
  Update NEWS and remove the unnecessary UPGRADING note.
  UPGRADING and NEWS
  Better test: Check combined leading/trailing
  Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")
2013-11-10 16:16:38 -05:00
krakjoe 26ec44350e ... 2013-11-10 21:15:45 +00:00
Adam Harvey 1205a6c7dc Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Update NEWS and remove the unnecessary UPGRADING note.
  UPGRADING and NEWS
  Better test: Check combined leading/trailing
  Fixed whitespace part of bug #64874 ("json_decode handles whitespace and case-sensitivity incorrectly")
2013-11-10 16:15:12 -05:00
krakjoe 7d99241455 ... 2013-11-10 21:12:41 +00:00
krakjoe 1591b0e5f6 remove cont 2013-11-10 21:09:35 +00:00
krakjoe 6203c96061 ... 2013-11-10 21:07:29 +00:00
krakjoe 05c9f82a15 ... 2013-11-10 20:59:35 +00:00
Felipe Pena ac0ecc476c - Fix code 2013-11-10 19:00:58 -02:00
krakjoe 52f9c52475 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-10 20:30:32 +00:00
Felipe Pena fb4f94c52c - Improved phpdbg_set_breakpoint_symbol function 2013-11-10 18:30:24 -02:00
krakjoe dd141fa085 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-10 20:30:18 +00:00
Felipe Pena 3414680557 - Improved phpdbg_set_breakpoint_file function 2013-11-10 18:24:13 -02:00
Felipe Pena eaf5d89292 - Change breakpoint id to int 2013-11-10 18:10:54 -02:00
Felipe Pena 972550a120 - Change header inclusion order 2013-11-10 18:07:56 -02:00
Felipe Pena 5b6982796d - Renamed breakpoint find functions 2013-11-10 18:06:19 -02:00
Felipe Pena 20f37407e1 - Added separated file to opcode decode function 2013-11-10 18:01:09 -02:00
Felipe Pena 1fcc54a6b8 - Added breakpoint counter 2013-11-10 17:15:32 -02:00
krakjoe 663a13635a fix symbol breakpoints 2013-11-10 18:56:19 +00:00
krakjoe fa63ecbba9 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-10 18:29:04 +00:00
Felipe Pena aedf45252f - WS changes 2013-11-10 16:29:05 -02:00
krakjoe cc85f285c6 print opcode names 2013-11-10 18:28:50 +00:00
Felipe Pena 7752077b63 - Added prototype for breakpoint funcs 2013-11-10 16:24:08 -02:00
Felipe Pena ddf5c42e2d - Cosmetic changes 2013-11-10 16:21:49 -02:00
Felipe Pena 226052fb8a - Simplify code 2013-11-10 16:15:00 -02:00
Felipe Pena a7309b6d25 Merge branch 'master' of github.com:krakjoe/phpdbg 2013-11-10 16:10:38 -02:00
Felipe Pena 7d43677b1f - Fix code 2013-11-10 16:10:23 -02:00
krakjoe 4bfbdf55dc next not quitting when not stepping 2013-11-10 18:08:08 +00:00
Felipe Pena 9f15e3791a Merge branch 'master' of github.com:krakjoe/phpdbg 2013-11-10 16:06:56 -02:00
Felipe Pena defc4c3180 - Added separated file to handle breakpoint feature 2013-11-10 16:06:41 -02:00
krakjoe 38883e7cbb Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-10 18:05:30 +00:00
krakjoe 4d127e4afb print_opline function to decode opline 2013-11-10 18:05:11 +00:00
Anatol Belski 57ce464a1c fixed *scanf() family 2013-11-10 18:59:07 +01:00
krakjoe bd02c250b8 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-10 17:51:58 +00:00
krakjoe 307897e602 instructions 2013-11-10 17:51:48 +00:00
Felipe Pena 22f0ff6c12 - Fix conflict 2013-11-10 15:51:20 -02:00
Felipe Pena 16930d85f8 - Initial code for breakpoint on function 2013-11-10 15:49:25 -02:00
krakjoe 3716646d3c ... 2013-11-10 17:45:06 +00:00
Anatol Belski 094c93b6f8 fixed *printf() family 2013-11-10 18:02:25 +01:00
krakjoe c6f443db2e improve output from eval() 2013-11-10 16:47:39 +00:00
krakjoe 5f6c416b14 consistency 2013-11-10 16:34:12 +00:00
krakjoe 782ea75c9e ... 2013-11-10 16:33:35 +00:00
krakjoe 5cca4190f4 fix interference while quitting 2013-11-10 16:30:36 +00:00
Felipe Pena 8532076c64 - WS changes 2013-11-10 14:16:52 -02:00
Felipe Pena c060093acf - WS change 2013-11-10 14:12:43 -02:00
Anatol Belski b7705365a2 fix explode() 2013-11-10 17:09:51 +01:00
krakjoe 5971ab299b ... 2013-11-10 16:06:57 +00:00
krakjoe 9a15ea4d58 ... 2013-11-10 16:06:15 +00:00
krakjoe 22d85c6a63 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-10 16:05:23 +00:00
krakjoe 2f4acda67b ... 2013-11-10 16:05:15 +00:00
krakjoe 72a60589ec consistent help 2013-11-10 15:55:53 +00:00
krakjoe 4ef6705a74 correction to headers
backtrace help
2013-11-10 15:54:19 +00:00
krakjoe 940f4e27de backtrace 2013-11-10 15:49:35 +00:00
Felipe Pena 53f4201566 Merge branch 'master' of github.com:krakjoe/phpdbg 2013-11-10 13:47:37 -02:00
Felipe Pena 6069121e23 - Added llist dtor 2013-11-10 13:47:28 -02:00
krakjoe 48f9db90dd cont 2013-11-10 15:32:24 +00:00
krakjoe 2770068e76 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-10 15:21:48 +00:00
Felipe Pena 9552817864 - Get the realpath on break command 2013-11-10 13:21:20 -02:00
krakjoe 1b41ab2e34 Merge branch 'master' of https://github.com/krakjoe/phpdbg 2013-11-10 15:16:54 +00:00
krakjoe 2f9b34d4b6 backtrace 2013-11-10 15:16:45 +00:00
Felipe Pena a6d573cd89 Merge branch 'master' of github.com:krakjoe/phpdbg 2013-11-10 13:12:09 -02:00
Felipe Pena 23cfc8ed35 - More work on file:line breakpoint 2013-11-10 13:11:56 -02:00
krakjoe ac5063468a ... 2013-11-10 14:49:52 +00:00
krakjoe 2977840a4a eval() 2013-11-10 14:43:46 +00:00
Felipe Pena d772009921 - Breakpoint initial work 2013-11-10 12:36:30 -02:00
krakjoe 5c866a9f13 stepping 2013-11-10 14:28:14 +00:00
Anatol Belski 3069b384e1 Merge branch 'master' into str_size_and_int64 2013-11-10 15:14:03 +01:00
Anatol Belski c0b112c68d one more fix to pack/unpack 2013-11-10 14:40:00 +01:00
krakjoe 8043d1ee5f run help 2013-11-10 13:06:57 +00:00
Anatol Belski 7cf68266b3 fixed unpack 2013-11-10 14:02:38 +01:00
krakjoe c6cb411d39 execution 2013-11-10 13:01:46 +00:00
Anatol Belski 637e9fc5bb fix 64 bit integer values 2013-11-10 13:58:09 +01:00
Felipe Pena a366eadee2 - Renamed brake to break 2013-11-10 09:48:01 -02:00
Felipe Pena 9dd3e54351 - Cosmetic changes 2013-11-10 09:36:57 -02:00
krakjoe b978c20f63 +compile 2013-11-10 11:35:59 +00:00
krakjoe 6df19b3aa2 ... 2013-11-10 11:03:29 +00:00
krakjoe ad3aa32a2f woops 2013-11-10 10:46:18 +00:00
krakjoe 2089caed53 bit more work on menu
implement helper menu
name some macros to help with declarations (sorry Felipe :))
2013-11-10 10:44:42 +00:00
krakjoe 39263cbfb1 header in main 2013-11-10 08:20:57 +00:00
Remi Collet fac240b5d1 Merge branch 'PHP-5.6'
* PHP-5.6:
  missing 'config.h' in 5dc37b3
2013-11-10 07:10:48 +01:00
Remi Collet 6997b8793d missing 'config.h' in 5dc37b3 2013-11-10 07:10:36 +01:00
Felipe Pena 2bda09abc6 - Added prototype for non-static function, fixed typo and staticfy command handler 2013-11-09 23:42:41 -02:00
Felipe Pena 19c16083a7 - WS change 2013-11-09 23:38:17 -02:00
Felipe Pena 612d6b2582 - Added initial code for a simple prompt 2013-11-09 23:30:32 -02:00
Felipe Pena 1c7ae5f1a6 - Declaration first 2013-11-09 22:34:38 -02:00
Felipe Pena f16ccad2ff - Fixed unexpected memory leak warning 2013-11-09 21:33:43 -02:00
Felipe Pena 8ac55d018c - Added .gitignore 2013-11-09 21:08:01 -02:00
Felipe Pena 19a5ac93b4 - WS changes 2013-11-09 21:07:04 -02:00
krakjoe 1dd5d42bd8 cleanup 2013-11-09 22:53:27 +00:00
krakjoe 60ee0cc74c change server->phpdbg 2013-11-09 22:47:39 +00:00
krakjoe 2fee7dce77 import 2013-11-09 22:35:03 +00:00
Joe Watkins dac2297b10 Initial commit 2013-11-09 14:34:16 -08:00
Igor Wiedler 611da37617 use ZVAL_ZVAL to init ZVAL from ZVAL 2013-11-09 13:48:23 -05:00
Rasmus Lerdorf 7e01935dc2 Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix broken test

Conflicts:
	NEWS
2013-11-09 09:49:09 -08:00
Rasmus Lerdorf 6713f9c4b2 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix broken test
2013-11-09 09:46:55 -08:00
Adam Harvey 90d4ae4da8 Make all code paths in json_determine_array_type() return constants.
This is a purely cosmetic change, but the current behaviour of returning
PHP_JSON_OUTPUT_ARRAY and 1 looks weird.
2013-11-09 12:15:37 -05:00
Anatol Belski 36cbe38201 reverted compare funcs and return values, should be int anyway 2013-11-09 13:16:15 +01:00
Anatol Belski ad675f6ac2 Merge branch 'master' into str_size_and_int64
Conflicts:
	main/php_version.h
2013-11-09 11:03:04 +01:00
Anatol Belski 7c5af3884a fix index insert 2013-11-09 10:56:51 +01:00
Anatol Belski c58f9eea11 fix array related compare functions 2013-11-09 10:30:55 +01:00
Anatol Belski c2e228b77d too much for a compare func 2013-11-09 09:18:42 +01:00
Igor Wiedler eb063e0075 Merge remote-tracking branch 'lgnome/use-function' into use-function
* lgnome/use-function:
  Only check user functions for filenames.
2013-11-08 21:50:04 -05:00
Adam Harvey cc049e6450 Only check user functions for filenames. 2013-11-08 21:49:05 -05:00
Igor Wiedler 719db1a7b2 Merge pull request #4 from LawnGnome/use-function
FIX ALL THE THINGS
2013-11-08 18:39:29 -08:00
Adam Harvey da553a8166 Fix constant resolution. 2013-11-08 21:37:38 -05:00
Adam Harvey 95675dfba9 Remove now unused function_filenames struct. 2013-11-08 21:32:09 -05:00
Adam Harvey 1ea01f55db Look in the function_table instead of function_filenames for actually declared
functions.
2013-11-08 21:29:23 -05:00
Adam Harvey 9711c58bc4 Stop PHP from modifying the lowercase function name in place. 2013-11-08 20:26:46 -05:00
Anatol Belski 27a86a4402 fixed 64 bit pass by ref 2013-11-09 02:09:14 +01:00
Igor Wiedler 24e0b99103 Merge remote-tracking branch 'upstream/PHP-5.6' into use-function
* upstream/PHP-5.6: (399 commits)
  Fixed issue #115 (path issue when using phar). Fixed issue #149 (Phar mount points not working with OPcache enabled).
  Added tests for PHAR/OPCahce incompatibilities
  Update NEWS
  Fixed bug #65947 (basename is no more working after fgetcsv in certain situation)
  Update NEWS
  Fixed Bug #66043 (Segfault calling bind_param() on mysqli)
  NEWS entry
  NEWS entry
  Fix bug #65946 - pdo_sql_parser.c permanently converts values bound to strings
  bump API versions
  Add a couple more test cases to parse_url() tests
  fix missing change from 'tcp_socket' to the more common 'server'
  fix many parallel test issues
  Cleanup temp test file
  Revert "Fixed issue #115 (path issue when using phar)."
  Update LiteSpeed SAPI code to V6.4
  Fixed typo in Makefile.frag
  updated NEWS
  Remove outdate codes, make it clearer, although just a bit..
  Update NEWS
  ...

Conflicts:
	Zend/zend_compile.h
2013-11-08 19:14:58 -05:00
Anatol Belski 5615326e1f fixed fetching $this 2013-11-08 22:36:30 +01:00
Dmitry Stogov 43cb6ba763 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed issue #115 (path issue when using phar). Fixed issue #149 (Phar mount points not working with OPcache enabled).

Conflicts:
	NEWS
2013-11-08 16:37:28 +04:00
Dmitry Stogov 0e5c5072e6 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed issue #115 (path issue when using phar). Fixed issue #149 (Phar mount points not working with OPcache enabled).

Conflicts:
	NEWS
2013-11-08 16:36:31 +04:00
Dmitry Stogov 8f097fb466 Merge branch 'PHP-5.6'
* PHP-5.6:
  Added tests for PHAR/OPCahce incompatibilities

Conflicts:
	NEWS
2013-11-08 14:16:40 +04:00
Dmitry Stogov 4e6a0bd5a9 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Added tests for PHAR/OPCahce incompatibilities
  Update NEWS
  Fixed bug #65947 (basename is no more working after fgetcsv in certain situation)
  Update NEWS
  Fixed Bug #66043 (Segfault calling bind_param() on mysqli)
  NEWS entry
  NEWS entry

Conflicts:
	NEWS
2013-11-08 14:15:41 +04:00
Xinchen Hui 6357cdaecf Merge branch 'PHP-5.5' 2013-11-08 15:33:57 +08:00
Xinchen Hui 4c13992f0d Merge branch 'PHP-5.5' 2013-11-08 15:09:08 +08:00
Rasmus Lerdorf 911ba0293a Merge branch 'PHP-5.6'
* PHP-5.6:
  Fix bug #65946 - pdo_sql_parser.c permanently converts values bound to strings
  bump API versions
2013-11-07 18:10:39 -08:00
Rasmus Lerdorf 756dc19e59 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix bug #65946 - pdo_sql_parser.c permanently converts values bound to strings
2013-11-07 18:09:53 -08:00
Anatol Belski 11d4bcd706 remaining replacements ulong vs zend_uint_t 2013-11-07 19:41:57 +01:00
Anatol Belski df312c5ddf fix macros 2013-11-07 18:24:06 +01:00
Anatol Belski de99f93aa5 fix datatype for hash vars 2013-11-07 17:47:48 +01:00
Rasmus Lerdorf 308edceb51 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src: (304 commits)
  OCI8 build change: Fix source variable definition for C89 compatibility
  bump version, empty NEWS, UPGRADING and UPGRADING.INTERNALS
  bump API versions
  configure output alignment
  Add a couple more test cases to parse_url() tests
  fix missing change from 'tcp_socket' to the more common 'server'
  fix many parallel test issues
  Cleanup temp test file
  Revert "Fixed issue #115 (path issue when using phar)."
  Update LiteSpeed SAPI code to V6.4
  Fixed typo in Makefile.frag
  updated NEWS
  Remove outdate codes, make it clearer, although just a bit..
  Update NEWS
  Fixed Bug #66034 (Segmentation Fault when constructor of PDO statement throws an exception)
  NEWS + UPGRADING
  Sync ext/zip with pecl/zip version 1.3.2 - update libzip to version 1.11.1. We don't use any private symbol anymore - new method ZipArchive::setPassword($password) - add --with-libzip option to build with system libzip
  Fixed coredump due to abnormal implemention of phar
  Fix English here
  limit virtual_cwd_activate() duplicated call to ZTS only
  ...
2013-11-07 07:55:44 -08:00
Bob Weinand 152898ff28 Moved arrays again to "static_scalar:" & little cleanup 2013-11-07 16:39:47 +01:00
Anatol Belski 98c6e0d535 first shot for 64 bit array indexes, more broken things to fix 2013-11-07 14:03:36 +01:00
Dmitry Stogov e0135014c3 Renaming 2013-11-07 10:22:49 +04:00
Christopher Jones 0d506131af OCI8 build change: Fix source variable definition for C89 compatibility 2013-11-06 10:37:22 -08:00
Dmitry Stogov 9647c61dc1 Constant expressions refactoring 2013-11-06 22:21:07 +04:00
Ferenc Kovacs d17b684b91 bump version, empty NEWS, UPGRADING and UPGRADING.INTERNALS 2013-11-06 14:03:24 +01:00
Ferenc Kovacs 117955daf6 bump API versions 2013-11-06 14:03:24 +01:00
Remi Collet 1d93f396bb configure output alignment 2013-11-06 13:38:53 +01:00
Dmitry Stogov af600c240d Merge branch 'const_scalar_exprs' of github.com:bwoebi/php-src into const_scalar_exprs
* 'const_scalar_exprs' of github.com:bwoebi/php-src:
  Removed operations on constant arrays. They make no sense as constants are not allowed to be arrays. And as just properties are allowed to; no problem, we still don't need operations on any constant array.
  Added a few more operators
  Whitespace fix
  converted several switches to ifs and made more opcache friendly
  Fatal error about self referencing constants fixed
  Fixed mem leaks, added tests and ternary operator
  Working commit for constant scalar expressions (with constants). Tests will follow.

Conflicts:
	Zend/Makefile.am
	configure.in
	win32/build/config.w32
2013-11-06 15:41:33 +04:00
Ferenc Kovacs 929bf11e91 bump API versions 2013-11-06 11:17:58 +01:00
Ferenc Kovacs d87388ba0f Merge branch 'PHP-5.5' 2013-11-06 10:47:45 +01:00
Xinchen Hui c76be5696d Merge branch 'PHP-5.5'
Conflicts:
	ext/opcache/ZendAccelerator.c
2013-11-06 17:01:24 +08:00
George Wang 01bc13212e Update LiteSpeed SAPI code to V6.4 2013-11-05 16:14:49 -05:00
George Wang 3720fd77b5 Fixed typo in Makefile.frag 2013-11-05 16:12:24 -05:00
Anatol Belski c4cfdfa911 updated NEWS 2013-11-05 19:54:50 +01:00
Anatol Belski c675980046 Merge branch 'pull-request/500'
* pull-request/500:
  limit virtual_cwd_activate() duplicated call to ZTS only
  reverted the previous commit, both calls are needed in TS mode
  virtual_cwd_activate() should be called only in one place
  back to do_alloca()
  removed unnecessary call
  simplify the state free macros
  compact the code to preserve the error info after state freeing
  back to do_alloca(), reverted the wrong replacement
  enabled windows to use stack in both ts/nts mode, some more fixes
  moved to do_alloca() usage where appropriate
  fixed invalid free
  fixed virtual cwd header in phar
  updated NEWS
  fixed all the places where last error could be lost
  preserve the error code
  applied and fixed the original patch
  initial move on renaming files and fixing includes

Conflicts:
	ext/opcache/ZendAccelerator.c
2013-11-05 19:23:23 +01:00
Xinchen Hui 6c8ff0031c Merge branch 'PHP-5.5'
Conflicts:
	ext/phar/phar_internal.h
	ext/phar/stream.c
	ext/phar/util.c
2013-11-05 19:29:13 +08:00
Xinchen Hui 2a94494b7e Merge branch 'PHP-5.5' 2013-11-05 11:09:08 +08:00
Pierre Joye bf875e269a Merge branch 'master' of git.php.net:php-src
# By Remi Collet (2) and Xinchen Hui (2)
# Via Xinchen Hui (5) and Remi Collet (1)
* 'master' of git.php.net:php-src:
  NEWS + UPGRADING
  Sync ext/zip with pecl/zip version 1.3.2 - update libzip to version 1.11.1. We don't use any private symbol anymore - new method ZipArchive::setPassword($password) - add --with-libzip option to build with system libzip
  Fixed coredump due to abnormal implemention of phar
  remove "PHP 6" staff
2013-11-04 22:26:40 +01:00
Anatol Belski dd360d6336 use max int to out the array index 2013-11-04 19:49:41 +01:00
Remi Collet 5b8ae0143f NEWS + UPGRADING 2013-11-04 13:32:45 +01:00
Remi Collet 5dc37b3510 Sync ext/zip with pecl/zip version 1.3.2
- update libzip to version 1.11.1. We don't use any private symbol anymore
- new method ZipArchive::setPassword($password)
- add --with-libzip option to build with system libzip
2013-11-04 13:23:36 +01:00
Anatol Belski 446cfd3e1c fix stream_wrapper_register() 2013-11-04 11:12:10 +01:00
Anatol Belski 48e63da659 fixes to array funcs 2013-11-04 10:45:58 +01:00
Anatol Belski 642a8b870a Fixes mem size format for error msg, fixes also Zend\tests\bug55509.phpt 2013-11-04 09:57:29 +01:00
Anatol Belski e243a26b4c Merge branch 'master' into str_size_and_int64
* master: (30 commits)
  Fixed coredump due to abnormal implemention of phar
  Fix English here
  Fix bug #66008
  Removed unnecessary GC checks
  Add crypt() change in UPGRADING
  Fix bug #65997 by switching to Serializable for GMP
  Fix compile warning in GMP
  Fix ZTS build
  updated libs_versions.txt
  Implemented Change crypt() behavior w/o salt RFC
  Update NEWS
  Update NEWS
  Fixed Bug 64760 var_export() does not use full precision for floating-point numbers
  add bundled libzip LICENSE, as required by BSD License terms
  Avoid copy in func_get_arg()
  - Updated to version 2013.8 (2013h)
  Use zval* instead of zval**
  Increased limit for opcache.max_accelerated_files to 1,000,000. (Chris)
  Improved performance of array_merge() by eliminating useless copying
  Improved performance of func_get_args() by eliminating useless copying
  ...

Conflicts:
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
2013-11-04 09:19:52 +01:00
Xinchen Hui 2f555b8e60 Merge branch 'master' of git.php.net:php-src 2013-11-04 14:47:34 +08:00
Xinchen Hui 15eabbb436 Merge branch 'PHP-5.5' 2013-11-04 14:43:30 +08:00
Bob Weinand 18e2b1a9a9 Removed operations on constant arrays.
They make no sense as constants are not allowed to be arrays.
And as just properties are allowed to; no problem, we still don't
need operations on any constant array.
2013-11-03 12:28:00 +01:00
Bob Weinand ad967e1329 Added a few more operators 2013-11-03 01:58:39 +01:00
Rasmus Lerdorf e5e25c43f4 Fix English here 2013-11-02 10:46:37 -07:00
Anatol Belski 699f07ba44 limit virtual_cwd_activate() duplicated call to ZTS only 2013-11-02 13:32:31 +01:00
Bob Weinand 82cd3779f4 Whitespace fix 2013-11-01 16:49:23 +01:00
Bob Weinand b45043a1b7 converted several switches to ifs and made more opcache friendly 2013-11-01 16:16:58 +01:00
Anatol Belski 9df78bf9fd reverted the previous commit, both calls are needed in TS mode 2013-11-01 01:20:57 +01:00
Anatol Belski 6aedfac7f7 virtual_cwd_activate() should be called only in one place 2013-11-01 00:56:22 +01:00
Anatol Belski 39e7dcc3bb back to do_alloca() 2013-10-31 21:42:55 +01:00
Anatol Belski f1c2f8f9f1 removed unnecessary call 2013-10-31 21:38:24 +01:00
Bob Weinand b56c1ca95e Fatal error about self referencing constants fixed 2013-10-31 19:05:29 +01:00
Bob Weinand 466c5dd1fe Fixed mem leaks, added tests and ternary operator 2013-10-31 18:21:37 +01:00
Anatol Belski 4d430ecb02 simplify the state free macros 2013-10-31 17:39:17 +01:00
Rasmus Lerdorf a0244a69cc Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix bug #66008
2013-10-31 03:18:36 -07:00
Bob Weinand 2361745806 Working commit for constant scalar expressions (with constants).
Tests will follow.
2013-10-31 08:57:12 +01:00
Dmitry Stogov 3b2ca392f1 Removed unnecessary GC checks 2013-10-31 11:33:39 +04:00
Yasuo Ohgaki 832c82603f Add crypt() change in UPGRADING 2013-10-31 07:29:00 +09:00
Anatol Belski abb962d54d compact the code to preserve the error info after state freeing 2013-10-30 20:46:08 +01:00
Anatol Belski fc707a27ff back to do_alloca(), reverted the wrong replacement 2013-10-30 20:13:14 +01:00
Sherif Ramadan 98c9e56ef0 Merge branch 'pull-request/287'
Add ability to use array keys with array_filter().
This adds a third (optional) argument to array_filter() that will determine
what gets passed to the callback, the array key, value or both.
The third argument can be one of two constants: ARRAY_FILTER_USE_BOTH or,
ARRAY_FILTER_USE_KEY.
2013-10-30 09:36:19 -04:00
Nikita Popov 4218e89f8d Fix bug #65997 by switching to Serializable for GMP
Rather than using get_properties and __wakeup for serialization
the code now uses Serializable::serialize() and
Serializable::unserialize(). The get_properties handler is switched
to a get_debug_info handler. Thus get_gc will now return only
the normal properties and not do any modifications, thus fixing
the leak. This also avoids a $num property from being publicly
visible after the object was dumped or serialized, so that's an
extra plus.
2013-10-29 20:58:30 +01:00
Nikita Popov 647e0be64b Fix compile warning in GMP 2013-10-29 20:07:34 +01:00
Nikita Popov 82eca388d2 Fix ZTS build 2013-10-29 20:01:37 +01:00
Anatol Belski e17de5e9fd Merge branch 'bug50333' of github.com:weltling/php-src into bug50333 2013-10-29 17:15:40 +01:00
Anatol Belski 4295bfeeaf Merge branch 'PHP-5.5'
* PHP-5.5:
  updated libs_versions.txt
2013-10-29 13:35:38 +01:00
Yasuo Ohgaki 416f8fce5c Implemented Change crypt() behavior w/o salt RFC 2013-10-29 18:53:45 +09:00
Yasuo Ohgaki 3cf2682083 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed Bug 64760 var_export() does not use full precision for floating-point numbers
2013-10-29 17:30:58 +09:00
Yasuo Ohgaki 5c89d5a539 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src: (22 commits)
  add bundled libzip LICENSE, as required by BSD License terms
  Avoid copy in func_get_arg()
  - Updated to version 2013.8 (2013h)
  Use zval* instead of zval**
  Increased limit for opcache.max_accelerated_files to 1,000,000. (Chris)
  Improved performance of array_merge() by eliminating useless copying
  Improved performance of func_get_args() by eliminating useless copying
  fix limitation of upload size == (U)INT_MAX in CGI
  Link to more readmes
  test commit
  increase backlog to the highest value everywhere
  Update NEWS
  Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
  - test3
  - test commit 2
  - test commit1
  ldap_escape() notes
  - Updated to version 2013.7 (2013g)
  Increment version number, since this will be 5.5.6.
  Added Zend Debugger to the note about the load order (by trash4you at online dot de)
  ...
2013-10-29 17:30:47 +09:00
Remi Collet 141b77d97d Merge branch 'PHP-5.5'
* PHP-5.5:
  add bundled libzip LICENSE, as required by BSD License terms
2013-10-29 09:02:58 +01:00
Nikita Popov d86b5f01ac Avoid copy in func_get_arg()
Complements dmitry's change to func_get_args()
2013-10-28 19:51:31 +01:00
Derick Rethans f626db130c Merge branch 'PHP-5.5' 2013-10-28 15:12:38 +01:00
Derick Rethans 8d8e8a43de Merge branch 'master' of git.php.net:/php-src 2013-10-28 15:02:37 +01:00
Dmitry Stogov 592be912c2 Merge branch 'PHP-5.5'
* PHP-5.5:
  Use zval* instead of zval**

Conflicts:
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
2013-10-28 15:23:10 +04:00
Dmitry Stogov ace2ee931c Merge branch 'PHP-5.5'
* PHP-5.5:
  Increased limit for opcache.max_accelerated_files to 1,000,000. (Chris)

Conflicts:
	NEWS
2013-10-28 14:22:05 +04:00
Dmitry Stogov c6fb00e6d7 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  increase backlog to the highest value everywhere
  Update NEWS
  Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
2013-10-28 13:48:02 +04:00
Dmitry Stogov b0f9768e02 Merge branch 'PHP-5.5'
* PHP-5.5:
  Improved performance of array_merge() by eliminating useless copying

Conflicts:
	NEWS
2013-10-28 13:47:37 +04:00
Antony Dovgal 09ad5fbbb3 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Improved performance of func_get_args() by eliminating useless copying
  fix limitation of upload size == (U)INT_MAX in CGI
  Link to more readmes
  test commit
  Update NEWS
  Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
2013-10-28 13:46:40 +04:00
Yasuo Ohgaki 4bdac868da Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Improved performance of func_get_args() by eliminating useless copying
  fix limitation of upload size == (U)INT_MAX in CGI
  Link to more readmes
  test commit
  - test3
  - test commit 2
  - test commit1
2013-10-28 18:36:51 +09:00
Anatol Belski 1ba7ceee17 fixed hex integer interpretation 2013-10-28 10:27:36 +01:00
Anatol Belski 0c21ecf159 force the multiply macros to use zend_int_t 2013-10-28 10:26:39 +01:00
Dmitry Stogov 9bbdc90ed2 Merge branch 'PHP-5.5'
* PHP-5.5:
  Improved performance of func_get_args() by eliminating useless copying

Conflicts:
	NEWS
2013-10-28 13:19:08 +04:00
Anatol Belski 3889019638 Merge branch 'master' into str_size_and_int64
* master:
  fix limitation of upload size == (U)INT_MAX in CGI
  Link to more readmes
  test commit
  - test3
  - test commit 2
  - test commit1
2013-10-28 09:10:55 +01:00
Michael Wallner 8962f3ff0c fix limitation of upload size == (U)INT_MAX in CGI 2013-10-28 07:37:47 +01:00
Hannes Magnusson d1727d8401 Merge branch 'PHP-5.5'
* PHP-5.5:
  Link to more readmes
2013-10-27 16:41:31 -07:00
Rasmus Lerdorf 8da5734cf5 test commit 2013-10-27 15:21:21 -07:00
Antony Dovgal 73788d1c23 Merge branch 'PHP-5.5'
* PHP-5.5:
  increase backlog to the highest value everywhere
2013-10-27 22:57:31 +04:00
Anatol Belski d5e835737c fixed binary int representation 2013-10-27 16:41:38 +01:00
Anatol Belski 20ff7a2d68 some strtol replacements 2013-10-27 11:05:40 +01:00
Xinchen Hui 7fe370f9c7 Merge branch 'PHP-5.5' 2013-10-27 16:53:35 +08:00
Anatol Belski 23390de0e7 fix strlen macros 2013-10-26 11:48:19 -07:00
Derick Rethans 59f4c351d3 Merge branch 'master' of git.php.net:/php-src 2013-10-26 09:53:34 +01:00
Yasuo Ohgaki 37fb8e0c15 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
2013-10-26 10:43:14 +09:00
Sascha Schumann 8cef677dc3 - test3 2013-10-25 21:34:28 +02:00
Sascha bf087d85af - test commit 2 2013-10-25 21:26:58 +02:00
Sascha e53afaafcd - test commit1 2013-10-25 21:04:45 +02:00
Anatol Belski 4fc7dc6eae Merge branch 'master' into str_size_and_int64
* master: (79 commits)
  ldap_escape() notes
  Increment version number, since this will be 5.5.6.
  Added Zend Debugger to the note about the load order (by trash4you at online dot de)
  Added a LICENSE file to make it easier for PECL binary distributions to conform with the license.
  Fix Coverity issue reporting wrong sizeof()
  Fixed bug #65939 (Space before ";" breaks php.ini parsing). (brainstorm at nopcode dot org)
  exif NEWS
  add tests for bug #62523
  Merged PR #293 (Exif crash on unknown encoding was fixed) By: 	Draal Conflicts: 	configure.in 	main/php_version.h
  fix bug #65936 (dangling context pointer causes crash)
  remove TRAVIS check in test source
  Fixed compilation warning
  Just SKIP that test on travis
  Fixed issue #115 (path issue when using phar).
  fix memory leak on error (from Coverity scan)
  fix argument type & remove warning
  fix const warnings in intl methods
  Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
  fix possibility of access to *storedType without initialization
  Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
  ...

Conflicts:
	Zend/zend_compile.c
	ext/intl/collator/collator_create.c
	ext/intl/locale/locale_methods.c
	ext/intl/msgformat/msgformat_format.c
	ext/intl/msgformat/msgformat_parse.c
2013-10-25 04:19:27 -07:00
Anatol Belski 25dc4af392 enabled windows to use stack in both ts/nts mode, some more fixes 2013-10-24 08:48:09 -07:00
Anatol Belski 08f6a76b92 moved to do_alloca() usage where appropriate 2013-10-24 05:12:37 -07:00
Michael Wallner dfe4b15b8e ldap_escape() notes 2013-10-24 10:36:44 +02:00
Derick Rethans 20f7fcefdb Merge branch 'PHP-5.5' 2013-10-23 22:33:59 +01:00
Adam Harvey 96b6d4be49 Merge branch 'PHP-5.5'
* PHP-5.5:
  Increment version number, since this will be 5.5.6.

Conflicts:
	configure.in
	main/php_version.h
2013-10-23 12:39:16 -07:00
Xinchen Hui 5241cf7000 Merge branch 'PHP-5.5' 2013-10-23 19:27:48 +08:00
Christopher Jones e68c1ef2ec Added a LICENSE file to make it easier for PECL binary distributions to conform with the license. 2013-10-22 11:03:09 -07:00
Yasuo Ohgaki 29e5a9659f Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix Coverity issue reporting wrong sizeof()
2013-10-22 12:30:24 +09:00
Yasuo Ohgaki fa11c7c1cc Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src: (270 commits)
  Fixed bug #65939 (Space before ";" breaks php.ini parsing). (brainstorm at nopcode dot org)
  exif NEWS
  add tests for bug #62523
  Merged PR #293 (Exif crash on unknown encoding was fixed) By: 	Draal Conflicts: 	configure.in 	main/php_version.h
  fix bug #65936 (dangling context pointer causes crash)
  remove TRAVIS check in test source
  Fixed compilation warning
  Just SKIP that test on travis
  Fixed issue #115 (path issue when using phar).
  fix memory leak on error (from Coverity scan)
  fix argument type & remove warning
  fix const warnings in intl methods
  Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
  fix possibility of access to *storedType without initialization
  Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
  5.4.21 release date
  fix argument type & remove warning
  fix const warnings in intl methods
  When src->src is null this doesn't get initialized but it is still used, so the passed in *ze will point to unitialized memory. Hopefully src->src is never null, but just in case this initialization doesn't hurt.
  Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
  ...
2013-10-22 12:29:41 +09:00
Christopher Jones b3a2b44198 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #65939 (Space before ";" breaks php.ini parsing). (brainstorm at nopcode dot org)
2013-10-21 14:21:19 -07:00
Michael Wallner d15cedfba9 Merge branch 'PHP-5.5'
* PHP-5.5:
  exif NEWS
2013-10-21 22:45:12 +02:00
Michael Wallner cfd911473b Merge branch 'PHP-5.5'
* PHP-5.5:
  add tests for bug #62523
  Merged PR #293 (Exif crash on unknown encoding was fixed) By: 	Draal Conflicts: 	configure.in 	main/php_version.h
2013-10-21 22:16:21 +02:00
Anatol Belski 8591a52fab fixed invalid free 2013-10-21 11:15:31 -07:00
Antony Dovgal 605b3c2ca1 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix bug #65936 (dangling context pointer causes crash)
2013-10-21 15:10:15 +04:00
Michael Wallner 4ddbb7dd15 Merge remote-tracking branch 'refs/remotes/origin/master'
* refs/remotes/origin/master:
  Fixed compilation warning
2013-10-21 12:23:10 +02:00
Michael Wallner 6764993358 Merge branch 'PHP-5.5'
* PHP-5.5:
  remove TRAVIS check in test source
  Just SKIP that test on travis
2013-10-21 12:21:21 +02:00
Dmitry Stogov 02214e7a22 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed compilation warning
2013-10-21 14:18:17 +04:00
Michael Wallner 454a9fcb14 Merge branch 'master' of https://github.com/guggemand/php-src
* 'master' of https://github.com/guggemand/php-src:
  Dont reset other counters when incrementing slow_rq
2013-10-21 12:04:37 +02:00
Michael Wallner 41da537614 Merge branch 'master' of https://github.com/DylanArnold/php-src
* 'master' of https://github.com/DylanArnold/php-src:
  Call php_module_shutdown() for php-fpm child processes
2013-10-21 12:04:06 +02:00
Xinchen Hui aed56fc9a7 Merge branch 'PHP-5.5' 2013-10-21 17:41:03 +08:00
Stanislav Malyshev 19e8052be3 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix memory leak on error (from Coverity scan)
2013-10-21 00:02:33 -07:00
Stanislav Malyshev ae31a68774 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
  5.4.21 release date
  fix argument type & remove warning
  fix const warnings in intl methods
  Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
  fix possibility of access to *storedType without initialization
  5.4.21 release date
2013-10-20 23:04:41 -07:00
Stanislav Malyshev 3900ce97a3 fix argument type & remove warning 2013-10-20 23:04:38 -07:00
Stanislav Malyshev 06954d1bc1 fix const warnings in intl methods 2013-10-20 23:04:38 -07:00
Stanislav Malyshev 444612cdc4 Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag 2013-10-20 23:04:38 -07:00
Stanislav Malyshev 219a682e8e fix possibility of access to *storedType without initialization 2013-10-20 23:04:38 -07:00
Rasmus Lerdorf ec2e6951b8 Merge branch 'PHP-5.5'
* PHP-5.5:
  When src->src is null this doesn't get initialized but it is still used, so the passed in *ze will point to unitialized memory. Hopefully src->src is never null, but just in case this initialization doesn't hurt.
2013-10-20 22:18:33 -07:00
Rasmus Lerdorf 7ccffeea75 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix typo
2013-10-20 17:56:24 -07:00
Rasmus Lerdorf 73e65ea3c9 Merge branch 'PHP-5.5'
* PHP-5.5:
  These getpwnam('') tests are silly and not portable
2013-10-20 14:05:29 -07:00
Rasmus Lerdorf 7b2a4c168e Merge branch 'PHP-5.5'
* PHP-5.5:
  Clean up this weird safe_emalloc() call
2013-10-20 09:37:40 -07:00
Rasmus Lerdorf 32a729a3ae Merge branch 'PHP-5.5'
* PHP-5.5:
  Minor Coverity tweaks
2013-10-20 08:56:41 -07:00
Felipe Pena 048923b3c6 Merge branch 'PHP-5.5'
* PHP-5.5:
  - Moved NULL check before dereferencing
2013-10-20 09:50:17 -02:00
Felipe Pena d23f089fb9 Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fixed possible NULL ptr dereference
2013-10-20 09:04:36 -02:00
Felipe Pena b7c64683da Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fixed possible uninitialized scalar variable usage (spotted by Coverity)
2013-10-20 08:51:27 -02:00
Rasmus Lerdorf eb616f8c0f Merge branch 'PHP-5.5'
* PHP-5.5:
  Remove senseless check here
2013-10-19 20:57:02 -07:00
Felipe Pena ab7b0f9f43 Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fix extern declaration according to definition
2013-10-20 01:16:15 -02:00
Felipe Pena 84011f7c32 Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fix possible memory leak
2013-10-20 01:05:06 -02:00
Felipe Pena 39e746a424 Merge branch 'PHP-5.5'
* PHP-5.5:
  - Moved allocation to if block to make Coverity happy
2013-10-19 23:36:41 -03:00
Felipe Pena 07361a4efc Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fixed possible memory leak
2013-10-19 23:30:53 -03:00
Rasmus Lerdorf 6650bed41c Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix unitialized opened_path here - found by Coverity
2013-10-19 19:25:47 -07:00
Rasmus Lerdorf 259c74654c Merge branch 'PHP-5.5'
* PHP-5.5:
  Trivial Coverity fix
2013-10-19 17:56:21 -07:00
Rasmus Lerdorf 12aa4aa61c Merge branch 'PHP-5.5'
* PHP-5.5:
  Initialize these to make Coverity happy
  Typo fix: managment -> management
  Use minus sign instead of hyphen
  Merge branch 'pull-request/499' Fix RFC 6598 IPv4 Reserved Range Checks
2013-10-19 17:42:36 -07:00
Nikita Popov 9b46a15a6e Remove extraneous NULL check of Z_ARRVAL_P()
Z_ARRVAL_P() is never NULL
2013-10-19 23:52:23 +02:00
Nikita Popov 870d3e75ca Remove dead comparison (size_t < 0) 2013-10-19 23:46:09 +02:00
Nikita Popov 1292091670 Fix misleading sizeof
An array of zval* is allocated, but sizeof(zval **) is used.
Makes no practical difference as sizeof(zval *) == sizeof(zval **).
2013-10-19 23:43:05 +02:00
Nikita Popov a1ae79e114 Fix assignment in dummy_encoding_list_parser 2013-10-19 23:25:31 +02:00
Nikita Popov 64caedd927 Use zend_error_noreturn for all E_COMPILE_ERRORs 2013-10-19 23:22:20 +02:00
Xinchen Hui e1f9993ba8 Merge branch 'PHP-5.5' 2013-10-19 22:19:11 +08:00
Xinchen Hui b96bee6fdd Merge branch 'PHP-5.5' 2013-10-19 22:17:06 +08:00
Rasmus Lerdorf adcd481ddf Merge branch 'pull-request/499'
Fix RFC 6598 IPv4 Reserved Range Checks
2013-10-19 00:01:13 -07:00
Xinchen Hui 9a2aa11132 Merge branch 'PHP-5.5' 2013-10-19 13:29:42 +08:00
Anatol Belski ecd03baf61 fixed virtual cwd header in phar 2013-10-18 10:02:19 -07:00
Anatol Belski 423e1c77b5 updated NEWS 2013-10-18 07:57:01 -07:00
Anatol Belski 2786a2a1ab fixed all the places where last error could be lost
whereby this commit should be applied to master anyway
2013-10-18 07:00:05 -07:00
Anatol Belski 515ef09b62 preserve the error code
otherwise it'd be cleared by a subsequent calls
2013-10-18 05:01:16 -07:00
Michael Wallner c86862cb3c Merge branch 'openssl_compile_warning_fix' of https://github.com/bukka/php-src
* 'openssl_compile_warning_fix' of https://github.com/bukka/php-src:
  Fix compiler warnings in openssl.c
2013-10-18 12:03:02 +02:00
Michael Wallner a03b1328b8 fix compiler warnings and type usage 2013-10-18 11:34:24 +02:00
Michael Wallner f711c1219d Merge branch 'ldap_escape-dev' of https://github.com/DaveRandom/php-src
* 'ldap_escape-dev' of https://github.com/DaveRandom/php-src:
  Add ldap_escape()
2013-10-18 11:17:41 +02:00
jrchamp fd06c5206a Fix RFC 6598 IPv4 Range 2013-10-18 02:04:15 -04:00
jrchamp 8713089f22 Fix 100.64 IPv4 Range Check 2013-10-18 02:01:06 -04:00
Xinchen Hui d345ad211b Merge branch 'zend-documentation-fix' of https://github.com/AskDrCatcher/php-src-1 2013-10-18 10:40:44 +08:00
Xinchen Hui 065bbeb83f Merge branch 'PHP-5.5' 2013-10-18 10:34:59 +08:00
ArunSK 6b90f23787 fixed typo and few grammar mistakes 2013-10-17 22:00:40 -04:00
Christopher Jones 5e368b76ed Add missing test to package.xml 2013-10-17 13:49:50 -07:00
Christopher Jones c59d790949 Prepare for OCI8 2.0.5 release 2013-10-17 12:15:45 -07:00
Christopher Jones cefbf932c8 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  TLS news
  previous revert killed that file
  Revert "TLS news"
  Revert "Added support for TLSv1.1 and TLSv1.2"
  TLS news
  fix ws
  Added support for TLSv1.1 and TLSv1.2
  Added support for TLSv1.1 and TLSv1.2
2013-10-17 09:23:15 -07:00
Michael Wallner 66868c8fd4 TLS news 2013-10-17 15:47:55 +02:00
Michael Wallner b95f9fa0aa previous revert killed that file 2013-10-17 15:32:18 +02:00
Michael Wallner 3f2fba4c34 Merge branch 'updated_tls_support' of https://github.com/rdlowrey/php-src
* 'updated_tls_support' of https://github.com/rdlowrey/php-src:
  Added support for TLSv1.1 and TLSv1.2

Conflicts:
	ext/openssl/xp_ssl.c
2013-10-17 15:27:15 +02:00
Michael Wallner dd3a4c303b Merge branch 'PHP-5.5'
* PHP-5.5:
  Revert "TLS news"
  Revert "Added support for TLSv1.1 and TLSv1.2"
2013-10-17 15:22:07 +02:00
Michael Wallner e6481e2393 Merge branch 'PHP-5.5'
* PHP-5.5:
  TLS news
2013-10-17 15:13:25 +02:00
Michael Wallner ad0a85b9e2 fix ws 2013-10-17 15:09:28 +02:00
Michael Wallner 5a7ca69e56 Merge branch 'PHP-5.5'
* PHP-5.5:
  Added support for TLSv1.1 and TLSv1.2

Conflicts:
	ext/openssl/xp_ssl.c
2013-10-17 14:53:50 +02:00
Christopher Jones 134caeb837 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Assume the free space is correct on Travis CI.
2013-10-17 05:41:53 -07:00
Michael Wallner bd666e2f99 Merge branch 'PHP-5.5'
* PHP-5.5:
  Assume the free space is correct on Travis CI.
2013-10-17 12:12:26 +02:00
Anatol Belski cf6ab0e915 applied and fixed the original patch
initial work on the patch import done
2013-10-17 10:40:43 +02:00
Anatol Belski e30b2aae5a initial move on renaming files and fixing includes 2013-10-17 09:43:52 +02:00
Christopher Jones 89e93bd2a2 OCI8: More test updates 2013-10-16 22:33:34 -07:00
Christopher Jones 0d909f5bfc OCI8: Mostly SKIPIF version updates to simplify version checks at the expense of not testing some edge cases with older Oracle patch set versions.
Delete two obsolete .phpt's.
2013-10-16 22:02:32 -07:00
Xinchen Hui a1a7522105 Merge branch 'PHP-5.5' 2013-10-17 12:25:01 +08:00
Anatol Belski f0fdb82f83 bigger memory_limit should work now on 64 bit windows 2013-10-16 10:48:03 -07:00
Nikita Popov d51553e399 Merge branch 'PHP-5.5' 2013-10-16 18:39:13 +02:00
Anatol Belski 4a5fee1b36 fix broken master merge 2013-10-16 06:10:00 -07:00
Anatol Belski 4b6d784962 Merge branch 'str_size_and_int64' of https://github.com/weltling/php-src into str_size_and_int64
Conflicts:
	NEWS
	UPGRADING
	UPGRADING.INTERNALS
	Zend/zend_API.c
	Zend/zend_compile.c
	Zend/zend_compile.h
	Zend/zend_constants.h
	Zend/zend_exceptions.c
	Zend/zend_exceptions.h
	Zend/zend_execute.c
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner.l
	Zend/zend_operators.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/date/lib/parse_date.c
	ext/date/php_date.c
	ext/imap/config.m4
	ext/oci8/config.m4
	ext/oci8/oci8.c
	ext/oci8/oci8_dtrace.d
	ext/oci8/oci8_interface.c
	ext/oci8/oci8_lob.c
	ext/oci8/oci8_statement.c
	ext/oci8/package.xml
	ext/oci8/php_oci8.h
	ext/reflection/php_reflection.c
	ext/spl/spl_directory.c
	ext/spl/spl_fixedarray.c
	ext/standard/file.c
	ext/standard/http_fopen_wrapper.c
	ext/standard/info.c
	ext/standard/string.c
	main/php_variables.c
	main/streams/streams.c
2013-10-16 06:02:27 -07:00
Anatol Belski 4e537ca4ca fix broken merge from master 2013-10-16 03:38:14 -07:00
Stanislav Malyshev 941887359b 5.4.21 now 2013-10-16 03:21:55 -07:00
Dmitry Stogov ed36099a0b Fixed bug #65561 (Zend Opcache on Solaris 11 x86 needs ZEND_MM_ALIGNMENT=4). (Terry Ellison) 2013-10-16 03:21:49 -07:00
Anatol Belski 615756c8ab fixed ext/iconv 2013-10-16 03:20:34 -07:00
Joey Smith e6095aa4cb Expose fputcsv's escape_char to userland
Allows users to assert that something other than the backslash
should be considered an escape char; also follows the RFC 4180
recommendation that fields containing a " be enclosed.
2013-10-16 03:18:19 -07:00
Anatol Belski 983db235b0 fixed decrement 2013-10-16 03:14:25 -07:00
Anatol Belski 582f52c173 fixed numeric string comparsion 2013-10-16 03:14:24 -07:00
Anatol Belski c47840d92b some more linux fixes 2013-10-16 03:14:23 -07:00
Anatol Belski 8949c825c7 fixed configure.in 2013-10-16 03:14:22 -07:00
Anatol Belski 68ec5a9b89 ext/intl further fixes 2013-10-16 03:14:22 -07:00
Anatol Belski 866d33e1e9 ext/intl further converting 2013-10-16 03:14:21 -07:00
Anatol Belski 52a74bbdd6 more fixes to ext/intl 2013-10-16 03:14:20 -07:00
Anatol Belski 05593baf9a Z_STRLEN vs Z_STRSIZE in ext/intl 2013-10-16 03:14:20 -07:00
Anatol Belski 457f28c354 adapted args in ext/intl 2013-10-16 03:14:19 -07:00
Anatol Belski 9e4a7835c5 fixed the mb_regex* stuff 2013-10-16 03:14:18 -07:00
Anatol Belski 1f261538e8 fixed sapi filter usage 2013-10-16 03:14:17 -07:00
Anatol Belski 80d8037531 replaced all the arg formats and Z_STRLEN
won't work yet, just initial work to be done
2013-10-16 03:14:17 -07:00
Anatol Belski 659d7ca634 fixed set process_title() 2013-10-16 03:14:16 -07:00
Anatol Belski 84e13901b0 fix pcre usage in spl 2013-10-16 03:14:15 -07:00
Anatol Belski 69ea580aad fixed ext/pcre internal stuff
Now only the flaw is pcrelib itself as it works with int for
string length and offsets. Bigger stuff won't work anyway, but
if there are some issue there are just a few places like pcre_exec()
where we can explicitly cast to int.
2013-10-16 03:14:15 -07:00
Anatol Belski af4924eaea adapted all the function arg formats in ext/zlib 2013-10-16 03:14:13 -07:00
Anatol Belski 1015a29997 some more fixes to zend operators 2013-10-16 03:14:12 -07:00
Anatol Belski 889b8d75fe added ZEND_INT_FMT 2013-10-16 03:14:12 -07:00
Anatol Belski 34818356fc some fixes to constants, var_dump and var_export 2013-10-16 03:14:11 -07:00
Anatol Belski dfec5cf775 first fixes to ext/spl, yet incomplete 2013-10-16 03:12:49 -07:00
Anatol Belski a5cda49fe9 fixes to reflection 2013-10-16 03:10:52 -07:00
Anatol Belski 3b55e60245 fixes to ereg 2013-10-16 03:10:51 -07:00
Anatol Belski 4f6e709a67 more fixes to ext/date 2013-10-16 03:10:50 -07:00
Anatol Belski b24f226e93 replaced arg formats in pcre 2013-10-16 03:10:50 -07:00
Anatol Belski 41e0c7b1f6 fixed sapi.h 2013-10-16 03:10:49 -07:00
Anatol Belski 4ea8803533 replaced all arg formats in ext/standard 2013-10-16 03:10:48 -07:00
Anatol Belski f8923bb076 replaced all the int params in the datetime 2013-10-16 03:09:52 -07:00
Anatol Belski d3f87d0ffc adapted the function args for ereg
And that actually seems to be it, all tests pass so far. So lets
see how it goes in the fture, too easy but seems to be done for now .
2013-10-16 03:09:51 -07:00
Anatol Belski 179d696b35 trivial fix spl_autoload_functions() 2013-10-16 03:09:50 -07:00
Anatol Belski 4be4279c83 final fix for hebrev() 2013-10-16 03:09:50 -07:00
Anatol Belski 832e9653d1 fix build 2013-10-16 03:09:49 -07:00
Anatol Belski 469b9e44fb fixed file_put_contents() 2013-10-16 03:09:48 -07:00
Anatol Belski b7f8723065 fixed fwrite 2013-10-16 03:09:47 -07:00
Anatol Belski a8959d76c8 fixed "s" vs "S" for soundex 2013-10-16 03:09:45 -07:00
Anatol Belski 734f9e58f9 partial fix to hebrev 2013-10-16 03:09:44 -07:00
Anatol Belski 5b6f0092f4 fixed unpack() 2013-10-16 03:09:44 -07:00
Anatol Belski d7d84804e6 fixed str_pad() 2013-10-16 03:09:43 -07:00
Anatol Belski 12951f8bbd lost condition 2013-10-16 03:09:42 -07:00
Anatol Belski 6fc93dfa6c fixed str_split() 2013-10-16 03:09:41 -07:00
Anatol Belski a61c753006 Fixed substr(), but no kidding now.
all the signed/unsigned arithmetic needs clear understanding
2013-10-16 03:09:41 -07:00
Anatol Belski 51ddf600fe small correction to substr 2013-10-16 03:08:26 -07:00
Anatol Belski df0a28baab fixed strstr() 2013-10-16 03:08:26 -07:00
Anatol Belski c9280f1e1c fixed substr() 2013-10-16 03:08:25 -07:00
Anatol Belski f4c91f0aa8 adapted all the zend_parse_parameters() calls 2013-10-16 03:08:24 -07:00
Anatol Belski 5d1c130506 changes to dns.c 2013-10-16 03:08:22 -07:00
Anatol Belski ec49b23a4d fixes for types to ext/standard with types ... some stuff is broken now 2013-10-16 03:08:21 -07:00
Anatol Belski 63cf4c45ca more fixes to string.c 2013-10-16 03:05:14 -07:00
Anatol Belski 010b8114cc more for cli sapi 2013-10-16 03:05:13 -07:00
Anatol Belski dec724e98d fixes to main/ 2013-10-16 03:05:13 -07:00
Anatol Belski 646b5d306c fixes after merging master 2013-10-16 03:02:34 -07:00
Anatol Belski 6a16702e30 Fixes for sizeof int 2013-10-16 02:57:39 -07:00
Anatol Belski f7730bd47e made lang scanner use zend_int.h and regenerated it 2013-10-16 02:57:38 -07:00
Anatol Belski c10c568d0f added zend_int.h to zend*.dsp 2013-10-16 02:37:13 -07:00
Anatol Belski 91058553c8 adjusted zend_types.h 2013-10-16 02:37:13 -07:00
Anatol Belski 631628baad added zend_int.h 2013-10-16 02:37:12 -07:00
Anatol Belski f6cf006496 the very first porting try, many things not worky 2013-10-16 02:37:11 -07:00
Anatol Belski baf3937c37 fixes to zend 2013-10-16 02:35:31 -07:00
Anatol Belski 0e3420bf8f more fixes to streams 2013-10-16 02:34:31 -07:00
Anatol Belski 0020a89c43 fixes to SAPI.c 2013-10-16 02:32:22 -07:00
Anatol Belski 9f294bf282 fixes to plain stream wrapper 2013-10-16 02:32:21 -07:00
Anatol Belski 5748286990 fixes to xp_socket.c 2013-10-16 02:32:20 -07:00
Anatol Belski b610404004 fixes to zend_ini and output 2013-10-16 02:32:19 -07:00
Anatol Belski 74a68df77c fix uuencode 2013-10-16 02:32:18 -07:00
Anatol Belski 42fdfacae6 fix base64 stuff 2013-10-16 02:32:17 -07:00
Anatol Belski 98ec9fdd51 fixes to url processing stuff 2013-10-16 02:32:17 -07:00
Anatol Belski 6221ea90cb huge fix to spl and more 2013-10-16 02:32:16 -07:00
Anatol Belski 86c9a6f901 fix 's' vs 'S' for datetime 2013-10-16 02:31:20 -07:00
Anatol Belski dc43044ffb string sze_t fix for internal strings 2013-10-16 02:31:20 -07:00
Anatol Belski 0d0eec58f1 strig size_t fixes to zend_alloc.* 2013-10-16 02:31:19 -07:00
Anatol Belski a296d61c05 trivial fixes to ext\standard 2013-10-16 02:31:18 -07:00
Anatol Belski 2f39ef6596 trivial fixes to spl 2013-10-16 02:30:28 -07:00
Anatol Belski 4f62adfb2c fix spl_autoload_* 2013-10-16 02:30:27 -07:00
Anatol Belski 43e05efd3b windows fixes 2013-10-16 02:30:27 -07:00
Anthony Ferrara 2cf827b52a Get core test suite to really pass, fully. Woot 2013-10-16 02:30:26 -07:00
Anthony Ferrara 0cd95c1ee0 Get basic language tests to all pass (minus xfails) 2013-10-16 02:30:25 -07:00
Anthony Ferrara 6484eaf77e Better test coverage 2013-10-16 02:26:33 -07:00
Anthony Ferrara e6f90ecc27 It compiles. Sort-of. In a way. Yeah. But nothing works. Sigh 2013-10-16 02:24:40 -07:00
Anthony Ferrara 1d861341a0 More work, get strings working, sort-of... 2013-10-16 01:58:11 -07:00
Anthony Ferrara 10ff0829d4 Refactor file.c to use new string types 2013-10-16 01:56:47 -07:00
Anthony Ferrara c224e239bd Re-do a lot of it using a conditional define, and legacy type information for APIs 2013-10-16 01:55:06 -07:00
Adam Harvey 59ebbf5109 Allow CURLOPT_FOLLOWLOCATION to be used with open_basedir.
Newer versions of libcurl prevent file:// location response headers by default,
which means that the open_basedir check is unnecessary — the fact
CURLOPT_REDIR_PROTOCOLS can't set CURLPROTO_FILE with open_basedir enabled
means that there's no possibility of breaching the open_basedir restriction,
and this allows HTTP redirects to be followed automatically.

Implements FR #65646 (re-enable CURLOPT_FOLLOWLOCATION with open_basedir or
safe_mode).
2013-10-16 01:34:31 -07:00
Adam Harvey 04c823d287 Tinker with the wording of the short_open_tag description.
I'm still not thrilled with this, but it's a bit better and addresses the
issues noted in bug #65644. Plus, it now mentions the decoupling of <?=.
2013-10-16 01:34:30 -07:00
Adam Harvey 5c50e69814 Handle CLI server request headers case insensitively.
Fixes bug #65633 (built-in server treat some http headers as case-sensitive).
2013-10-16 01:29:42 -07:00
unknown f074ad207c ensure that the defined interpolation method is used by the generic scaling functions 2013-10-16 01:29:06 -07:00
Dmitry Stogov 4d86b8b507 Fixed issue #128 (opcache_invalidate segmentation fault) 2013-10-16 01:28:23 -07:00
Christopher Jones 32a8ad32e7 Remove obsolete flag 2013-10-16 01:28:22 -07:00
Christopher Jones 814b1985bc Update DTrace probes 2013-10-16 01:28:22 -07:00
Christopher Jones f453122b73 Add test for oci_set_* error changes 2013-10-16 01:28:21 -07:00
Christopher Jones 66db31f5c6 Make oci_set_*($connection,...) errors retrievable via oci_error($connection).
Improve some error handling to produce error text on some rare edge cases.
Disambiguate the Oracle library function call return status values from ORA error numbers.
Review and unify error data types.
2013-10-16 01:28:20 -07:00
Christopher Jones 388928ee24 Cast time_t since some "dtrace -G" invocations fail on time_t arguments 2013-10-16 01:26:09 -07:00
Stanislav Malyshev 49c9e595f6 5.4.21 now 2013-10-16 01:26:08 -07:00
Gustavo André dos Santos Lopes f1a05e788c Update NEWS/UPGRADING with info about incompat ctx 2013-10-16 01:24:01 -07:00
Xinchen Hui fd91996c55 Typo.... 2013-10-16 01:24:00 -07:00
Xinchen Hui f16cdc0d50 Add a XFAIL test for #64896 2013-10-16 01:24:00 -07:00
Gustavo André dos Santos Lopes 765cdb22cf Implement phase 1 of rfc/incompat_ctx
Just changing the error level of the message from E_STRICT to
E_DEPRECATED. This comes one version later than the timeline
mentioned in the RFC.

Oddly, there were no tests for this ‘feature’. I added a simple
one.
2013-10-16 01:23:59 -07:00
Nikita Popov 7f17c8c11e Make use of direct returns in some places 2013-10-16 01:23:58 -07:00
Nikita Popov cc0e733baa Always pass return_value_ptr to internal functions
Previous some places passed return_value_ptr only if the function
returned by reference. Now return_value_ptr is always set, even
for functions returning by-value.

This allows you to return zvals without copying their contents. For
this purpose two new macros RETVAL_ZVAL_FAST and RETURN_ZVAL_FAST
are added:

    RETVAL_ZVAL_FAST(zv); /* Analog to RETVAL_ZVAL(zv, 1, 0) */
    RETURN_ZVAL_FAST(zv); /* Analog to RETURN_ZVAL(zv, 1, 0) */

These macros behave similarly to the non-FAST versions with
copy=1 and dtor=0, with the difference that the FAST versions
will try return the zval without copying by utilizing return_value_ptr.
2013-10-16 01:23:57 -07:00
Christopher Jones 93b6c4f2bb Allow OCI8 to be DTrace-enabled independently of core PHP's DTrace
status.  The proviso is OCI8 must be built "shared" when DTrace is
enabled.  This implementation (i) works around an incomplete core PHP
solution for extension tracing (ii) avoid any issues with DOF section
location and the complexities of needing to merge all provider .d
files for static builds (iii) allows OCI8 to be DTrace-enabled when
doing PECL installs of OCI8 on PHP versions without core PHP DTrace
support.

This is an initial patch i.e. it will undergo further testing.
2013-10-16 01:23:57 -07:00
Christopher Jones e9782f3a10 OCI8: remove unused ext/oci8/config.m4 macro 2013-10-16 01:23:56 -07:00
Christopher Jones 6bb30e2aec OCI8 whitespace: remove tabs embedded in code 2013-10-16 01:23:55 -07:00
Remi Collet a296e3d032 Fixed bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer 2013-10-16 01:23:54 -07:00
Remi Collet 3df4c3eb70 Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer 2013-10-16 01:22:56 -07:00
Xinchen Hui 2e560a331d Fixed bug #60598 (cli/apache sapi segfault on objects manipulation) 2013-10-16 01:21:34 -07:00
Yasuo Ohgaki 9628ac34a6 Remove ini dependency in test 2013-10-16 01:20:56 -07:00
Dmitry Stogov 7fcd3e2721 Fixed bug #65510 (5.5.2 crashes in _get_zval_ptr_ptr_var) 2013-10-16 01:20:55 -07:00
Dmitry Stogov 58606fc10d Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien) 2013-10-16 01:20:13 -07:00
Dmitry Stogov 08c2e821cc Fixed compatibility with php-5.2 2013-10-16 01:19:17 -07:00
Dmitry Stogov 5352788b44 Fixed bug #65561 (Zend Opcache on Solaris 11 x86 needs ZEND_MM_ALIGNMENT=4). (Terry Ellison) 2013-10-16 01:19:16 -07:00
Xinchen Hui db11ad2e94 Avoid compiler warning 2013-10-16 01:18:36 -07:00
Adam Harvey acbfd16ddf Fix bug #65579 (Using traits with get_class_methods causes segfault).
Specifically, this checks if there are trait aliases defined in the class scope
before attempting to dereference the first trait alias. This handles the case
where a trait alias was used in a child trait but no aliases exist in the
concrete class.
2013-10-16 01:18:36 -07:00
Anatol Belski 132505cd52 removed the /Wp64 switch as we use true 64 bit compiler now 2013-10-16 01:17:54 -07:00
Anatol Belski f350f3c9b8 updated lib versions, the vc11 ones only matter now 2013-10-16 01:17:12 -07:00
Christopher Jones 16ef7e80a8 OCI8 2.0: add oci8-check-connection probe and do some renaming 2013-10-16 01:17:11 -07:00
Anatol Belski cf22d7c06b fixed ext/iconv 2013-10-16 01:17:10 -07:00
Xinchen Hui c4edc6e277 Fixed compiler warnings
warning: 'local_dval' may be used uninitialized in this function
[-Wmaybe-uninitialized]

warning: 'dval2' may be used uninitialized in this function
[-Wmaybe-uninitialized]
2013-10-16 01:17:09 -07:00
Christopher Jones 6a2c44c811 Use "__" consistently in OCI8 DTrace probe definitions. It maps to "-" in the probe name. 2013-10-16 01:16:12 -07:00
Christopher Jones fb03ad89ef Leave it to DTrace FBT to trace underlying library calls 2013-10-16 01:16:11 -07:00
Nikita Popov 66de4151e7 Evaluate ZVAL_ZVAL arguments only once
Also remove some isref/refcount assignments, which are no longer
necessary (as ZVAL_COPY_VALUE is used now).
2013-10-16 01:16:11 -07:00
Dmitry Stogov e8b7f9f011 Fixed compilation warning 2013-10-16 01:16:10 -07:00
gron1987 62b0f1d0fc Fix bug #65554 in DateTime, when use it with D/l in format and textual day have dot at the end 2013-10-16 01:16:09 -07:00
Stanislav Malyshev 66dd725ac7 fix mysql tests & mark nextRowset problematic tests 2013-10-16 01:14:27 -07:00
Joey Smith 7f22f40541 Expose fputcsv's escape_char to userland
Allows users to assert that something other than the backslash
should be considered an escape char; also follows the RFC 4180
recommendation that fields containing a " be enclosed.
2013-10-16 01:14:23 -07:00
Stanislav Malyshev e636bea3f7 fix mysql init 2013-10-16 01:12:01 -07:00
Stanislav Malyshev ef30289ead add openssl 2013-10-16 01:12:00 -07:00
Stanislav Malyshev b0aed8f9d3 add mysql settings 2013-10-16 01:11:59 -07:00
root c74f0c613d Test extension xmlrpc encode type double and string decode type string and int 2013-10-16 01:11:23 -07:00
Ole Markus With 32776ad023 Stricter libc-client symlink check 2013-10-16 01:11:22 -07:00
Michael M Slusarz 674fb57896 Fix #65483: quoted-printable encode stream filter incorrectly encoding spaces 2013-10-16 01:11:21 -07:00
Alexander Moskaliov 39c8f8a205 Remove semicolon 2013-10-16 01:11:21 -07:00
Alexander Moskalev 66174837ef Fix DateInterval->days value
when object was created not from DateTime::diff()
2013-10-16 01:11:20 -07:00
Paul Tarjan a2eacd8a2c fix typo in copy_variation16 test 2013-10-14 23:54:59 -07:00
Igor Wiedler 602fef0e52 Clarify type of use in error messages 2013-10-14 23:32:11 +02:00
Igor Wiedler e23ad4eeb2 Add "Done" output to distinguish hard from soft failures 2013-10-14 23:21:06 +02:00
Anatol Belski eb97d270da Merge branch 'PHP-5.5'
* PHP-5.5:
  fix whitespaces
2013-10-14 17:13:30 +02:00
Anatol Belski 2a093551e7 Merge branch 'PHP-5.5'
* PHP-5.5:
  added notes about the PECL site conformity

Conflicts:
	README.EXTENSIONS
2013-10-14 16:10:10 +02:00
Anatol Belski dcfd753104 fixed skeleton to produce the normalized ext version macros
See http://news.php.net/php.pecl.dev/11191 for more info.
2013-10-14 14:37:39 +02:00
Anatol Belski ea4ef75918 Merge branch 'PHP-5.5'
* PHP-5.5:
  fixed skeleton to produce the normalized ext version macros
2013-10-14 14:34:33 +02:00
Jakub Zelenka c092d286fc Fix compiler warnings in openssl.c 2013-10-13 15:52:39 +01:00
Felipe Pena 314a3aa9ac Merge branch 'master' of git.php.net:/php-src 2013-10-12 18:07:58 -03:00
Felipe Pena eed5d9cc5f Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fixed possible memory leak
2013-10-12 18:06:39 -03:00
Daniel Lowrey 9d57243794 Fixes broken zts build (recent openssl changes) 2013-10-12 22:28:15 +02:00
Felipe Pena 0ca4b6c083 Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fixed resource leak
2013-10-12 17:25:37 -03:00
Felipe Pena 54a595a091 Merge branch 'master' of git.php.net:/php-src 2013-10-12 17:05:20 -03:00
Levi Morrison 73c44d6e6a Fixed assumption that the temporary directory is located in /tmp 2013-10-11 22:18:07 +02:00
Levi Morrison 7f3b5b77cc Standardized usage of zpp_none and the order of the comparison zpp(...) == FAILURE 2013-10-11 10:32:40 -06:00
Christopher Jones 5ae8c51e68 OCI8: sync README and package.xml descriptions 2013-10-10 13:38:38 -07:00
Christopher Jones 71a3c07843 Merge branch 'master' of https://git.php.net/repository/php-src
# By Dmitry Stogov
# Via Christopher Jones (2) and Dmitry Stogov (2)
* 'master' of https://git.php.net/repository/php-src:
  Fixed bug #65845 (Error when Zend Opcache Optimizer is fully enabled).
2013-10-10 11:15:12 -07:00
Dmitry Stogov a2aa6a3440 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #65845 (Error when Zend Opcache Optimizer is fully enabled).

Conflicts:
	NEWS
2013-10-10 15:33:17 +04:00
Christopher Jones 141c2cb97a Re-enable OCI8 DLL builds with Oracle 10g & 11g client libraries on
Windows, in addition to Oracle 12c.  From discussions with Anatol &
Pierre this seems to be the most direct way for the Windows PECL build
scripts to automatically create links to the generated DLLs.  The
issue is that the name php_oci8_12c.dll doesn't match the package
name.

In the far future when php_oci8.dll (with Oracle 10g) is no longer
built then another Windows PECL packaging fix will be needed.
2013-10-09 12:17:11 -07:00
Christopher Jones 3979b8b9c4 Merge branch 'master' of https://git.php.net/repository/php-src
# By Michael Wallner (4) and others
# Via Michael Wallner (8) and Stanley Sufficool (1)
* 'master' of https://git.php.net/repository/php-src:
  C89
  Changed return types to zend_bool, renamed test
  C89 compatibility
  Fixed segfault when built with OpenSSL >= 1.0.1
  Thanks Daniel, I didn't think long enough
  consolidate NEWS with 5.4
  Added SAN matching during peer verification
  fixing a minor typo in CODING_STANDARDS document
  FIX BUG #65219 - Typo correction
  FIX BUG #65219 - USE DB not being sent for FreeTDS version < 0.92 FreeTDS <0.92 does not support DBSETLDBNAME option and therefore will not work with SQL Azure. Fallback to dbuse command in letter versions.
  run-tests.php: Adding support for sections EXPECT_EXTERNAL, EXPECTF_EXTERNAL and EXPECTREGEX_EXTERNAL. (Issue 55736)
2013-10-09 09:41:12 -07:00
Michael Wallner e2d123a720 C89 2013-10-09 17:16:25 +02:00
Michael Wallner c85c50e35c Merge branch 'san_peer_matching' of https://github.com/rdlowrey/php-src
* 'san_peer_matching' of https://github.com/rdlowrey/php-src:
  Changed return types to zend_bool, renamed test
  Added SAN matching during peer verification
2013-10-09 17:09:03 +02:00
Daniel Lowrey a40dd6e963 Changed return types to zend_bool, renamed test 2013-10-09 09:55:36 -04:00
Michael Wallner 302b9d4e5c Merge branch 'PHP-5.5'
* PHP-5.5:
  C89 compatibility
2013-10-09 12:30:51 +02:00
Michael Wallner 5f41cb18be Merge branch 'issue-55736' of https://github.com/tistre/php-src
implements FR #55736

* 'issue-55736' of https://github.com/tistre/php-src:
  run-tests.php: Adding support for sections EXPECT_EXTERNAL, EXPECTF_EXTERNAL and EXPECTREGEX_EXTERNAL. (Issue 55736)
2013-10-09 10:06:45 +02:00
Michael Wallner 29d5ff75d5 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed segfault when built with OpenSSL >= 1.0.1
  fixing a minor typo in CODING_STANDARDS document
  FIX BUG #65219 - Typo correction
  FIX BUG #65219 - USE DB not being sent for FreeTDS version < 0.92 FreeTDS <0.92 does not support DBSETLDBNAME option and therefore will not work with SQL Azure. Fallback to dbuse command in letter versions.
2013-10-09 09:18:29 +02:00
Michael Wallner 1815942f53 Thanks Daniel, I didn't think long enough 2013-10-09 08:22:33 +02:00
Michael Wallner cfa4eced9f Merge branch 'PHP-5.5'
* PHP-5.5:
  consolidate NEWS with 5.4
2013-10-09 08:16:23 +02:00
Daniel Lowrey 2ddefbd2b3 Added support for TLSv1.1 and TLSv1.2 2013-10-08 14:09:17 -04:00
Christopher Jones c0bcedafbc Merge branch 'master' of https://git.php.net/repository/php-src
# By Tjerk Meesters (12) and others
# Via Michael Wallner
* 'master' of https://git.php.net/repository/php-src: (24 commits)
  openssl NEWS,UPGRADING
  fix bad cast
  fix bug #51076 (race condition in shtool's mkdir -p)
  DNS name comparison is now case insensitive.
  Use zend_bool as return value for _match()
  Added two more test cases for CN matching.
  Using SUCCESS and FAILURE for return values Using zend_bool for boolean arguments and return values Reduced one level of zval indirection where possible
  Add unit test that covers setting the crypto method.
  show method in error message
  Support string and array for peer fingerprint matching
  who put that stupid newline there?
  add md5 and sha1 fingerprint tests
  Renamed to be more descriptive of what it does
  Streams for ssl:// transports can now be configured to use a specific crypto method (SSLv3, SSLv2 etc.) by calling
  yay, reduced one variable
  Fixed bug that would lead to out of bounds memory access
  don't leak cert on errors, return null on zpp failure
  added better wildcard matching for CN
  Added test case for openssl_x509_digest()
  removed the byref result
  ...
2013-10-08 10:21:42 -07:00
Daniel Lowrey 1970b96443 Added SAN matching during peer verification 2013-10-08 12:37:44 -04:00
Michael Wallner cf6413ae7c openssl NEWS,UPGRADING 2013-10-08 16:20:07 +02:00
Michael Wallner ea0578e223 Merge branch 'ssl-streams-crypto-method' of https://github.com/mj/php-src
* 'ssl-streams-crypto-method' of https://github.com/mj/php-src:
  Add unit test that covers setting the crypto method.
  Streams for ssl:// transports can now be configured to use a specific crypto method (SSLv3, SSLv2 etc.) by calling
2013-10-08 16:10:00 +02:00
Michael Wallner 8300ced2f7 Merge branch 'bug65729' of https://github.com/datibbaw/php-src
* 'bug65729' of https://github.com/datibbaw/php-src:
  DNS name comparison is now case insensitive.
  Use zend_bool as return value for _match()
  Added two more test cases for CN matching.
  yay, reduced one variable
  Fixed bug that would lead to out of bounds memory access
  added better wildcard matching for CN
2013-10-08 15:58:28 +02:00
Michael Wallner 0d8c83a251 Merge branch 'openssl-x509-digest' of https://github.com/datibbaw/php-src
* 'openssl-x509-digest' of https://github.com/datibbaw/php-src:
  Using SUCCESS and FAILURE for return values Using zend_bool for boolean arguments and return values Reduced one level of zval indirection where possible
  show method in error message
  Support string and array for peer fingerprint matching
  who put that stupid newline there?
  add md5 and sha1 fingerprint tests
  Renamed to be more descriptive of what it does
  don't leak cert on errors, return null on zpp failure
  Added test case for openssl_x509_digest()
  removed the byref result
  indentation fail
  added option for hash function
  added option for raw output
  added openssl_x509_digest(), output is binary sha1
2013-10-08 15:57:18 +02:00
Michael Wallner 5d430ad902 fix bad cast 2013-10-08 11:16:53 +02:00
Michael Wallner b15765412a Merge branch 'PHP-5.5'
* PHP-5.5:
  fix bug #51076 (race condition in shtool's mkdir -p)
2013-10-08 08:37:44 +02:00
datibbaw 6106896440 DNS name comparison is now case insensitive. 2013-10-08 10:07:54 +08:00
Christopher Jones f0863fa43a Add new tests to package.xml 2013-10-07 17:38:56 -07:00
Christopher Jones 1675fd2277 Add new tests 2013-10-07 17:26:00 -07:00
Christopher Jones 12f9939b79 Bump mininum requirements for PHP OCI8 2.0 to PHP 5.2 and Oracle
client library 10.2 (Note this will connect to Oracle Database 8.1.7
onwards). Use the older OCI8 1.4 from PECL if using an earlier PHP
version or older Oracle client library support is necessary.
2013-10-07 17:23:11 -07:00
Tjerk Meesters 39c0daeb71 Use zend_bool as return value for _match() 2013-10-07 23:04:24 +08:00
Tjerk Meesters 674dd73f8c Added two more test cases for CN matching. 2013-10-07 22:10:05 +08:00
Anatol Belski 4fe7ec33f1 Merge branch 'PHP-5.5'
* PHP-5.5:
  added fixed tests for ICU >= 51.2
  fixed failing tests for ICU >= 51.2
  FIX BUG #65219 - Typo correction
  FIX BUG #65219 - USE DB not being sent for FreeTDS version < 0.92 FreeTDS <0.92 does not support DBSETLDBNAME option and therefore will not work with SQL Azure. Fallback to dbuse command in letter versions.
  - Fixed bug #65818 (Segfault with built-in webserver and chunked transfer encoding)
  - BFN
2013-10-07 13:50:59 +02:00
datibbaw 955bc1d91b Using SUCCESS and FAILURE for return values
Using zend_bool for boolean arguments and return values
Reduced one level of zval indirection where possible
2013-10-07 15:38:48 +08:00
Stanley Sufficool 9c7dbb0487 Fix bug #64338 pdo_dblib can't connect to Azure SQL 2013-10-05 18:26:25 -07:00
Stanley Sufficool 3e023c3ddf Merge branch 'master' of https://git.php.net/push/php-src
* 'master' of https://git.php.net/push/php-src: (705 commits)
  Allow the ldap extension to be compiled with Oracle's LDAP implementation, if desired.  Note the implementations differ so you will see different ldap behavior.
  Fix bug #65667: ftp_nb_continue produces segfault
  fix bug #64146 (serialize incorrectly saving objects when they are cloned)
  such a weird hack probably helps in finding regressions in the future
  Fix bug #65821: By-ref foreach on property access of string offset segfaults
  Fixed bug #64230 (XMLReader does not suppress errors)
  add NEWS and UPGRADING about gost-crypto
  fix bug #55285 XMLReader::getAttribute/No/Ns methods inconsistency
  typo: really fix bug #51936 	Crash with clone xmlreader
  fix bug #59613 (Crash with clone XMLReader)
  Fix Bug #60633 build warning in bcmath
  fix bug #65808 	the socket_connect() won't work with IPv6 address
  5.4.22-dev now
  Revert "Make 'make distclean' remove the downloaded pear PHAR"
  fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
  Fixed bug #61548
  Reverted patch (it was used for internal testing and was committed by accident)
  OCI8 2.0: Added a new oci_set_db_operation() user space function for the "DB Operation" tracing feature of Oracle DB 12c.
  Make 'make distclean' remove the downloaded pear PHAR
  fix test
  ...
2013-10-05 17:57:23 -07:00
Felipe Pena 606a97f4ec Merge branch 'master' of git.php.net:/php-src 2013-10-05 12:55:35 -03:00
Felipe Pena 8153dd2a95 Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fixed bug #65818 (Segfault with built-in webserver and chunked transfer encoding)
  - BFN
  Allow the ldap extension to be compiled with Oracle's LDAP implementation, if desired.  Note the implementations differ so you will see different ldap behavior.
2013-10-05 12:53:24 -03:00
Christopher Jones 3261eb348f Merge branch 'PHP-5.5'
* PHP-5.5:
  Allow the ldap extension to be compiled with Oracle's LDAP implementation, if desired.  Note the implementations differ so you will see different ldap behavior.
2013-10-04 15:51:39 -07:00
Martin Jansen 047877e810 Add unit test that covers setting the crypto method. 2013-10-04 21:55:29 +02:00
Christopher Jones 1fee78e465 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Fix bug #65667: ftp_nb_continue produces segfault
  fix bug #64146 (serialize incorrectly saving objects when they are cloned)
  such a weird hack probably helps in finding regressions in the future
2013-10-04 10:51:36 -07:00
Nikita Popov 44a2ae059e Merge branch 'PHP-5.5' 2013-10-04 17:27:22 +02:00
Michael Wallner f72ed22749 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix bug #64146 (serialize incorrectly saving objects when they are cloned)
2013-10-04 16:17:46 +02:00
Michael Wallner 39022ba227 Merge branch 'PHP-5.5'
* PHP-5.5:
  such a weird hack probably helps in finding regressions in the future
2013-10-04 16:12:41 +02:00
Christopher Jones 27d46a4454 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Fix bug #65821: By-ref foreach on property access of string offset segfaults
  Fixed bug #64230 (XMLReader does not suppress errors)
2013-10-04 05:41:03 -07:00
Nikita Popov ff46b6f633 Merge branch 'PHP-5.5' 2013-10-04 13:15:45 +02:00
Michael Wallner e13e5b17ff Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #64230 (XMLReader does not suppress errors)
2013-10-04 11:22:52 +02:00
Christopher Jones 5d6087497c Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  add NEWS and UPGRADING about gost-crypto
  fix bug #55285 XMLReader::getAttribute/No/Ns methods inconsistency
  fix failing tests
  fix indention
  Add support for CryptoPro S-box for GOST
2013-10-03 13:37:34 -07:00
Michael Wallner 099b295646 add NEWS and UPGRADING about gost-crypto 2013-10-03 16:23:59 +02:00
Michael Wallner 05f847da45 Merge PR #430 gost-crypto
Merge branch 'master' of github.com:manuelm/php-src

* 'master' of github.com:manuelm/php-src:
  fix failing tests
  fix indention
  Add support for CryptoPro S-box for GOST
2013-10-03 16:20:00 +02:00
Michael Wallner c7b1d76eb9 fix bug #55285 XMLReader::getAttribute/No/Ns methods inconsistency 2013-10-03 15:23:05 +02:00
Christopher Jones 333539b5fc Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  typo: really fix bug #51936 	Crash with clone xmlreader
  fix bug #59613 (Crash with clone XMLReader)
  Fix Bug #60633 build warning in bcmath
  fix bug #65808 	the socket_connect() won't work with IPv6 address
  5.4.22-dev now
2013-10-03 05:41:05 -07:00
Michael Wallner 2a1bd123d6 Merge branch 'PHP-5.5'
* PHP-5.5:
  typo: really fix bug #51936 	Crash with clone xmlreader
2013-10-03 13:35:09 +02:00
Michael Wallner 95fd508dfa Merge branch 'PHP-5.5'
* PHP-5.5:
  fix bug #59613 (Crash with clone XMLReader)
2013-10-03 13:30:02 +02:00
Remi Collet 99598fd873 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix Bug #60633 build warning in bcmath
2013-10-03 08:45:40 +02:00
Michael Wallner bc16dfda1f Merge branch 'PHP-5.5'
* PHP-5.5:
  fix bug #65808 	the socket_connect() won't work with IPv6 address
  5.4.22-dev now
2013-10-02 15:56:09 +02:00
Christopher Jones 83955de57e Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Revert "Make 'make distclean' remove the downloaded pear PHAR"
  fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
2013-10-02 05:41:20 -07:00
Christopher Jones 67df40fd54 Merge branch 'PHP-5.5'
* PHP-5.5:
  Revert "Make 'make distclean' remove the downloaded pear PHAR"
2013-10-01 10:35:03 -07:00
Christopher Jones 471413ab19 Merge branch 'master' of https://git.php.net/repository/php-src
# By Michael Wallner (2) and Dmitry Stogov (1)
# Via Michael Wallner (5) and others
* 'master' of https://git.php.net/repository/php-src:
  fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
  Fixed bug #61548
  Reverted patch (it was used for internal testing and was committed by accident)
2013-10-01 10:19:45 -07:00
Michael Wallner 54c08e3e1e Merge branch 'PHP-5.5'
* PHP-5.5:
  fix bug #62396 'make test' crashes starting with 5.3.14 (missing gzencode())
2013-10-01 17:02:20 +02:00
Christopher Jones 1d65acea41 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Fixed bug #61548
  Reverted patch (it was used for internal testing and was committed by accident)
  OCI8 2.0: Added a new oci_set_db_operation() user space function for the "DB Operation" tracing feature of Oracle DB 12c.
2013-10-01 05:40:48 -07:00
Michael Wallner d29a01de3f Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #61548

Conflicts:
	ext/standard/http_fopen_wrapper.c
2013-10-01 11:11:48 +02:00
Dmitry Stogov 66cd9ef04c Merge branch 'PHP-5.5'
* PHP-5.5:
  Reverted patch (it was used for internal testing and was committed by accident)
2013-10-01 11:34:19 +04:00
Christopher Jones 954a0f8bf4 OCI8 2.0: Added a new oci_set_db_operation() user space function for the "DB Operation" tracing feature of Oracle DB 12c.
Currently this code is #ifdef'd out, since I can't consider the feature stable until an Oracle-side fix for Oracle bug 16695981 is available.  Having the code available in PHP OCI8 facilitates testing of any fix.
2013-09-30 16:51:07 -07:00
Christopher Jones ca6a259ed1 Merge branch 'master' of https://git.php.net/repository/php-src
# By Michael Wallner (2) and others
# Via Christopher Jones (8) and others
* 'master' of https://git.php.net/repository/php-src:
  Make 'make distclean' remove the downloaded pear PHAR
  fix test
  fix memleak on resetting rebind_proc
  Fix bug #64979: Wrong behavior of static variables in closure generators
  Fix bug #65322: compile time errors won't trigger auto loading
  5.5.4 release date
  5.4.20 release date
  Add information about which INI file is which inside respective files
2013-09-30 15:54:39 -07:00
Christopher Jones 86c3378c5c Merge branch 'PHP-5.5'
* PHP-5.5:
  Make 'make distclean' remove the downloaded pear PHAR
2013-09-30 15:47:33 -07:00
Tjerk Meesters e45eacd8fa show method in error message 2013-09-30 21:21:56 +08:00
Michael Wallner 6757033355 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix test
  fix memleak on resetting rebind_proc
2013-09-30 14:05:37 +02:00
Nikita Popov cbf0683c6f Merge branch 'PHP-5.5' 2013-09-29 20:19:40 +02:00
Nikita Popov 9529b8f5c4 Merge branch 'PHP-5.5' 2013-09-29 18:01:42 +02:00
Stanislav Malyshev 7a9530612d Merge branch 'PHP-5.5'
* PHP-5.5:
  5.5.4 release date
  5.4.20 release date
  Add information about which INI file is which inside respective files
2013-09-28 18:07:32 -07:00
Christopher Jones 0a3ee7b26b Prepare for next release 2013-09-27 17:16:02 -07:00
Christopher Jones 9b9eaba083 OCI8: Fix alloc function and DLL generation 2013-09-27 17:00:41 -07:00
Christopher Jones aba30ce306 Merge branch 'master' of https://git.php.net/repository/php-src
# By Dmitry Stogov (2) and others
# Via Christopher Jones (22) and others
* 'master' of https://git.php.net/repository/php-src:
  Removed references to "Zend Support"
  Added support for GNU Hurd. (Svante Signell)
  - Updated to version 2013.6 (2013f)
  More OCI8 DTrace probe updates. Change php.ini-* doc to match an earlier change to config.w32
  FIX BUG #48539 - Disable TEXTLIMIT for FreeTDS driver
  Don't track parameter number in separate znode
  fix missing change from 'tcp_socket' to the more common 'server'
  fix many parallel test issues
2013-09-27 15:57:13 -07:00
Tjerk Meesters 75ba75e205 Using only two constants to signal use type intent. 2013-09-28 00:06:04 +08:00
datibbaw 0492145e58 added bitmask variation 2013-09-28 00:06:04 +08:00
Tjerk Anne Meesters b8653d3457 fixed test case to pass on other systems than my own 2013-09-28 00:06:03 +08:00
datibbaw 6442e49b22 forgot introspection changes 2013-09-28 00:06:03 +08:00
datibbaw a88c7be88b added use_keys argument to array_filter() 2013-09-28 00:06:03 +08:00
Dmitry Stogov 56eee05f66 Merge branch 'PHP-5.5'
* PHP-5.5:
  Removed references to "Zend Support"
2013-09-27 14:02:01 +04:00
Dmitry Stogov 3eba8cf673 Merge branch 'PHP-5.5'
* PHP-5.5:
  Added support for GNU Hurd. (Svante Signell)

Conflicts:
	NEWS
2013-09-27 13:44:31 +04:00
Derick Rethans 9ef4e5d23d Merge branch 'PHP-5.5' 2013-09-27 10:14:51 +01:00
datibbaw edd93f3452 Support string and array for peer fingerprint matching 2013-09-27 14:13:11 +08:00
Christopher Jones 5ac7c533a0 More OCI8 DTrace probe updates.
Change php.ini-* doc to match an earlier change to config.w32
2013-09-26 21:12:11 -07:00
Christopher Jones 8554800e76 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Don't track parameter number in separate znode
  fix missing change from 'tcp_socket' to the more common 'server'
  fix many parallel test issues
2013-09-26 21:07:57 -07:00
Sara Golemon 92fe33c570 Merge branch 'pull-request/473' 2013-09-26 13:24:08 -07:00
Nikita Popov 0ceea8a2e8 Don't track parameter number in separate znode
We already track it in the op array already.
2013-09-26 19:43:32 +02:00
Christopher Jones eb8e63bd3c Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Implement variadic function syntax
2013-09-26 09:57:54 -07:00
Christopher Jones a3b0fa0d04 Merge branch 'master' of https://git.php.net/repository/php-src
# By Adam Harvey (2) and others
# Via Adam Harvey (2) and others
* 'master' of https://git.php.net/repository/php-src:
  Implement variadic function syntax
  Added function opcache_compile_file() to load PHP scripts into cache without execution.
  Fixed issue #135 (segfault in interned strings if initial memory is too low)
  Fix typo: HTTP_ROW_POST_DATA → HTTP_RAW_POST_DATA.
  Make message and format arguments const char * to avoid build warning about invalid cast.
  Copy dba_*() keys before converting to string.
2013-09-26 09:57:36 -07:00
Nikita Popov 0d7a638866 Implement variadic function syntax
As per RFC: https://wiki.php.net/rfc/variadics
2013-09-26 18:39:17 +02:00
ptarjan 361e984e46 fix missing change from 'tcp_socket' to the more common 'server' 2013-09-26 01:06:36 -07:00
ptarjan ecbe4af0de fix many parallel test issues
While running these on HHVM I've run into a lot of parallelism issues.
I'm backporting all the fixes I had to do in
https://github.com/facebook/hiphop-php/blob/master/hphp/tools/import_zend_test.py#L650
to php core.

Most of these changes were just filenames that were shared between
tests, but I did more surgery on the fixed ports. I can apreciate port
31337 as much as the next nerd, but random ports are better for tests.
2013-09-26 00:30:23 -07:00
Christopher Jones c02ff01548 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Added function opcache_compile_file() to load PHP scripts into cache without execution.
  Fixed issue #135 (segfault in interned strings if initial memory is too low)
2013-09-25 05:40:56 -07:00
Dmitry Stogov 6daa04a4f6 Merge branch 'PHP-5.5'
* PHP-5.5:
  Added function opcache_compile_file() to load PHP scripts into cache without execution.

Conflicts:
	NEWS
2013-09-25 12:15:01 +04:00
Dmitry Stogov 4e249c8a93 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed issue #135 (segfault in interned strings if initial memory is too low)

Conflicts:
	NEWS
2013-09-25 11:04:03 +04:00
Christopher Jones f4ce01864a Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Fix typo: HTTP_ROW_POST_DATA → HTTP_RAW_POST_DATA.
2013-09-24 05:40:53 -07:00
Adam Harvey 8d087dc0d7 Fix typo: HTTP_ROW_POST_DATA → HTTP_RAW_POST_DATA.
Fixes bug #65745 (Typo in commit 4a3936ef4a).
2013-09-23 13:30:47 -07:00
Tjerk Meesters 69bdc5aca8 who put that stupid newline there? 2013-09-23 23:42:31 +08:00
Tjerk Meesters 1c7cabb2ca add md5 and sha1 fingerprint tests 2013-09-23 23:29:17 +08:00
Christopher Jones fad80daec5 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Make message and format arguments const char * to avoid build warning about invalid cast.
  Copy dba_*() keys before converting to string.
2013-09-23 05:41:25 -07:00
Remi Collet c760ff1615 Merge branch 'PHP-5.5'
* PHP-5.5:
  Make message and format arguments const char * to avoid build warning about invalid cast.
2013-09-23 13:23:00 +02:00
Adam Harvey 859b708722 Merge branch 'PHP-5.5'
* PHP-5.5:
  Copy dba_*() keys before converting to string.
2013-09-22 16:54:12 -07:00
Tjerk Meesters 2bfc5a253b Renamed to be more descriptive of what it does 2013-09-23 00:51:17 +08:00
Martin Jansen ce2789558a Streams for ssl:// transports can now be configured to use a specific
crypto method (SSLv3, SSLv2 etc.) by calling

stream_context_set_option($ctx, "ssl", "crypto_method", $crypto_method)

where $crypto_method can be one of STREAM_CRYPTO_METHOD_SSLv2_CLIENT,
STREAM_CRYPTO_METHOD_SSLv3_CLIENT, STREAM_CRYPTO_METHOD_SSLv23_CLIENT
or STREAM_CRYPTO_METHOD_TLS_CLIENT. SSLv23 remains the default crypto
method.

This change makes it possible to fopen() SSL URLs that are only
provided using SSL v3.
2013-09-21 21:26:40 +02:00
Tjerk Meesters a820c3d6ba yay, reduced one variable 2013-09-21 20:42:52 +08:00
Tjerk Meesters 8e847b5845 Fixed bug that would lead to out of bounds memory access 2013-09-21 19:38:09 +08:00
Tjerk Meesters 521a5c9568 don't leak cert on errors, return null on zpp failure 2013-09-21 18:24:00 +08:00
Tjerk Meesters 8915c3fb4f added better wildcard matching for CN 2013-09-21 16:45:20 +08:00
Christopher Jones b3a17e53f3 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Fix the broken sh syntax in ext/imap/config.m4.
  Fixed bug #65678 the test cli_process_title_windows will fails on particular environnement
2013-09-20 17:10:16 -07:00
Christopher Jones c175617b80 Merge branch 'master' of https://git.php.net/repository/php-src
# By Adam Harvey (1) and Anatol Belski (1)
# Via Adam Harvey (3) and others
* 'master' of https://git.php.net/repository/php-src:
  Fix the broken sh syntax in ext/imap/config.m4.
  Fixed bug #65678 the test cli_process_title_windows will fails on particular environnement
2013-09-20 17:09:53 -07:00
Adam Harvey 9e3bedcd73 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix the broken sh syntax in ext/imap/config.m4.
2013-09-20 14:21:28 -07:00
Tjerk Meesters a97aec16c0 Added test case for openssl_x509_digest() 2013-09-20 23:29:04 +08:00
Tjerk Meesters 574fe449dc removed the byref result 2013-09-20 22:50:30 +08:00
Anatol Belski ac562b027b Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #65678 the test cli_process_title_windows will fails on particular environnement
2013-09-20 16:01:11 +02:00
Boro Sitnikovski bce1151df9 Bug 64744
Show the type of the non-object for more descriptive errors
2013-09-20 13:34:12 +02:00
datibbaw ce13f9fa32 indentation fail 2013-09-20 16:59:44 +08:00
datibbaw b2881db9a9 added option for hash function 2013-09-20 16:56:50 +08:00
datibbaw 5cff92fb12 added option for raw output 2013-09-20 15:45:41 +08:00
datibbaw b8f9a20286 added openssl_x509_digest(), output is binary sha1 2013-09-20 15:04:52 +08:00
Christopher Jones d135e08a98 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Added application/pdf to PHP CLI Web Server mime types.
2013-09-19 20:38:53 -07:00
Christopher Jones b0a5e760fe Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  add note about request_body and php://input
2013-09-19 20:27:28 -07:00
Christopher Jones dcafcd01a9 Merge branch 'PHP-5.5'
* PHP-5.5:
  Added application/pdf to PHP CLI Web Server mime types.
2013-09-19 20:23:18 -07:00
Christopher Jones d879d3de1e Merge branch 'PHP-5.5'
* PHP-5.5:
2013-09-19 20:22:12 -07:00
Christopher Jones 6ee3472a5f Merge branch 'master' of https://git.php.net/repository/php-src
# By Michael Wallner
# Via Michael Wallner
* 'master' of https://git.php.net/repository/php-src:
  add note about request_body and php://input
2013-09-19 10:53:22 -07:00
Michael Wallner 11d60447f9 add note about request_body and php://input 2013-09-19 15:41:04 +02:00
Christopher Jones 4f62df4f28 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Build OCI8 2.0 on Windows with Oracle Database 12c libraries only
2013-09-19 05:40:24 -07:00
Michael Wallner 98e4ecb6f0 fix Zend/tests/ns_040.phpt failing
It was wrongly assumed the namespace has to be looked up in a case
sensitive manner too. Fixed the lookup to use a lower case
represenation of the import name.
2013-09-19 10:51:57 +02:00
Christopher Jones b6d0cb0553 Build OCI8 2.0 on Windows with Oracle Database 12c libraries only 2013-09-18 19:50:32 -07:00
Christopher Jones 3d165224da Merge branch 'master' of https://git.php.net/repository/php-src
# By Michael Wallner (18) and others
# Via David Soria Parra (8) and others
* 'master' of https://git.php.net/repository/php-src: (37 commits)
  better way to fix PRIu64 availability on windows
  Revert "EmptyIterator now implements Countable; fixes bug 60577"
  RFC 6598 reserved ip range starts at 100.64.0.0
  fix a very rare case of use of uninitialized value combined with a memleak
  fix test concurrency
  fix test concurrency
  fix test concurrency
  fix test concurrency
  fix test concurrency
  fix build - PRIu64 vs %I64u
  final bits
  we need to use the full stream wrapper for filters
  let the libsqlite3 symbols be exported in dll
  NEWS/UPGRADING{,.INTERNALS} notes about temp POST stream
  Exclude bison 3.0 by Mike
  NEWS for added reserved ip addresses according to RFC 6598
  Add RFC 6598 IPs to reserved addresses
  upload2G note
  NEWS for #60577
  NEWS for bug #64441
  ...
2013-09-18 19:49:40 -07:00
Christopher Jones 44ff556a82 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  better way to fix PRIu64 availability on windows
  Revert "EmptyIterator now implements Countable; fixes bug 60577"
2013-09-18 08:16:09 -07:00
Anatol Belski 86dfe7be49 better way to fix PRIu64 availability on windows 2013-09-18 15:14:36 +02:00
David Soria Parra dc7015d4e4 Merge branch 'PHP-5.5'
* PHP-5.5:
  Revert "EmptyIterator now implements Countable; fixes bug 60577"
2013-09-18 15:06:58 +02:00
Christopher Jones b1574a78e7 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  RFC 6598 reserved ip range starts at 100.64.0.0
  fix a very rare case of use of uninitialized value combined with a memleak
  fix test concurrency
  fix test concurrency
  fix test concurrency
  fix test concurrency
  fix test concurrency
  fix build - PRIu64 vs %I64u
2013-09-18 05:41:20 -07:00
David Soria Parra 58c6e05748 Merge branch 'PHP-5.5'
* PHP-5.5:
  RFC 6598 reserved ip range starts at 100.64.0.0
2013-09-18 14:29:02 +02:00
Chris Wright 0d534d7c5e Add ldap_escape() 2013-09-18 12:18:05 +01:00
Michael Wallner 33c4b61c7f Merge branch 'PHP-5.5'
* PHP-5.5:
  fix a very rare case of use of uninitialized value combined with a memleak
2013-09-18 11:12:44 +02:00
Michael Wallner cdf5d201ab fix test concurrency 2013-09-18 11:02:45 +02:00
Michael Wallner e9877fe92e fix test concurrency 2013-09-18 10:53:11 +02:00
Michael Wallner 14d5341787 fix test concurrency 2013-09-18 10:52:51 +02:00
Michael Wallner 6866b45a48 fix test concurrency 2013-09-18 10:52:35 +02:00
Michael Wallner 002763fb7b fix test concurrency 2013-09-18 10:52:18 +02:00
Anatol Belski 4a85b5e190 fix build - PRIu64 vs %I64u 2013-09-17 16:02:08 +02:00
Christopher Jones f0d8de4ca3 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src: (27 commits)
  final bits
  we need to use the full stream wrapper for filters
  let the libsqlite3 symbols be exported in dll
  NEWS/UPGRADING{,.INTERNALS} notes about temp POST stream
  Exclude bison 3.0 by Mike
  NEWS for added reserved ip addresses according to RFC 6598
  Add RFC 6598 IPs to reserved addresses
  upload2G note
  NEWS for #60577
  NEWS for bug #64441
  Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
  EmptyIterator now implements Countable; fixes bug 60577
  News for bugfix #64157
  Bug 64157 Changed error message to make sense
  remove unused code
  tests
  make reading php://input JIT if enable_post_data_reading=0
  revert stream cast
  fix ZTS build
  slim post data
  ...
2013-09-17 05:40:50 -07:00
Michael Wallner e6084da473 final bits 2013-09-17 13:59:49 +02:00
Michael Wallner 423c70fb4d Merge branch 'slim-postdata-merge'
* slim-postdata-merge:
  remove unused code
  tests
  make reading php://input JIT if enable_post_data_reading=0
  revert stream cast
  fix ZTS build
  slim post data

Conflicts:
	ext/soap/soap.c
	ext/standard/php_fopen_wrapper.c
	main/SAPI.c
2013-09-17 13:52:25 +02:00
Michael Wallner 0f78d8612a we need to use the full stream wrapper for filters 2013-09-17 13:44:50 +02:00
Anatol Belski 41d78110ff let the libsqlite3 symbols be exported in dll 2013-09-17 13:05:44 +02:00
Michael Wallner 512734b58d Merge remote-tracking branch 'refs/remotes/origin/master'
* refs/remotes/origin/master:
  Exclude bison 3.0 by Mike
2013-09-17 11:10:38 +02:00
Michael Wallner 4a3936ef4a NEWS/UPGRADING{,.INTERNALS} notes about temp POST stream 2013-09-17 11:08:23 +02:00
Xinchen Hui be581ec66d Exclude bison 3.0 by Mike 2013-09-17 16:54:27 +08:00
Michael Wallner 1c15d70cbd Merge branch 'slim-postdata'
* slim-postdata:
  slim post data
  add NEWS entry; add simple test
  more precise condition
  make this work in vc11 too
  Use int64_t and atoll() after discussion with johannes
  ws
  Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files above 2G.
2013-09-17 10:50:49 +02:00
David Soria Parra 52ff129607 Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS for added reserved ip addresses according to RFC 6598
  Add RFC 6598 IPs to reserved addresses
2013-09-17 09:55:59 +02:00
Michael Wallner 552f22abae upload2G note 2013-09-17 08:04:07 +02:00
David Soria Parra ca75e6f760 Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS for #60577
  NEWS for bug #64441
  Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
  EmptyIterator now implements Countable; fixes bug 60577
  News for bugfix #64157
  Bug 64157 Changed error message to make sense
2013-09-16 23:36:48 +02:00
Christopher Jones b740bfc741 Merge branch 'master' of https://git.php.net/repository/php-src
# By Michael Wallner (3) and others
# Via Michael Wallner (2) and Xinchen Hui (2)
* 'master' of https://git.php.net/repository/php-src:
  use 65k of data to get a more explicit result
  double test timeout for travis
  this test is fragile on travis, let's see why
  Add test for ISSUE #128
  Fixed bug #65665 (Exception not properly caught when opcache enabled)
  Save a TSRMLS_FETCH() for zval_ptr_dtor in executor
2013-09-16 10:21:31 -07:00
Christopher Jones 699b43ff87 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  use 65k of data to get a more explicit result
  double test timeout for travis
  this test is fragile on travis, let's see why
  Add test for ISSUE #128
  Fixed bug #65665 (Exception not properly caught when opcache enabled)
  Save a TSRMLS_FETCH() for zval_ptr_dtor in executor
2013-09-16 05:40:44 -07:00
Michael Wallner ca3d5d06e4 use 65k of data to get a more explicit result 2013-09-16 10:50:02 +02:00
Michael Wallner 6dff371a35 Merge branch 'PHP-5.5'
* PHP-5.5:
  double test timeout for travis
2013-09-16 09:35:29 +02:00
Michael Wallner 52bd9f05ea this test is fragile on travis, let's see why 2013-09-16 09:29:42 +02:00
Xinchen Hui 743c680545 Merge branch 'PHP-5.5' 2013-09-16 15:03:09 +08:00
Xinchen Hui e53e79c701 Merge branch 'PHP-5.5' 2013-09-16 14:43:13 +08:00
Nikita Popov bdfa03d79d Save a TSRMLS_FETCH() for zval_ptr_dtor in executor
This gives me about 9% improvement on Zend/bench.php for a zts build.
2013-09-14 23:02:26 +02:00
Christopher Jones f71167e252 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Fix intl build
2013-09-13 16:46:20 -07:00
Christopher Jones c4df19187a Merge branch 'master' of https://git.php.net/repository/php-src
# By Nikita Popov
# Via Nikita Popov
* 'master' of https://git.php.net/repository/php-src:
  Fix intl build
2013-09-13 16:44:10 -07:00
Nikita Popov 8748e146b9 Fix intl build 2013-09-14 01:37:09 +02:00
Christopher Jones 81b5a06fd6 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Remove some more unnecessary macros from phar
  Remove PHAR_(Z)STR* usages
  Remove version checks in phar
2013-09-13 16:21:28 -07:00
Christopher Jones e03a3d55d8 Merge branch 'master' of https://git.php.net/repository/php-src
# By Nikita Popov (10) and others
# Via Nikita Popov (6) and others
* 'master' of https://git.php.net/repository/php-src: (26 commits)
  Remove some more unnecessary macros from phar
  Remove PHAR_(Z)STR* usages
  Remove version checks in phar
  Fix two warnings
  Provide more macros for handling of interned strings
  Make use of Z_*VAL and ZVAL_* in language scanner
  Make consistent use of Z_*VAL macros in compiler
  fix broken sha2 configure tests
  fix broken sha2 configure tests
  Small cleanup in class name resolution of compiler
  Fixed minor bug in test.
  Move NEWS entries to correct version
  Fix bug #64782: SplFileObject constructor make $context optional
  Prepare pdo_firebird for a pecl release also
  Fix bug #65502: DateTimeImmutable::createFromFormat returns DateTime
  Fix bug #65548: Comparison for DateTimeImmutable doesn't work
  Sort the NEWS file alphabetically.
  Request non-keep-alive connections by default in HTTP 1.1 requests.
  Allow CURLOPT_FOLLOWLOCATION to be used with open_basedir.
  Tinker with the wording of the short_open_tag description.
  ...
2013-09-13 14:10:58 -07:00
Nikita Popov db6d93feca Remove some more unnecessary macros from phar 2013-09-13 21:49:09 +02:00
Nikita Popov e6b228332f Remove PHAR_(Z)STR* usages 2013-09-13 21:49:09 +02:00
Nikita Popov 39bd738fbf Remove version checks in phar
No need to keep around compatability code for PHP 5.0 and PHP 6.
2013-09-13 21:47:59 +02:00
Christopher Jones 3a8f0b1077 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Fix two warnings
  Provide more macros for handling of interned strings
  Make use of Z_*VAL and ZVAL_* in language scanner
  Make consistent use of Z_*VAL macros in compiler
2013-09-13 11:20:38 -07:00
Nikita Popov 91a9569d85 Fix two warnings 2013-09-13 20:01:23 +02:00
Nikita Popov 96b1c2145c Provide more macros for handling of interned strings
* str_erealloc behaves like erealloc for normal strings, but will
   use emalloc+memcpy for interned strings.
 * str_estrndup behaves like estrndup for normal strings, but will
   not copy interned strings.
 * str_strndup behaves like zend_strndup for normal strings, but
   will not copy interned strings.
 * str_efree_rel behaves like efree_rel for normal strings, but
   will not free interned strings.
 * str_hash will return INTERNED_HASH for interned strings and
   compute it using zend_hash_func for normal strings.
2013-09-13 19:42:10 +02:00
Nikita Popov d2950ac279 Make use of Z_*VAL and ZVAL_* in language scanner 2013-09-13 15:08:01 +02:00
Nikita Popov 00799319f9 Make consistent use of Z_*VAL macros in compiler 2013-09-13 15:07:47 +02:00
Christopher Jones e75171ec8a Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  fix broken sha2 configure tests
  fix broken sha2 configure tests
  Small cleanup in class name resolution of compiler
  Fixed minor bug in test.
  Move NEWS entries to correct version
2013-09-13 05:40:48 -07:00
Michael Wallner da30202d55 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix broken sha2 configure tests
2013-09-13 12:59:45 +02:00
Michael Wallner 2e692b22e9 fix broken sha2 configure tests
see http://patch-tracker.debian.org/patch/series/view/php5/5.5.3+dfsg-1/fix_broken_sha2_test.patch
2013-09-13 12:56:38 +02:00
Nikita Popov ef9e003b0c Small cleanup in class name resolution of compiler
* The fetch_type and check_ns_name parameters of
   zend_resolve_class_name were unused and are now removed.
 * ZEND_FETCH_CLASS_GLOBAL is no longer used (no code actually
   checking for it).
 * The checks for usage of "namespace" as class name were
   unnecessary as that situation can't occur anyways.
2013-09-13 12:18:39 +02:00
Nikita Popov 5350b9957a Merge branch 'PHP-5.5' 2013-09-12 23:30:40 +02:00
Nikita Popov 70cd85b6ec Merge branch 'PHP-5.5' 2013-09-12 18:25:49 +02:00
Christopher Jones d59db90d37 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Fix bug #64782: SplFileObject constructor make $context optional
  Prepare pdo_firebird for a pecl release also
  Fix bug #65502: DateTimeImmutable::createFromFormat returns DateTime
  Fix bug #65548: Comparison for DateTimeImmutable doesn't work
2013-09-12 08:57:33 -07:00
Nikita Popov 64ee0cde5d Merge branch 'PHP-5.5' 2013-09-12 17:49:28 +02:00
Popa Adrian Marius 074385cb33 Prepare pdo_firebird for a pecl release also 2013-09-12 17:47:05 +03:00
Nikita Popov 89d115264c Merge branch 'PHP-5.5' 2013-09-12 15:23:11 +02:00
Nikita Popov 32437b945a Merge branch 'PHP-5.5' 2013-09-12 15:15:17 +02:00
Christopher Jones c10d8a4b1e Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Sort the NEWS file alphabetically.
  Request non-keep-alive connections by default in HTTP 1.1 requests.
2013-09-12 05:40:59 -07:00
Adam Harvey 59e2ce9ff1 Sort the NEWS file alphabetically.
Insert OCD otter meme here.
2013-09-11 14:37:07 -07:00
Adam Harvey 8983a38d51 Request non-keep-alive connections by default in HTTP 1.1 requests.
As noted in FR #65634, at present we don't send a Connection request header
when the protocol version is set to 1.1, which means that RFC-compliant Web
servers should respond with keep-alive connections. Since there's no way of
reusing the HTTP connection at present, this simply means that PHP will appear
to hang until the remote server hits its connection timeout, which may be quite
some time.

This commit sends a "Connection: close" header by default when HTTP 1.1 (or
later) is requested by the user via the context options. It can be overridden
by specifying a Connection header in the context options. It isn't possible to
disable sending of the Connection header, but given "Connection: keep-alive" is
the same as the default HTTP 1.1 behaviour, I don't see this as a significant
issue — users who want to opt in for that still can.

As a note, although I've removed an efree(protocol_version), this doesn't
result in a memory leak: protocol_version is freed in the out: block at the end
of the function anyway, and there are no returns between the removed efree()
and the later call. Yes, I ran the tests with valgrind to check that. ☺

Implements FR #65634 (HTTP wrapper is very slow with protocol_version 1.1).
2013-09-11 14:11:29 -07:00
Christopher Jones f34e9fcd5f Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Allow CURLOPT_FOLLOWLOCATION to be used with open_basedir.
2013-09-11 05:41:00 -07:00
Adam Harvey fba290c061 Allow CURLOPT_FOLLOWLOCATION to be used with open_basedir.
Newer versions of libcurl prevent file:// location response headers by default,
which means that the open_basedir check is unnecessary — the fact
CURLOPT_REDIR_PROTOCOLS can't set CURLPROTO_FILE with open_basedir enabled
means that there's no possibility of breaching the open_basedir restriction,
and this allows HTTP redirects to be followed automatically.

Implements FR #65646 (re-enable CURLOPT_FOLLOWLOCATION with open_basedir or
safe_mode).
2013-09-10 11:42:42 -07:00
Christopher Jones 97f9a677b8 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Tinker with the wording of the short_open_tag description.
  Fix NEWS: these commits were after 5.5.4 was branched and will be in 5.5.5.
  Handle CLI server request headers case insensitively.
  5.4.21 now
2013-09-10 05:41:01 -07:00
Michael Wallner 71bee63fad remove unused code 2013-09-10 13:16:24 +02:00
Michael Wallner 832e2d0d8c tests 2013-09-10 13:14:02 +02:00
Michael Wallner 449d4c0b1c make reading php://input JIT if enable_post_data_reading=0 2013-09-10 13:13:33 +02:00
Michael Wallner e3e4d1b144 revert stream cast 2013-09-10 13:13:09 +02:00
Adam Harvey b8beb657ca Merge branch 'PHP-5.5'
* PHP-5.5:
  Tinker with the wording of the short_open_tag description.

Conflicts:
	php.ini-development
	php.ini-production
2013-09-09 16:59:26 -07:00
Adam Harvey 2240f9531b Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix NEWS: these commits were after 5.5.4 was branched and will be in 5.5.5.
2013-09-09 16:46:45 -07:00
Adam Harvey 1ff81965c5 Merge branch 'PHP-5.5'
* PHP-5.5:
  Handle CLI server request headers case insensitively.
  5.4.21 now
2013-09-09 16:33:43 -07:00
Christopher Jones 3ce8b70220 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  ensure that the defined interpolation method is used by the generic scaling functions
  Fixed issue #128 (opcache_invalidate segmentation fault)
  5.5.5 now
2013-09-09 05:43:28 -07:00
unknown d32194172a Merge branch 'PHP-5.5'
* PHP-5.5:
  ensure that the defined interpolation method is used by the generic scaling functions
2013-09-09 11:56:58 +02:00
Dmitry Stogov df711f2c56 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed issue #128 (opcache_invalidate segmentation fault)
2013-09-09 10:11:43 +04:00
Dmitry Stogov 2f4bc9d4af Merge commit 'fc9d886f6cd7858bc38c0b564a547dfa2bb743c6'
* commit 'fc9d886f6cd7858bc38c0b564a547dfa2bb743c6':
  5.5.5 now
2013-09-09 10:11:20 +04:00
Dylan Arnold a911fbc80a Call php_module_shutdown() for php-fpm child processes 2013-09-09 13:06:38 +12:00
Christopher Jones ac519eaef2 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Remove obsolete flag
  Update DTrace probes
  Add test for oci_set_* error changes
  Make oci_set_*($connection,...) errors retrievable via oci_error($connection). Improve some error handling to produce error text on some rare edge cases. Disambiguate the Oracle library function call return status values from ORA error numbers. Review and unify error data types.
2013-09-06 11:05:13 -07:00
Christopher Jones 43289d664c Remove obsolete flag 2013-09-06 10:12:16 -07:00
Christopher Jones ca4d122adc Update DTrace probes 2013-09-06 08:54:19 -07:00
Christopher Jones e504ed66a8 Add test for oci_set_* error changes 2013-09-06 08:14:18 -07:00
Christopher Jones 4b778faa80 Make oci_set_*($connection,...) errors retrievable via oci_error($connection).
Improve some error handling to produce error text on some rare edge cases.
Disambiguate the Oracle library function call return status values from ORA error numbers.
Review and unify error data types.
2013-09-05 18:18:29 -07:00
Manuel Mausz 7dbb1bba64 fix failing tests 2013-09-05 09:32:12 +02:00
Manuel Mausz 0be6ecb862 fix indention 2013-09-05 01:19:00 +02:00
Manuel Mausz 8ca43527e8 Add support for CryptoPro S-box for GOST
This adds a new hash identifier "gost-crypto" which uses the CryptoPro
S-box tables as specified by RFC 4357, section 11.2.
2013-09-05 01:04:25 +02:00
Christopher Jones 6ece550394 Cast time_t since some "dtrace -G" invocations fail on time_t arguments 2013-09-03 15:17:36 -07:00
Christopher Jones 8a0ae67dd9 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Update NEWS/UPGRADING with info about incompat ctx
2013-09-03 05:40:49 -07:00
Tim Strehle 5ffaf95d3f run-tests.php: Adding support for sections EXPECT_EXTERNAL, EXPECTF_EXTERNAL and EXPECTREGEX_EXTERNAL. (Issue 55736) 2013-09-03 14:40:43 +02:00
Gustavo André dos Santos Lopes 04fcf6a98b Update NEWS/UPGRADING with info about incompat ctx 2013-09-02 23:19:53 +02:00
Christopher Jones d532ffae42 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Typo....
  Add a XFAIL test for #64896
  Implement phase 1 of rfc/incompat_ctx
  Make use of direct returns in some places
  Always pass return_value_ptr to internal functions
2013-09-02 05:40:51 -07:00
Xinchen Hui 825c1f239b Merge branch 'PHP-5.5' 2013-09-02 16:16:15 +08:00
Xinchen Hui f33bdf68b1 Merge branch 'PHP-5.5' 2013-09-02 16:03:10 +08:00
Gustavo André dos Santos Lopes d515455589 Implement phase 1 of rfc/incompat_ctx
Just changing the error level of the message from E_STRICT to
E_DEPRECATED. This comes one version later than the timeline
mentioned in the RFC.

Oddly, there were no tests for this ‘feature’. I added a simple
one.
2013-09-02 01:53:06 +02:00
Nikita Popov 47ee470992 Make use of direct returns in some places 2013-08-31 13:16:50 +02:00
Nikita Popov 0856714576 Always pass return_value_ptr to internal functions
Previous some places passed return_value_ptr only if the function
returned by reference. Now return_value_ptr is always set, even
for functions returning by-value.

This allows you to return zvals without copying their contents. For
this purpose two new macros RETVAL_ZVAL_FAST and RETURN_ZVAL_FAST
are added:

    RETVAL_ZVAL_FAST(zv); /* Analog to RETVAL_ZVAL(zv, 1, 0) */
    RETURN_ZVAL_FAST(zv); /* Analog to RETURN_ZVAL(zv, 1, 0) */

These macros behave similarly to the non-FAST versions with
copy=1 and dtor=0, with the difference that the FAST versions
will try return the zval without copying by utilizing return_value_ptr.
2013-08-31 13:16:41 +02:00
Christopher Jones d7ffca590b Allow OCI8 to be DTrace-enabled independently of core PHP's DTrace
status.  The proviso is OCI8 must be built "shared" when DTrace is
enabled.  This implementation (i) works around an incomplete core PHP
solution for extension tracing (ii) avoid any issues with DOF section
location and the complexities of needing to merge all provider .d
files for static builds (iii) allows OCI8 to be DTrace-enabled when
doing PECL installs of OCI8 on PHP versions without core PHP DTrace
support.

This is an initial patch i.e. it will undergo further testing.
2013-08-30 17:37:44 -07:00
Christopher Jones 82da51bbce OCI8: remove unused ext/oci8/config.m4 macro 2013-08-30 11:15:56 -07:00
Christopher Jones e6053acd78 OCI8 whitespace: remove tabs embedded in code 2013-08-30 11:14:20 -07:00
Anthony Ferrara 612e77e5c9 Fix issue with global fallback not in global space 2013-08-30 11:55:43 -04:00
Anthony Ferrara d7e3aca9c9 Fix issue with global fallback when not in global space 2013-08-30 11:53:57 -04:00
Christopher Jones faddd409a4 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Fixed bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
  Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
  Update NEWS
  Fixed bug #60598 (cli/apache sapi segfault on objects manipulation)
  Remove ini dependency in test
2013-08-30 05:40:44 -07:00
Remi Collet 9e17094cf4 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
  Fixed Bug #65564 stack-buffer-overflow in DateTimeZone stuff caught by AddressSanitizer
2013-08-30 10:46:06 +02:00
Xinchen Hui a607a08e09 Merge branch 'PHP-5.5' 2013-08-30 11:23:24 +08:00
Yasuo Ohgaki 09ed50fa44 Remove ini dependency in test 2013-08-30 11:46:16 +09:00
Igor Wiedler e14a769c56 Add test for conditional function declaration 2013-08-29 17:16:18 +02:00
Christopher Jones 598466e6d3 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Fixed bug #65510 (5.5.2 crashes in _get_zval_ptr_ptr_var)
  Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
  Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
  Fixed compatibility with php-5.2
  Fixed bug #65561 (Zend Opcache on Solaris 11 x86 needs ZEND_MM_ALIGNMENT=4). (Terry Ellison)
  Avoid compiler warning
  Fix bug #65579 (Using traits with get_class_methods causes segfault).
2013-08-29 05:40:31 -07:00
Dmitry Stogov ec173433da Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #65510 (5.5.2 crashes in _get_zval_ptr_ptr_var)

Conflicts:
	NEWS
2013-08-29 11:57:19 +04:00
Dmitry Stogov 462f2167ae Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
  Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)

Conflicts:
	NEWS
2013-08-29 11:20:12 +04:00
Dmitry Stogov c8673b64ce Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed compatibility with php-5.2
2013-08-29 10:45:00 +04:00
Dmitry Stogov 6ff7dd05bf Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Avoid compiler warning
  Fix bug #65579 (Using traits with get_class_methods causes segfault).
2013-08-29 10:31:50 +04:00
Dmitry Stogov b6864d978c Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #65561 (Zend Opcache on Solaris 11 x86 needs ZEND_MM_ALIGNMENT=4). (Terry Ellison)

Conflicts:
	NEWS
2013-08-29 10:31:14 +04:00
Xinchen Hui 0ea00936be Merge branch 'PHP-5.5' 2013-08-29 14:02:53 +08:00
Christopher Jones 6d66d613f6 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  removed the /Wp64 switch as we use true 64 bit compiler now
  updated lib versions
  updated lib versions, the vc11 ones only matter now
2013-08-28 11:14:51 -07:00
Anatol Belski 82bb2a2535 Merge branch 'PHP-5.5'
* PHP-5.5:
  removed the /Wp64 switch as we use true 64 bit compiler now
2013-08-28 15:10:42 +02:00
Anatol Belski 29fa735dfc Merge branch 'PHP-5.5'
* PHP-5.5:
  updated lib versions
2013-08-28 14:43:53 +02:00
Anatol Belski 8cc1ee8c81 Merge branch 'PHP-5.5'
* PHP-5.5:
  updated lib versions, the vc11 ones only matter now
2013-08-28 14:30:03 +02:00
Christopher Jones 49cd21e71c OCI8 2.0: add oci8-check-connection probe and do some renaming 2013-08-27 16:41:02 -07:00
Michael Wallner d4b673a34c fix ZTS build 2013-08-27 14:01:59 +02:00
Michael Wallner bb1f9d3826 slim post data 2013-08-27 13:43:22 +02:00
Michael Wallner 2438490add slim post data 2013-08-27 13:31:35 +02:00
Xinchen Hui 72f80b2997 Merge branch 'PHP-5.5' 2013-08-27 15:45:27 +08:00
Christopher Jones 4b67c781f3 Use "__" consistently in OCI8 DTrace probe definitions. It maps to "-" in the probe name. 2013-08-26 15:42:57 -07:00
Christopher Jones 493ad87027 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Evaluate ZVAL_ZVAL arguments only once
2013-08-26 14:36:22 -07:00
Christopher Jones 8aca4e45bb Leave it to DTrace FBT to trace underlying library calls 2013-08-26 14:20:58 -07:00
Nikita Popov d18b969858 Evaluate ZVAL_ZVAL arguments only once
Also remove some isref/refcount assignments, which are no longer
necessary (as ZVAL_COPY_VALUE is used now).
2013-08-26 19:57:14 +02:00
Anatol Belski b8213906ff fixed decrement 2013-08-26 07:31:10 -07:00
Anatol Belski 4b484e0278 fixed numeric string comparsion 2013-08-26 07:06:31 -07:00
Anatol Belski 1b523d9c93 Merge branch 'string_size_refactor_take_2' into str_size_and_int64 2013-08-26 05:44:35 -07:00
Anatol Belski a0dfabed1f some more linux fixes 2013-08-26 05:54:33 -07:00
Anatol Belski 61a1a3e39b fixed configure.in 2013-08-26 05:19:14 -07:00
Anatol Belski 6e4395b586 ext/intl further fixes 2013-08-26 04:33:07 -07:00
Anatol Belski 9c81da4170 ext/intl further converting 2013-08-26 01:52:31 -07:00
Dmitry Stogov a13c00cd14 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed compilation warning
2013-08-26 09:49:22 +04:00
Stanislav Malyshev 7c08ce243c Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix bug #65554 in DateTime, when use it with D/l in format and textual day have dot at the end
2013-08-25 15:14:36 -07:00
Igor Wiedler 6263f221ff Handle case sensivity of constants (nikic) 2013-08-25 16:21:51 +02:00
Igor Wiedler 28fa0896df Comment nitpick (nikic) 2013-08-25 15:09:19 +02:00
Igor Wiedler 84c8aa3691 self and parent are valid function and const names (nikic) 2013-08-25 15:08:26 +02:00
Igor Wiedler bc473228c8 Adjust some test names, remove obsolete and duplicate tests (nikic) 2013-08-25 14:03:07 +02:00
Stanislav Malyshev 60854d1d26 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix mysql tests & mark nextRowset problematic tests
  fix mysql init
  add openssl
  add mysql settings
2013-08-25 00:30:00 -07:00
Stanislav Malyshev a84bb6bf86 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix DateInterval->days value when object was created not from DateTime::diff()
2013-08-24 23:39:13 -07:00
Stanislav Malyshev 01c028a475 Merge branch 'pull-request/322'
* pull-request/322:
  Remove semicolon
  Fix DateInterval->days value when object was created not from DateTime::diff()
2013-08-24 23:39:09 -07:00
Stanislav Malyshev cbc848a555 Merge branch 'PHP-5.5'
* PHP-5.5:
  Test extension xmlrpc encode type double and string decode type string and int
2013-08-24 21:45:26 -07:00
Stanislav Malyshev 26cd3425ee Merge branch 'pull-request/419'
* pull-request/419:
  Test extension xmlrpc encode type double and string decode type string and int
2013-08-24 21:45:21 -07:00
Stanislav Malyshev 603098d73d Merge branch 'PHP-5.5'
* PHP-5.5:
  Stricter libc-client symlink check
2013-08-24 21:41:03 -07:00
Stanislav Malyshev fa26576932 Merge branch 'pull-request/417'
* pull-request/417:
  Stricter libc-client symlink check
2013-08-24 21:40:38 -07:00
Stanislav Malyshev 524fab3e41 Merge branch 'PHP-5.5'
* PHP-5.5:
  Expose fputcsv's escape_char to userland
2013-08-24 20:46:03 -07:00
Stanislav Malyshev 3e4f862076 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix #65483: quoted-printable encode stream filter incorrectly encoding spaces
  Update NEWS
2013-08-24 19:50:11 -07:00
Stanislav Malyshev 8ee126f0bb Merge branch 'pull-request/414'
* pull-request/414:
  Fix #65483: quoted-printable encode stream filter incorrectly encoding spaces
2013-08-24 19:49:59 -07:00
Igor Wiedler 115c5ec726 Compile error on const definition conflicting with import 2013-08-25 00:05:55 +02:00
Igor Wiedler 85d4cfb00d Disallow using functions/consts defined in the same file
* Keep track of defined function and const filenames
* Prohibit use function foo if function foo exists
* Prohibit use const foo if const foo exists
2013-08-25 00:02:46 +02:00
Anatol Belski 14f8e16870 more fixes to ext/intl 2013-08-24 07:32:28 -07:00
Anatol Belski 07b87a2a7f Z_STRLEN vs Z_STRSIZE in ext/intl 2013-08-24 07:02:28 -07:00
Anatol Belski 1492bc1d60 adapted args in ext/intl 2013-08-24 05:08:22 -07:00
Anatol Belski 2545fbbdc2 fixed the mb_regex* stuff 2013-08-24 03:24:06 -07:00
Anatol Belski 2bf8f91b87 fixed sapi filter usage 2013-08-24 03:04:35 -07:00
Anatol Belski 9382c75061 replaced all the arg formats and Z_STRLEN
won't work yet, just initial work to be done
2013-08-24 02:54:21 -07:00
Igor Wiedler 30f16c3540 Compile error on function definition conflicting with import 2013-08-23 23:39:42 +02:00
Igor Wiedler 5b18530e8c Add test cases for conflicting use and definition in same ns (stas) 2013-08-23 23:31:17 +02:00
Anatol Belski 644278c1a3 Merge branch 'master' of https://github.com/php/php-src into string_size_refactor_take_2 2013-08-23 09:07:58 -07:00
Anatol Belski 07fa043cc3 Merge branch 'PHP-5.5'
* PHP-5.5:
  Suppress static analyzer warnings in specialized executor
  Update NEWS
2013-08-23 17:45:45 +02:00
Anatol Belski 77303a3248 Merge branch 'PHP-5.5'
* PHP-5.5:
  ensure the test doesn't fail because of tz warning
2013-08-23 16:41:02 +02:00
Anatol Belski 3d49768cc2 fixed set process_title() 2013-08-23 07:12:56 -07:00
Anatol Belski 2a28a30c4d fix pcre usage in spl 2013-08-23 06:47:18 -07:00
Anatol Belski f2a4f31bf4 fixed ext/pcre internal stuff
Now only the flaw is pcrelib itself as it works with int for
string length and offsets. Bigger stuff won't work anyway, but
if there are some issue there are just a few places like pcre_exec()
where we can explicitly cast to int.
2013-08-23 06:37:51 -07:00
Nikita Popov c0856a178f Merge branch 'PHP-5.5' 2013-08-23 13:30:46 +02:00
Anatol Belski 6b474bbcf6 adapted all the function arg formats in ext/zlib 2013-08-23 04:21:02 -07:00
Anatol Belski 03bee19890 some more fixes to zend operators 2013-08-23 04:03:21 -07:00
Anatol Belski ba52352363 added ZEND_INT_FMT 2013-08-23 03:32:35 -07:00
Anatol Belski 3cbf45c510 some fixes to constants, var_dump and var_export 2013-08-23 02:34:14 -07:00
Anatol Belski 262de5d054 first fixes to ext/spl, yet incomplete 2013-08-23 01:56:16 -07:00
Anatol Belski ff233b591c fixes to reflection 2013-08-23 01:26:17 -07:00
Anatol Belski 3aed22ae8e fixes to ereg 2013-08-23 01:14:02 -07:00
Anatol Belski ebd2fc6b3f more fixes to ext/date 2013-08-23 01:08:35 -07:00
Anatol Belski 427cde5da6 replaced arg formats in pcre 2013-08-23 00:56:10 -07:00
root a4de9c0397 Test extension xmlrpc encode type double and string decode type string and int 2013-08-23 01:06:58 +00:00
Anatol Belski 570adc16e7 fixed sapi.h 2013-08-22 11:02:24 -07:00
Anatol Belski aae79a684d replaced all arg formats in ext/standard 2013-08-22 10:51:29 -07:00
Anatol Belski 0f892ce613 replaced all the int params in the datetime 2013-08-22 09:38:05 -07:00
Anatol Belski 261938b5e0 Merge branch 'string_size_refactor_take_2' into str_size_and_int64
Conflicts:
	ext/standard/string.c
2013-08-22 09:13:46 -07:00
Christopher Jones 27954a8b8a Merge branch 'PHP-5.5'
* PHP-5.5:
  Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
  Revert "Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type""
  Revert "Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type""
2013-08-22 09:07:07 -07:00
Christopher Jones a61f5bf925 Revert "Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type""
This reverts commit f38bd22ed2.
2013-08-22 08:57:18 -07:00
Anatol Belski 5efaa8f7b9 adapted the function args for ereg
And that actually seems to be it, all tests pass so far. So lets
see how it goes in the fture, too easy but seems to be done for now .
2013-08-22 08:45:08 -07:00
Igor Wiedler 31d77053a1 More test cases for conflicting aliases 2013-08-22 15:51:26 +02:00
Danack 6b385ebc85 Removed assumption that \\ will be present
The function zend_add_ns_func_name_literal is called if the parser finds a function that is not in the global or current namespace. It assumes such a function will have a \\ in it, which is no longer true with the use function patch. The code change above removes that assumption and makes the test work:
PASS use and use function with the same alias [Zend/tests/use_function/conflicting_use_alias.phpt]
2013-08-22 15:51:26 +02:00
Igor Wiedler 2dbbb8ae4b Add test case for conflicting use and use function alias (stas) 2013-08-22 15:51:26 +02:00
Igor Wiedler 4adf49eeaf Import namespaced constants via new 'use const' sequence 2013-08-22 15:51:26 +02:00
Igor Wiedler e1125a6a89 Correctly distinguish between functions and constants
So far 'use function' applied to both constants and functions. This
patch correctly separates the two.
2013-08-22 15:51:26 +02:00
Igor Wiedler 5dd41627be Add new 'use function' sequence for importing namespaced functions
This is specified as the use_function RFC:

* https://wiki.php.net/rfc/use_function
2013-08-22 15:51:25 +02:00
Anatol Belski 320e82b603 trivial fix spl_autoload_functions() 2013-08-22 06:48:55 -07:00
Matteo Beccati 80917e5ca2 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed other compiler warnings
2013-08-22 15:34:22 +02:00
Anatol Belski bfb0e87e2b final fix for hebrev() 2013-08-22 06:06:24 -07:00
Nikita Popov 926987bdc7 Merge branch 'PHP-5.5' 2013-08-22 14:07:32 +02:00
Nikita Popov 1a88fcc2d8 Remove trailing whitespace in test
Third try to make this work...
2013-08-22 13:09:53 +02:00
Anatol Belski 5351aa9ac1 Merge branch 'string_size_refactor_take_2' of https://github.com/weltling/php-src into string_size_refactor_take_2 2013-08-22 03:45:28 -07:00
Anatol Belski 569cbd2081 fix build 2013-08-22 03:59:09 -07:00
Nikita Popov 96045e1b33 Forgot newline in test 2013-08-22 12:26:34 +02:00
Nikita Popov 647059abc7 Merge branch 'PHP-5.5' 2013-08-22 11:47:55 +02:00
Nikita Popov b668a26c2f Fix pgsql notice test failure 2013-08-22 11:31:56 +02:00
Christopher Jones e212320a0c Remove duplicate calls to set filename & lineno for the DTRACE_FUNCTION_ENTRY/RETURN cases 2013-08-22 11:23:07 +02:00
Nikita Popov 4db494a3ab Merge branch 'PHP-5.5' 2013-08-22 11:01:19 +02:00
Anatol Belski 764054c2eb Merge branch 'master' of https://github.com/php/php-src into string_size_refactor_take_2 2013-08-22 01:40:20 -07:00
Anatol Belski 5c6428b0b9 fixed file_put_contents() 2013-08-22 01:27:08 -07:00
Anatol Belski ea56c2dcfd fixed fwrite 2013-08-22 00:54:45 -07:00
Anatol Belski 09c3b6c1b6 fixed "s" vs "S" for soundex 2013-08-22 00:45:16 -07:00
Ole Markus With e3619778c9 Stricter libc-client symlink check 2013-08-22 08:59:33 +02:00
Christopher Jones 9507fcfdc5 Merge branch 'PHP-5.5'
* PHP-5.5:
  Suppress compiler warning "warning: variable ‘length’ set but not used [-Wunused-but-set-variable]"
  Suppress compiler warning "warning: variable ‘retcount’ set but not used [-Wunused-but-set-variable]"
2013-08-21 15:43:33 -07:00
Christopher Jones 0b60f32247 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
2013-08-21 15:23:50 -07:00
Christopher Jones 71ba571e53 Merge branch 'PHP-5.5'
* PHP-5.5:
  Suppress compliation warning "warning: passing argument 1 of ‘_efree’ discards qualifiers from pointer target type"
2013-08-21 15:07:13 -07:00
Christopher Jones d9bfe06194 Merge branch 'PHP-5.5'
* PHP-5.5:
  Reduce compilation noise during normal compilation:     php-5.5/ext/session/session.c:836: warning: unused variable ‘struc’     php-5.5/ext/session/session.c:836: warning: unused variable ‘num_key’     php-5.5/ext/session/session.c:836: warning: unused variable ‘key_length’     php-5.5/ext/session/session.c:836: warning: unused variable ‘key’     php-5.5/ext/session/session.c:835: warning: unused variable ‘key_type’     php-5.5/ext/session/session.c:834: warning: unused variable ‘_ht’     php-5.5/ext/session/session.c:857: warning: unused variable ‘has_value’     php-5.5/ext/session/session.c:856: warning: unused variable ‘namelen’     php-5.5/ext/session/session.c:853: warning: unused variable ‘name’     php-5.5/ext/session/session.c:852: warning: unused variable ‘p’
2013-08-21 10:35:07 -07:00
Michael Wallner 4abee3730f Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix pointer sign warning showing up in EVERY build
2013-08-21 19:18:29 +02:00
Anthony Ferrara 90b489f826 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix return types of password API helper functions.
2013-08-21 12:11:10 -04:00
Anatol Belski bda11c6bd2 partial fix to hebrev 2013-08-21 04:30:54 -07:00
Anatol Belski c8fbe078a1 fixed unpack() 2013-08-21 03:54:13 -07:00
Matteo Beccati 3ec28b1d1f Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed compiler warnings in ext/pgsql
  Fixed other compiler warnings in PDO_PGSQL
  Fixed compiler warning
  Update NEWS

Conflicts:
	ext/pdo_pgsql/pgsql_driver.c
2013-08-21 11:26:41 +02:00
Anatol Belski 2d44a04a83 fixed str_pad() 2013-08-21 01:35:40 -07:00
Anatol Belski d6c59e1d7e lost condition 2013-08-21 00:33:47 -07:00
Anatol Belski e2070d1409 Merge branch 'master' of https://github.com/php/php-src into string_size_refactor_take_2 2013-08-21 00:28:43 -07:00
Anatol Belski d871982507 Merge branch 'string_size_refactor_take_2' of https://github.com/ircmaxell/php-src into string_size_refactor_take_2 2013-08-21 00:28:19 -07:00
Anatol Belski c8acebe674 fixed str_split() 2013-08-21 00:27:07 -07:00
Yasuo Ohgaki aaf95aa1b6 Merge branch 'PHP-5.5'
* PHP-5.5:
  Add php_serialize session.serialize_handler. This patch closes
2013-08-21 11:06:11 +09:00
Yasuo Ohgaki d2a99a7c31 Fixed Bug #65475 2013-08-21 08:12:11 +09:00
Christopher Jones 89c4abab2b Merge branch 'PHP-5.5'
* PHP-5.5:
  Quash compile warning "warning: 'flags' may be used uninitialized in this function"
2013-08-20 13:37:22 -07:00
Christopher Jones 92b946bb9e Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Fix bug #64953 (Postgres prepared statement positional parameter casting)
2013-08-20 11:27:01 -07:00
Christopher Jones 77f5caae53 Merge branch 'PHP-5.5'
* PHP-5.5:
  Remove compilation warning "warning: no newline at end of file"
2013-08-20 11:04:51 -07:00
Christopher Jones 4883fc5365 Merge branch 'PHP-5.5'
* PHP-5.5:
  Remove compilation warnings: "warning: no newline at end of file"
2013-08-20 11:03:26 -07:00
Christopher Jones 8457636240 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix compile warning "intl_cppshims.h:34:7: warning: no newline at end of file"
2013-08-20 10:55:16 -07:00
Christopher Jones 0e56277d35 Merge branch 'PHP-5.5'
* PHP-5.5:
  Tabify
  Eliminate compiler warnings: "warning: pointer targets in initialization differ in signedness"
  Eliminate compiler warnings "warning: pointer targets in initialization differ in signedness"
2013-08-20 10:47:00 -07:00
Christopher Jones 8d614dcf54 Merge branch 'PHP-5.5'
* PHP-5.5:
  Remove some compilation warnings:   'unused variable' and   'enumeration value not handled in switch'
2013-08-20 10:34:47 -07:00
Michael Wallner 90218e8e7a Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix bug #64953 (Postgres prepared statement positional parameter casting)
2013-08-20 19:22:31 +02:00
Christopher Jones 96d435f9ae Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  split the glob() test to test different basedir
  Add session.use_strict_mode description to php.ini-*
  Revert wrong description
  bump version
  Fixed test bug
  Update NEWS
2013-08-20 05:40:48 -07:00
Anatol Belski 827100df82 split the glob() test to test different basedir 2013-08-20 13:40:19 +02:00
Yasuo Ohgaki 8da7aa7e41 Merge branch 'PHP-5.5'
* PHP-5.5:
  Add session.use_strict_mode description to php.ini-*
2013-08-20 18:30:46 +09:00
Yasuo Ohgaki 117bd0848a Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src: (37 commits)
  Revert wrong description
  bump version
  Fixed test bug
  Remove compile warning:    warning: unused variable ‘j’ [-Wunused-variable]
  Remove compile warnings:   warning: variable ‘lastch’ set but not used [-Wunused-but-set-variable]   warning: variable ‘buf’ set but not used [-Wunused-but-set-variable]
  Remove compile warning: variable ‘streamp’ set but not used [-Wunused-but-set-variable]
  Remove compile warnings:   variable ‘obj_cnt’ set but not used [-Wunused-but-set-variable]   unused variable ‘last’ [-Wunused-variable]   unused variable ‘j’ [-Wunused-variable]
  Remove compile warning "variable ‘mekeylen’ set but not used"
  Reduce (some more) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
  Update NEWS
  Update NEWS
  fix bug #65481 (shutdown segfault due to serialize)
  Track created curl_slist structs by option so they can be updated in situ.
  Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
  Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
  fixed glob() edge case on windows, ref bug #47358
  modified the new glob() test for master
  added new glob() test
  fix using wrong buffer pointer
  Fix bug #65470	Segmentation fault in zend_error() with --enable-dtrace
  ...
2013-08-20 17:46:40 +09:00
Yasuo Ohgaki fdef0e38f7 Revert wrong description 2013-08-20 17:38:17 +09:00
Michael M Slusarz 5201a2d566 Fix #65483: quoted-printable encode stream filter incorrectly encoding spaces 2013-08-20 01:12:12 -06:00
Stanislav Malyshev a52b8fe117 Merge branch 'PHP-5.5'
* PHP-5.5:
  bump version
  Update NEWS

Conflicts:
	configure.in
	main/php_version.h
2013-08-20 00:03:29 -07:00
Yasuo Ohgaki 7d538cf8dd Fixed test bug 2013-08-20 14:25:12 +09:00
Christopher Jones 902c3025ed Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Remove compile warning:    warning: unused variable ‘j’ [-Wunused-variable]
  Remove compile warnings:   warning: variable ‘lastch’ set but not used [-Wunused-but-set-variable]   warning: variable ‘buf’ set but not used [-Wunused-but-set-variable]
  Remove compile warning: variable ‘streamp’ set but not used [-Wunused-but-set-variable]
  Remove compile warnings:   variable ‘obj_cnt’ set but not used [-Wunused-but-set-variable]   unused variable ‘last’ [-Wunused-variable]   unused variable ‘j’ [-Wunused-variable]
  Remove compile warning "variable ‘mekeylen’ set but not used"
  Reduce (some more) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
  Update NEWS
2013-08-19 18:26:59 -07:00
Christopher Jones 24288eb4d1 Merge branch 'PHP-5.5'
* PHP-5.5:
  Remove compile warning:
      warning: unused variable ‘j’ [-Wunused-variable]
2013-08-19 17:58:53 -07:00
Christopher Jones 682c28c1f8 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  fix bug #65481 (shutdown segfault due to serialize)
  Track created curl_slist structs by option so they can be updated in situ.
  Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
  Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
2013-08-19 17:55:27 -07:00
Christopher Jones 5697aa5728 Merge branch 'PHP-5.5'
* PHP-5.5:
  Remove compile warnings:
      warning: variable ‘lastch’ set but not used [-Wunused-but-set-variable]
      warning: variable ‘buf’ set but not used [-Wunused-but-set-variable]
  Remove compile warning: variable ‘streamp’ set but not used [-Wunused-but-set-variable]
  Remove compile warnings:
      variable ‘obj_cnt’ set but not used [-Wunused-but-set-variable]
      unused variable ‘last’ [-Wunused-variable]
      unused variable ‘j’ [-Wunused-variable]
  Remove compile warning "variable ‘mekeylen’ set but not used"
2013-08-19 17:51:04 -07:00
Christopher Jones 19476f51f2 Merge branch 'PHP-5.5'
* PHP-5.5:
  Reduce (some more) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
  Update NEWS
2013-08-19 17:18:28 -07:00
Michael Wallner 73cd2e0ab1 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix bug #65481 (shutdown segfault due to serialize)
2013-08-20 00:09:26 +02:00
Adam Harvey 2a46fc0470 Merge branch 'PHP-5.5'
* PHP-5.5:
  Track created curl_slist structs by option so they can be updated in situ.

Conflicts:
	ext/curl/interface.c
2013-08-19 12:19:13 -07:00
Stanislav Malyshev d17ade127b Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
  Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
2013-08-19 11:19:43 -07:00
Christopher Jones bd7d7a2ba2 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src: (22 commits)
  fixed glob() edge case on windows, ref bug #47358
  modified the new glob() test for master
  added new glob() test
  fix using wrong buffer pointer
  Fix bug #65470	Segmentation fault in zend_error() with --enable-dtrace
  Fix for php bug #64802 includes test case
  Use in preg_replace_callback() using variables by reference and test for bug #64979
  https://bugs.php.net/bug.php?id=64979
  add CVE-2011-4718
  new for fix #65225
  Fixed #65225: PHP_BINARY incorrectly set
  Use pkg-config to detect iodbc
  Add -P option to use the current binary
  Create test to the extension xmlrpc
  Fixbug: phpize --clean will delete include/*.h
  code related typo fixes
  Create test to the extension xmlrpc
  Revise pgsql tests
  Use pkg-config to detect iodbc
  Fix duplicated 5.5.2 NEWS in my tree
  ...
2013-08-19 10:53:59 -07:00
Anatol Belski f4df40108b fixed glob() edge case on windows, ref bug #47358 2013-08-19 14:21:16 +02:00
Anatol Belski f61b648da4 modified the new glob() test for master 2013-08-19 11:22:18 +02:00
Anatol Belski 6c570ad322 Merge branch 'PHP-5.5'
* PHP-5.5:
  added new glob() test
2013-08-19 11:21:47 +02:00
Stanislav Malyshev cfe5833579 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix using wrong buffer pointer
2013-08-19 01:07:50 -07:00
Stanislav Malyshev ecd67ed3e5 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix bug #65470	Segmentation fault in zend_error() with --enable-dtrace
2013-08-18 17:24:16 -07:00
Stanislav Malyshev 12c2a8a5eb Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix for php bug #64802 includes test case
2013-08-18 16:55:03 -07:00
Stanislav Malyshev 42214b6474 Merge branch 'PHP-5.5'
* PHP-5.5:
  Use in preg_replace_callback() using variables by reference and test for bug #64979
  https://bugs.php.net/bug.php?id=64979
2013-08-18 15:19:27 -07:00
Stanislav Malyshev 33e9c02451 Merge branch 'PHP-5.5'
* PHP-5.5:
  add CVE-2011-4718
2013-08-18 14:42:59 -07:00
Stanislav Malyshev 4bc6e06037 Merge branch 'PHP-5.5'
* PHP-5.5:
  new for fix #65225
  Fixed #65225: PHP_BINARY incorrectly set
2013-08-18 14:21:24 -07:00
Stanislav Malyshev 4fbce676bd Merge branch 'pull-request/381'
* pull-request/381:
  Fixed #65225: PHP_BINARY incorrectly set
2013-08-18 14:20:46 -07:00
Stanislav Malyshev 756ce65b92 Merge branch 'PHP-5.5'
* PHP-5.5:
  Use pkg-config to detect iodbc
2013-08-18 14:16:34 -07:00
Stanislav Malyshev 8845262995 Merge branch 'pull-request/411'
* pull-request/411:
  Use pkg-config to detect iodbc
2013-08-18 14:15:53 -07:00
Stanislav Malyshev 958ee39fc7 Merge branch 'PHP-5.5'
* PHP-5.5:
  Add -P option to use the current binary
  Create test to the extension xmlrpc
2013-08-18 14:11:15 -07:00
Stanislav Malyshev f4da131328 Merge branch 'pull-request/412'
* pull-request/412:
  Create test to the extension xmlrpc
2013-08-18 14:08:57 -07:00
Stanislav Malyshev 5786e779fb Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixbug: phpize --clean will delete include/*.h
2013-08-18 13:52:49 -07:00
Stanislav Malyshev 625152591b Merge branch 'pull-request/405'
* pull-request/405:
  Fixbug: phpize --clean will delete include/*.h
2013-08-18 13:50:33 -07:00
Stanislav Malyshev 03b2603ce0 Merge branch 'PHP-5.5'
* PHP-5.5:
  code related typo fixes
  Fix duplicated 5.5.2 NEWS in my tree
2013-08-18 13:47:00 -07:00
root acda3dab6c Create test to the extension xmlrpc 2013-08-18 18:44:52 +00:00
Yasuo Ohgaki e960eebfea Revise pgsql tests 2013-08-18 18:24:34 +09:00
Yasuo Ohgaki b6c14af3f7 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src: (22 commits)
  fix typo
  merge news for 5.5.2
  Update NEWS
  Update NEWS
  With --enable-dtrace, the correct PIC/non-PIC .o files on Solaris and Linux are now used.  DTrace is part of Oracle Linux.  See https://oss.oracle.com/projects/DTrace/
  fix cve number
  New news section
  Prepare news for PHP-5.5.2
  Remove unused variable
  Reduce compiler noise by removing unused variables and labels
  Fixed #65431 in zend_exception.c by Sixd
  Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
  Skip test if SKIP_ONLINE_TESTS set
  Fix to file uploads >2G with size overflow
  Fix CVE-2013-4073 - handling of certs with null bytes
  Fix CVE-2013-4073 - handling of certs with null bytes
  Fixed #65431 (Discarded qualifiers from pointer target warnings when using --enable-dtrace) by Sixd
  Fix unused variable warning in OCI8 2.0
  removed unused vars
  fixed strndup usage in the pgsql ext
  ...
2013-08-18 12:30:25 +09:00
Anthony Ferrara dc29937050 Merge pull request #5 from weltling/string_size_refactor_take_2
String size refactor take 2, partial fixes to ext/standard
2013-08-17 12:42:52 -07:00
Anatol Belski 91ceb295da Fixed substr(), but no kidding now.
all the signed/unsigned arithmetic needs clear understanding
2013-08-17 10:10:15 -07:00
Ole Markus With 7e7a8f00c4 Use pkg-config to detect iodbc 2013-08-17 14:22:11 +02:00
Anatol Belski 99442a301d small correction to substr 2013-08-17 04:22:09 -07:00
Anatol Belski 6b067db5fb fixed strstr() 2013-08-17 03:53:07 -07:00
Christopher Jones 0c4ba514be Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  fix typo
  merge news for 5.5.2
2013-08-16 11:39:37 -07:00
Stanislav Malyshev a42e87dadb Merge branch 'PHP-5.5'
* PHP-5.5:
  fix typo
2013-08-16 11:34:27 -07:00
Stanislav Malyshev 94cd406b1e Merge branch 'PHP-5.5'
* PHP-5.5:
  merge news for 5.5.2
2013-08-16 11:31:39 -07:00
Christopher Jones c04d1406e9 Merge branch 'PHP-5.5'
* PHP-5.5:
  Update NEWS
  Update NEWS
2013-08-16 11:16:27 -07:00
Christopher Jones 8807726be3 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  fix cve number
2013-08-16 11:10:10 -07:00
Christopher Jones 2251e4369a Merge branch 'PHP-5.5'
* PHP-5.5:
  With --enable-dtrace, the correct PIC/non-PIC .o files on Solaris and Linux are now used.  DTrace is part of Oracle Linux.  See https://oss.oracle.com/projects/DTrace/
2013-08-16 10:57:55 -07:00
Stanislav Malyshev 991f0113bf Merge branch 'PHP-5.5'
* PHP-5.5:
  fix cve number
2013-08-16 10:39:15 -07:00
Anatol Belski 5c754227a7 fixed substr() 2013-08-16 08:10:14 -07:00
Anatol Belski a7a797b455 adapted all the zend_parse_parameters() calls 2013-08-16 02:37:08 -07:00
Anatol Belski 715b040f46 Merge branch 'master' of https://github.com/php/php-src into string_size_refactor_take_2
Conflicts:
	Zend/zend_exceptions.c
	ext/date/php_date.c
	ext/standard/string.c
	ext/standard/url_scanner_ex.c
	ext/standard/url_scanner_ex.re
	main/rfc1867.c
2013-08-16 01:45:50 -07:00
David Soria Parra 30502dbc75 Merge branch 'PHP-5.5'
* PHP-5.5:
  New news section
  Prepare news for PHP-5.5.2
2013-08-15 22:47:28 +02:00
Christopher Jones 77dea7898b Merge branch 'PHP-5.5'
* PHP-5.5:
2013-08-14 21:33:35 -07:00
Christopher Jones de0a602ce1 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Fixed #65431 in zend_exception.c by Sixd
2013-08-14 21:32:20 -07:00
Christopher Jones ac03b67e6a Remove unused variable 2013-08-14 21:21:17 -07:00
Christopher Jones 4824d0f43e Merge branch 'PHP-5.5'
* PHP-5.5:
  Reduce compiler noise by removing unused variables and labels
2013-08-14 21:08:55 -07:00
Xinchen Hui 7d3ec0c3ca Merge branch 'PHP-5.5' 2013-08-15 11:50:54 +08:00
Christopher Jones 3c166c4758 Merge branch 'PHP-5.5'
* PHP-5.5:
  Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.

Conflicts:
	ext/gmp/gmp.c
2013-08-14 20:47:00 -07:00
Christopher Jones 759517651e Merge branch 'PHP-5.5'
* PHP-5.5:
  Skip test if SKIP_ONLINE_TESTS set
2013-08-14 15:47:42 -07:00
Anatol Belski 9d4e5b0dba Fix to file uploads >2G with size overflow
Represent the file size as string when the total size would overflow
LONG_MAX. Otherwise while file itself were uploaded, the size would
be shown wrong. This mostly applies to systems with 32 bit long.
2013-08-14 18:59:46 +02:00
Stanislav Malyshev 4da6273092 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix CVE-2013-4073 - handling of certs with null bytes
  Fix CVE-2013-4073 - handling of certs with null bytes
2013-08-13 22:26:32 -07:00
Xinchen Hui b6fa0b40f7 Merge branch 'PHP-5.5' 2013-08-14 11:44:53 +08:00
Christopher Jones f95cd93408 Fix unused variable warning in OCI8 2.0 2013-08-13 15:15:57 -07:00
Michael Wallner fddc82dd0e Merge branch 'master' into slim-postdata
* master: (62 commits)
  removed unused vars
  fixed strndup usage in the pgsql ext
  Fixes to unified stdint usage
  Fixed bug #65382 (Segfault in closure_030.phpt)
  Revise pgsql test files
  Revise pgsql test for Travis CI
  Add 00version.phpt to get server/protocol/client version. Revise test script description
  use mysqlnd, some tests fail otherwise
  ensure notices are not ignored when tests need them
  Embeds the content of the DTD in the DOCTYPE declaration of the XML files.
  Adds 2 new xml files which include the dtd path relative to the base directory for the php source code. It fixs the fail on the load of the dtd in the tests modified by this commit.
  Adds files: error 1 to 5 and variation 1 to 4
  Fix #61345: fix install of CGI binary
  Fix #61345: fix install of CGI binary
  php.ini-development/production: remove php_zip.dll
  Update NEWS
  Update NEWS
  Fixed possible buffer overflow under Windows. Note: Not a security fix.
  Fixed Bug #62015 Changed session.auto_start to PHP_INI_PERDIR. It is simply wrong and never worked if the value is changed at runtime
  Implemented Request #20421 (session_abort() and session_reset() function
  ...

Conflicts:
	sapi/cli/tests/upload_2G.phpt
2013-08-13 17:08:01 +02:00
Anatol Belski 1e53ccdf7a fixed merge mistake 2013-08-13 07:59:56 -07:00
Anthony Ferrara 221b9d44a8 Merge pull request #4 from weltling/string_size_refactor_take_2
String size refactor take 2
2013-08-13 07:36:50 -07:00
Anatol Belski 0773ab461e changes to dns.c 2013-08-13 01:26:05 -07:00
Anatol Belski ccf2069c18 Merge branch 'string_size_refactor_take_2' into str_size_and_int64
Conflicts:
	Zend/zend_constants.h
2013-08-13 01:10:09 -07:00
Anatol Belski 6478088a2c Merge branch 'master' of https://github.com/php/php-src into string_size_refactor_take_2
Conflicts:
	Zend/zend_operators.h
	main/SAPI.h
	main/rfc1867.c
	main/streams/php_stream_transport.h
	main/streams/streams.c
	main/streams/transports.c
	main/streams/xp_socket.c
2013-08-13 01:07:12 -07:00
Anatol Belski c5674bb502 Merge branch 'PHP-5.5'
* PHP-5.5:
  removed unused vars
2013-08-12 15:53:34 +02:00
Anatol Belski 42171b13f4 Merge branch 'PHP-5.5'
* PHP-5.5:
  fixed strndup usage in the pgsql ext
2013-08-12 15:45:43 +02:00
Anatol Belski acea91b18c Fixes to unified stdint usage
This recalls 14caf174ff
2013-08-12 13:39:17 +02:00
Dmitry Stogov 52dac3e8cd Fixed bug #65382 (Segfault in closure_030.phpt) 2013-08-12 10:53:20 +04:00
Tianfeng 19312fa8f6 Fixbug: phpize --clean will delete include/*.h 2013-08-12 13:55:23 +08:00
Yasuo Ohgaki 3ada3aaea6 Revise pgsql test files 2013-08-12 05:14:43 +09:00
Yasuo Ohgaki 727318546d Revise pgsql test for Travis CI 2013-08-11 18:57:39 +09:00
Yasuo Ohgaki 713aedfe65 Add 00version.phpt to get server/protocol/client version. Revise test script description 2013-08-11 18:33:33 +09:00
Stanislav Malyshev 6e92f07926 Merge branch 'PHP-5.5'
* PHP-5.5:
  use mysqlnd, some tests fail otherwise
2013-08-11 01:37:44 -07:00
Stanislav Malyshev 6c494edfb7 Merge branch 'PHP-5.5'
* PHP-5.5:
  ensure notices are not ignored when tests need them
2013-08-10 23:13:09 -07:00
Stanislav Malyshev d8a2779456 Merge branch 'PHP-5.5'
* PHP-5.5:
  Embeds the content of the DTD in the DOCTYPE declaration of the XML files.
  Adds 2 new xml files which include the dtd path relative to the base directory for the php source code. It fixs the fail on the load of the dtd in the tests modified by this commit.
  Adds files: error 1 to 5 and variation 1 to 4
2013-08-10 18:03:07 -07:00
Stanislav Malyshev 3db907b803 Merge branch 'PHP-5.5'
* PHP-5.5:
  Add schema default/fixed value support
2013-08-10 17:56:46 -07:00
Stanislav Malyshev 871e937df7 Merge branch 'pull-request/402'
* pull-request/402:
  bison upgrading notes
  use $YACC instead of 'bison' as suggested by Yasuo
  improve comments and messages as suggested
  add excluded version exmaple
  make the bison version check a blacklist
2013-08-10 17:39:06 -07:00
Stanislav Malyshev 3c349cfa50 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix #61345: fix install of CGI binary
  Fix #61345: fix install of CGI binary
2013-08-10 17:36:17 -07:00
Stanislav Malyshev 0f09b978cc Merge branch 'PHP-5.5'
* PHP-5.5:
  php.ini-development/production: remove php_zip.dll
  Update NEWS
  Update NEWS
2013-08-10 17:31:59 -07:00
Yasuo Ohgaki 0959475e11 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed possible buffer overflow under Windows. Note: Not a security fix.
2013-08-11 06:44:01 +09:00
Yasuo Ohgaki 771b06f585 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed Bug #62015 Changed session.auto_start to PHP_INI_PERDIR. It is simply wrong and never worked if the value is changed at runtime
2013-08-10 18:30:05 +09:00
Yasuo Ohgaki 6941ce3583 Implemented Request #20421 (session_abort() and session_reset() function 2013-08-10 16:57:56 +09:00
Yasuo Ohgaki 54a42f0d0c Implemented Request #11100 (session_gc() function). 2013-08-10 15:20:24 +09:00
Yasuo Ohgaki f2b5725115 Remove compile warning of commit 554021d21e 2013-08-10 14:35:30 +09:00
Yasuo Ohgaki 554021d21e Implemented Bug #17860 Suggestion: auto detect whether session changed 2013-08-10 13:56:32 +09:00
Yasuo Ohgaki 678ec30655 Implement Bug #54649 Create session_serializer_name() 2013-08-10 09:26:10 +09:00
Michael Wallner 3419ee9547 bison upgrading notes 2013-08-09 22:23:35 +02:00
Michael Wallner 2d403f0c1d haha, a bit too optimistic; not merged yet 2013-08-09 21:33:48 +02:00
Michael Wallner 867b6c05e7 add upgrading notes about bison and 2Guploads 2013-08-09 21:16:47 +02:00
Dmitry Stogov 2bc886abed Merge branch 'PHP-5.5'
* PHP-5.5:
  Replce ZEND_FETCH_* instructions with IS_CV if possible

Conflicts:
	ext/opcache/Optimizer/zend_optimizer.c
2013-08-09 17:52:22 +04:00
Michael Wallner 7c3afd31f9 fix test 2013-08-09 13:30:29 +02:00
Michael Wallner 611122c22e Merge branch '2Guploads'
* 2Guploads:
  add NEWS entry; add simple test
  more precise condition
  make this work in vc11 too
  Use int64_t and atoll() after discussion with johannes
  ws
  Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files above 2G.
  unify stdint type usage
2013-08-09 11:47:25 +02:00
Michael Wallner 5acdcbc0bc Merge branch 'PHP-5.5'
* PHP-5.5:
  fix bug #65391
  Update NEWS
  Update NEWS

Conflicts:
	ext/zlib/tests/bug65391.phpt
2013-08-09 11:39:41 +02:00
Michael Wallner 5cea7a9047 fix bug #65391
Unable to send vary header user-agent when
ob_start('ob_gzhandler') is called
2013-08-09 11:25:54 +02:00
Yasuo Ohgaki b6b425d2cf Fixed Bug #65315 session.hash_function silently fallback to default md5 2013-08-09 18:05:24 +09:00
Michael Wallner 742a0106fe use $YACC instead of 'bison' as suggested by Yasuo 2013-08-09 08:32:39 +02:00
Michael Wallner 1e30987a53 improve comments and messages as suggested 2013-08-09 08:31:40 +02:00
Michael Wallner 3903c182da add excluded version exmaple 2013-08-08 21:45:08 +02:00
Michael Wallner 3e41201a6f make the bison version check a blacklist
Let the bison version be checked by a blacklist (where no version
is blacklisted yet) and require at least bison 2.4
2013-08-08 14:27:32 +02:00
Andrey Hristov c53b425763 Merge branch 'PHP-5.5' 2013-08-08 14:05:18 +02:00
Andrey Hristov f4f255016a Merge branch 'PHP-5.5' 2013-08-08 14:03:22 +02:00
Andrey Hristov 42dbc598dd Merge branch 'PHP-5.5' 2013-08-08 13:53:08 +02:00
Michael Wallner 4a9d7c1f00 add NEWS entry; add simple test 2013-08-06 22:51:58 +02:00
Ralf Lang 8a7ea474a4 more precise condition 2013-08-06 22:51:58 +02:00
Ralf Lang 679fa1fc68 make this work in vc11 too 2013-08-06 22:51:58 +02:00
Ralf Lang cb4c195f0b Use int64_t and atoll() after discussion with johannes 2013-08-06 22:51:57 +02:00
Ralf Lang de3527002a ws 2013-08-06 22:51:57 +02:00
Ralf Lang 84f9213e00 Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files
above 2G.

This is essentially the same as the patch
"uploads_larger_than_2g_HEAD_v2 (last revision 2012-03-26 03:59 UTC) by
jason at infininull dot com)" but using off_t instead of signed long
(originally: uint)

I tested this on 64bit linux and succeeded uploading a file of 4.8 G.
The File did not get corrupted or truncated in any way.

I did not yet test this under windows or 32 bit linux

Note that there are still limitations:

* Did not test for files > 8 G
* php does not yet reject absurdly high values
* Still limited by underlying file system specific limits and free space
* in upload
* tmp dir and destination dir
2013-08-06 22:51:57 +02:00
Michael Wallner 14caf174ff unify stdint type usage
if you need C99 stdint types, just include "php_stdint.h"
2013-08-06 22:49:56 +02:00
Christopher Jones d8344c18a8 Merge branch 'PHP-5.5'
* PHP-5.5:
  One more './configure --help' alignment fix
2013-08-06 11:23:21 -07:00
Christopher Jones 4c3c9d1fe5 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix long-standing visual pain point: the misalignment of './configure help' text. Whitespace changes and a couple of grammar fixes.
2013-08-06 11:09:12 -07:00
Christopher Jones db610ba050 Merge branch 'master' of https://git.php.net/repository/php-src
# By Christopher Jones (2) and Xinchen Hui (1)
# Via Xinchen Hui
* 'master' of https://git.php.net/repository/php-src:
  Re-fix Bug #65372 (Segfault in gc_zval_possible_root when return reference fails)
  PHP 5.5.2 has already branched
  Doh. PHP 5.5 NEWS needs own commit.
2013-08-06 10:01:47 -07:00
Xinchen Hui 9b38673776 Merge branch 'PHP-5.5' 2013-08-06 15:39:46 +08:00
Christopher Jones ca0497bba2 Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS for recent DTrace merges. Remove redundant 'cp' during DTrace install.
  Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file
  Enable dtrace probes on linux as they are compatible with systemtap
  Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17
2013-08-05 15:46:54 -07:00
Christopher Jones 8fdf1ad32d Merge branch 'PHP-5.5'
* PHP-5.5:
  Add an empty make command for DTrace .d files to stop an implicit circular dependency in GNU Make which causes .d files to be overwritten (Bug 61268)
  Merge branch 'PHP-5.4'
2013-08-05 14:28:24 -07:00
Christopher Jones 85cc3b3240 Merge branch 'PHP-5.5'
* PHP-5.5:
  Merge branch 'PHP-5.5'
2013-08-05 14:25:43 -07:00
Kalle Sommer Nielsen 85b7e9f046 Check for NULL ptr from get_stream() before passing it on to php_stream_cast() 2013-08-05 16:58:37 +02:00
Michael Wallner 15c351cc52 add NEWS entry; add simple test 2013-08-05 13:53:35 +02:00
Michael Wallner 69aed1b61f Merge branch 'master' of github.com:/ralflang/php-src
merged pull request #372:
>2G uploads by Ralf Lang
https://github.com/php/php-src/pull/372
2013-08-05 12:02:10 +02:00
Yasuo Ohgaki 8f74384947 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #62978. pg_select()/etc may allow SQL injection when table name is user parameter, users are able to control table names.
2013-08-05 18:27:19 +09:00
Stanislav Malyshev 7ca7ea85cd Merge branch 'PHP-5.5'
* PHP-5.5:
  add news about session fix
2013-08-04 20:07:00 -07:00
Stanislav Malyshev eb20966f75 Merge branch 'PHP-5.5'
* PHP-5.5:
  add news about session fix
  fix crash, enable session_id and fix test
  Strict session. Detect session id collision
  Strict session
2013-08-04 20:05:17 -07:00
Stanislav Malyshev 169b78eb79 add news about session fix 2013-08-04 20:04:42 -07:00
Stanislav Malyshev c9c53e0763 Merge branch 'PHP-5.5'
* PHP-5.5:
  First fixes for a 64bit compatible ftp extension
2013-08-04 19:36:29 -07:00
Stanislav Malyshev f20d28a6b1 Fixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link, DBQUOTEDIDENT, 1))
The exists test should has covered this bug

Conflicts:

	ext/pdo_dblib/dblib_driver.c
2013-08-04 19:19:37 -07:00
Stanislav Malyshev 1d6a136051 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix compiler warning, use longs for hashes
2013-08-04 18:05:18 -07:00
Stanislav Malyshev 68e8326e0e Merge branch 'PHP-5.5'
* PHP-5.5:
  non living code related typo fixes
2013-08-04 16:07:13 -07:00
Stanislav Malyshev c620a51a32 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix typo
2013-08-04 16:03:02 -07:00
Rasmus Lerdorf b48f7e0c79 Merge commit '626d96a'
* commit '626d96a':
  This doesn't fail in 5.5 anymore
2013-08-03 12:15:28 -04:00
Rasmus Lerdorf cadbec2fa0 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Fix phar phpinfo test after markup changes
2013-08-03 12:15:16 -04:00
Nikita Popov 43cbec0fa9 Fix phar phpinfo test after markup changes 2013-08-03 16:32:02 +02:00
Rasmus Lerdorf 9fa7e8932d Merge commit 'a03f094'
* commit 'a03f094':
  We shouldn't load any local ini files for these tests
2013-08-02 16:23:52 -04:00
Rasmus Lerdorf 4e90145932 Merge commit 'd60e168'
* commit 'd60e168':
  pcre_quote? No such thing. How did this ever pass?
2013-08-02 16:13:12 -04:00
Rasmus Lerdorf c682f2f68a Merge commit 'ea75b1b'
* commit 'ea75b1b':
  This test needs local infile enabled
2013-08-02 15:33:49 -04:00
Rasmus Lerdorf d69ec93428 Merge commit 'e55f08a'
* commit 'e55f08a':
  This test will only work if gc is enabled
2013-08-02 12:01:20 -04:00
Rasmus Lerdorf 0fce1b4f72 Merge commit '5753b74'
* commit '5753b74':
  Make sure test.php isn't coming in from the include_path
2013-08-02 11:48:07 -04:00
Michael Wallner a8bc184207 fix generating config.nice
Configure runs like:
$./configure -C CFLAGS="-ggdb" --enable-debug --prefix=$(pwd)/usr
did result in an empty config.nice

* allow single dash flags like -C, -s etc.
* allow passing evnironment variables as arguments
2013-08-02 13:15:55 +02:00
Xinchen Hui 55d335fa95 Merge branch 'PHP-5.5' 2013-08-02 18:43:17 +08:00
Xinchen Hui 78673d1bad Merge branch 'PHP-5.5' 2013-08-02 18:39:58 +08:00
Yasuo Ohgaki fbd01eaecf Merge branch 'PHP-5.5'
* PHP-5.5:
  Add user contributed test. Bug #61748
2013-08-02 09:54:51 +09:00
Christopher Jones 9cd1ac7b61 Merge branch 'PHP-5.5'
* PHP-5.5:
  Clean up the 'generated' phar.inc file. When building outside the source tree the copied phar.inc needs to be removed, but when building in the tree, the file must remain since it is part of the source. See the copying logic in ext/phar/Makefile.frag.
2013-08-01 09:22:47 -07:00
Christopher Jones 1c91ca990f Merge branch 'PHP-5.5'
* PHP-5.5:
  Revert "Allow 'make distclean' to clean up the 'generated' phar.inc"
2013-08-01 08:49:19 -07:00
Christopher Jones 1f6b940dd1 Merge branch 'PHP-5.5'
* PHP-5.5:
  Use PHP's major version when cleaning up Apache .module files
  Allow 'make distclean' to clean up the 'generated' phar.inc
2013-07-31 12:36:20 -07:00
Christopher Jones 8bff800f6a Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Constify streams API and a few other calls down the rabbit hole. (`char *` to `const char *` for parameters and few return values) In a few places int len moved to size_t len.
2013-07-31 12:02:23 -07:00
Christopher Jones 7caea7d182 Clean generated OCI8 DTrace files in 'make distclean' 2013-07-31 12:01:35 -07:00
Christopher Jones d84fa9731a Merge branch 'PHP-5.5'
* PHP-5.5:
  Give 'make distclean' some love. Clean files created by AC_OUTPUT, shell redirection etc.
2013-07-31 11:50:57 -07:00
Christopher Jones f5521a357a Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file
2013-07-31 10:00:05 -07:00
Christopher Jones f3c3aa8a67 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
  Fixed bug #65018 (SoapHeader problems with SoapServer)
  Added opcache.restrict_api configuration directive that may limit usage of OPcahce API functions only to patricular script(s)
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
  Fixed php-5.2 support
  added test script for bug65045.
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
  Added support for glob symbols in blacklist entries (?, *, **)
  Fixed bug #65336
2013-07-31 09:02:06 -07:00
Dmitry Stogov e8b1739949 Merge branch 'PHP-5.5'
* PHP-5.5:
  Improved fix for bug #44686 (SOAP-ERROR: Parsing WSDL)
2013-07-31 17:37:27 +04:00
Dmitry Stogov 380e5d5d03 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #65018 (SoapHeader problems with SoapServer)
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.
  Fixed bug #65336

Conflicts:
	NEWS
2013-07-31 16:35:09 +04:00
Dmitry Stogov e2a433fc5d Merge branch 'PHP-5.5'
* PHP-5.5:
  Added opcache.restrict_api configuration directive that may limit usage of OPcahce API functions only to patricular script(s)
  added test script for bug65045.
  MFH: fixed #65045: mb_convert_encoding breaks well-formed character.

Conflicts:
	NEWS
2013-07-31 14:24:30 +04:00
Sara Golemon 2141f394d8 Merge branch 'pull-request/399' 2013-07-31 00:49:30 -07:00
Dmitry Stogov a0fece5201 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed php-5.2 support
2013-07-31 03:23:10 +04:00
Dmitry Stogov fa041cb2f0 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Remove tabs on blanklines in Makefile sources. This prevents a 'suspicious line' warning when editing & saving Makefile using Emacs.
2013-07-31 03:04:22 +04:00
Dmitry Stogov 5338bbbf38 Merge branch 'PHP-5.5'
* PHP-5.5:
  Added support for glob symbols in blacklist entries (?, *, **)

Conflicts:
	NEWS
2013-07-31 03:04:00 +04:00
Christopher Jones 3af80d7df3 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw)
  A minor fix for configure outpu (Tony)
2013-07-30 13:39:29 -07:00
Christopher Jones 6af7526c77 Remove tabs on blanklines in Makefile sources. This prevents a
'suspicious line' warning when editing & saving Makefile using Emacs.
2013-07-30 13:36:10 -07:00
Dmitry Stogov 147d5241dc Merge branch 'PHP-5.5'
* PHP-5.5:
  Improved implementation of NOP removal pass from O(n^2) to O(n) (hnw)
2013-07-30 22:33:46 +04:00
Dmitry Stogov e831041c5a Merge branch 'PHP-5.5'
* PHP-5.5:
  A minor fix for configure outpu (Tony)
2013-07-30 22:04:55 +04:00
Dmitry Stogov 0aa342e903 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #65338 (Enabling both php_opcache and php_wincache AVs on shutdown).

Conflicts:
	NEWS
2013-07-30 17:36:47 +04:00
Andrey Hristov 92d27ccb05 Constify streams API and a few other calls down the rabbit hole.
(`char *` to `const char *` for parameters and few return values)
In a few places int len moved to size_t len.
2013-07-30 12:49:36 +02:00
Anatol Belski 5e1ac558c3 make simplexml headers available to the outta world 2013-07-29 22:18:55 +02:00
Anatol Belski a95f8dbac2 fixes for types to ext/standard with types ... some stuff is broken now 2013-07-29 09:04:56 -07:00
Anatol Belski 88960bba1e more fixes to string.c 2013-07-29 04:50:47 -07:00
Anatol Belski 62c1f4127b more for cli sapi 2013-07-29 02:39:44 -07:00
Anatol Belski cd955c183b fixes to main/ 2013-07-29 02:16:39 -07:00
Anatol Belski dc0b9d716e Merge branch 'master' of https://github.com/php/php-src into string_size_refactor_take_2
Conflicts:
	Zend/zend_constants.h
	ext/standard/info.c
2013-07-29 01:47:45 -07:00
Dmitry Stogov 294335761b Merge branch 'PHP-5.5'
* PHP-5.5:
  Merge from GitHub
  Update NEWS
  Fixed bug #65336

Conflicts:
	NEWS
2013-07-28 13:50:13 +04:00
Yasuo Ohgaki d4aee1021e Fixed bug #65336 2013-07-27 05:55:02 +09:00
Christopher Jones 85b66e9e21 OCI8 extension: Allow Implicit Result Set statement resources to inherit the parent's current prefetch count 2013-07-26 13:34:45 -07:00
Christopher Jones fc410f6ece Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Fix --enable-maintainer-zts mode in OCI8 2.0
2013-07-26 11:34:21 -07:00
Christopher Jones 586fc4909e Fix --enable-maintainer-zts mode in OCI8 2.0 2013-07-25 16:15:32 -07:00
Christopher Jones c67714b782 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Update UPGRADING and make typo fixes to OCI8 package.xml
2013-07-25 10:57:53 -07:00
Christopher Jones fe98ffc227 Update UPGRADING and make typo fixes to OCI8 package.xml 2013-07-25 10:54:03 -07:00
Christopher Jones 1224e6cccd Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Upper section name
  Update NEWs
  Fixed bug #65328 (Segfault when getting SplStack object Value)
2013-07-25 10:42:47 -07:00
Christopher Jones b39f973c63 Merge branch 'master' of https://git.php.net/repository/php-src
# By Johannes Schlüter (3) and others
# Via Johannes Schlüter (4) and others
* 'master' of https://git.php.net/repository/php-src:
  Upper section name
  Update NEWs
  Fixed bug #65328 (Segfault when getting SplStack object Value)
  Initial PHP OCI8 2.0.0-dev commit.
  Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro.
  fix missing include
  Fix bug 65299
  Fix compiler warning on redefined constant
  Fix comment
  fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
  fix bug #65028 	Phar::buildFromDirectory creates corrupt archives for some specific contents
2013-07-25 08:53:33 -07:00
Xinchen Hui c49de17fe5 Merge branch 'PHP-5.5' 2013-07-25 22:46:21 +08:00
Christopher Jones 4a9d0e1579 Merge branch 'oci8_20'
* oci8_20:
  Initial PHP OCI8 2.0.0-dev commit.
2013-07-24 15:36:57 -07:00
Christopher Jones bfc3c223da Initial PHP OCI8 2.0.0-dev commit.
Includes Oracle Database 12c Implicit Result Set support, DTrace
support, and various code cleanups.

See package.xml for details.
2013-07-24 15:33:22 -07:00
Stanislav Malyshev 86064e0701 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix bug #65028 	Phar::buildFromDirectory creates corrupt archives for some specific contents
2013-07-23 21:46:23 -07:00
Adam Harvey 7fa841c888 Merge branch 'PHP-5.5'
* PHP-5.5:
  Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro.
2013-07-23 11:19:02 -07:00
Anatol Belski 678ef6a133 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix missing include
2013-07-23 18:07:16 +02:00
Johannes Schlüter 416e270835 Merge branch 'PHP-5.5' 2013-07-23 14:14:18 +02:00
Johannes Schlüter 6b4742582f Merge branch 'PHP-5.5' 2013-07-23 13:15:15 +02:00
Johannes Schlüter 004163a914 Merge branch 'PHP-5.5' 2013-07-23 12:42:20 +02:00
Anatol Belski 94e15ff387 Merge branch 'PHP-5.5'
* PHP-5.5:
  fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
2013-07-23 10:00:24 +02:00
Ralf Lang d80a91018d more precise condition 2013-07-23 07:39:36 +02:00
Ralf Lang b07e55fdeb make this work in vc11 too 2013-07-22 21:26:38 +02:00
Christopher Jones 99f7b72025 Merge branch 'master' of https://git.php.net/repository/php-src
# By Veres Lajos (15) and others
# Via Stanislav Malyshev (31) and others
* 'master' of https://git.php.net/repository/php-src: (99 commits)
  fixed possible null deref
  Disable a flag
  - addressed bug #65159, Misleading configure help text for --with-mysql-sock
  Fix bug #61697 - spl_autoload_functions returns lambda functions incorrectly
  Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
  Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
  Added recursivetreeiterator::setPostfix() method
  next is 5.5.2
  add a few comment
  allow both the old and new cfg argument to work. (the old of course should contain the typo)
  mssql.compatability_mode fix
  backward compatibility
  HASH_KEY_NON_EXISTANT fix
  Update NEWS
  Fixed bug #65304 (Use of max int in array_sum)
  Updaet NEWS
  Reorder NEWS
  intl: remove extra quotes from arginfo params
  updated test script for bug #65045.
  Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
  ...
2013-07-22 10:59:10 -07:00
Ralf Lang a2394df90e Use int64_t and atoll() after discussion with johannes 2013-07-22 18:03:11 +02:00
Anatol Belski b966a0bf46 Merge branch 'PHP-5.5'
* PHP-5.5:
  fixed possible null deref
2013-07-22 14:51:27 +02:00
Andrey Hristov a48e2bad62 Merge branch 'master' of ssh://git.php.net/php-src 2013-07-22 11:03:10 +02:00
Andrey Hristov a047ece2e0 Disable a flag 2013-07-22 11:02:48 +02:00
Stanislav Malyshev 4467ada680 Merge branch 'pull-request/326'
* pull-request/326:
  zend_register_null_constant fixed zend_register_bool_constant usage in macros use REGISTER_MAIN_* in zend_register_standard_constants
  zend_API.h included ZVAL_* family in use
  use Z_* family macros
  zend_register_bool_constant patch
2013-07-21 23:19:33 -07:00
Stanislav Malyshev 8d2651d8fc Merge branch 'PHP-5.5'
* PHP-5.5:
  - addressed bug #65159, Misleading configure help text for --with-mysql-sock
2013-07-21 23:15:03 -07:00
Stanislav Malyshev 46cc826770 Merge branch 'pull-request/231'
* pull-request/231:
  update Zend Engine logo as per Zeev, and tweak PHP logos ... :)
  fix for scrolling, other minor tweaks
  Bump up table width a bit more and make columns consistent
  Bringing CSS up to this decade's standards.
2013-07-21 22:49:26 -07:00
Stanislav Malyshev e68cd521dc Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix bug #61697 - spl_autoload_functions returns lambda functions incorrectly
2013-07-21 22:48:03 -07:00
Stanislav Malyshev 3cbb48f055 Merge branch 'PHP-5.5'
* PHP-5.5:
  Update news for FILTER_SANITIZE_FULL_SPECIAL_CHARS fix
  Wrong value for FILTER_SANITIZE_FULL_SPECIAL_CHARS in REGISTER_LONG_CONSTANT
2013-07-21 22:31:37 -07:00
Stanislav Malyshev 10c547018f Merge branch 'PHP-5.5'
* PHP-5.5:
  Added recursivetreeiterator::setPostfix() method
2013-07-21 22:22:02 -07:00
Stanislav Malyshev 1a05648e6d Merge branch 'PHP-5.5'
* PHP-5.5:
  next is 5.5.2
  add a few comment
  allow both the old and new cfg argument to work. (the old of course should contain the typo)
  mssql.compatability_mode fix

Conflicts:
	configure.in
	main/php_version.h
2013-07-21 21:17:59 -07:00
Stanislav Malyshev 02457554a3 Merge branch 'PHP-5.5'
* PHP-5.5:
  backward compatibility
  HASH_KEY_NON_EXISTANT fix
2013-07-21 20:10:31 -07:00
Xinchen Hui a522f2d1c9 Merge branch 'PHP-5.5' 2013-07-21 21:07:50 +08:00
Xinchen Hui 25eb44fcc1 Merge branch 'PHP-5.5' 2013-07-21 16:20:00 +08:00
Gustavo André dos Santos Lopes cbd1faf077 Merge branch 'PHP-5.5'
* PHP-5.5:
  intl: remove extra quotes from arginfo params
2013-07-21 03:30:42 +02:00
Rui Hirokawa cb607d4f78 updated test script for bug #65045. 2013-07-21 10:18:33 +09:00
Johannes Schlüter 7daf1a6c14 Mention git and suggest PECL for new things 2013-07-19 22:05:52 +02:00
Johannes Schlüter b278aba429 Update patch submitting instructions
- we use git
- pecl bugs were merged into bugs.php.net
- A bit less on PEAR
2013-07-19 22:00:01 +02:00
Johannes Schlüter 17361b9707 Remove README about PHP 4.0 -> 4.1 API changes 2013-07-19 21:45:26 +02:00
Matteo Beccati 85bbc8fa9d Merge branch 'PHP-5.5'
* PHP-5.5:
  Properly fixed bug #63186 on NetBSD == 6.0
2013-07-19 09:40:15 +02:00
Anatol Belski 1673e8f67e Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #65268 select() implementation uses outdated tick API
2013-07-18 18:02:26 +02:00
Anatol Belski c6651942ce Merge branch 'PHP-5.5'
* PHP-5.5:
  fix header include
  new NEWS for next release
2013-07-18 15:29:17 +02:00
Anatol Belski 03cae613f0 fixes after merging master 2013-07-18 03:53:51 -07:00
Anatol Belski 9f177207fc Merge branch 'string_size_refactor_take_2' into str_size_and_int64 2013-07-18 03:22:12 -07:00
Anatol Belski 46e07a6fd7 Merge branch 'master' of https://github.com/php/php-src into string_size_refactor_take_2
Conflicts:
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
2013-07-18 03:20:13 -07:00
Anatol Belski 231eaa3919 Fixes for sizeof int 2013-07-18 02:58:55 -07:00
Anatol Belski 13cb1b7e4a made lang scanner use zend_int.h and regenerated it 2013-07-18 02:52:15 -07:00
Julien Pauli c8befa4f7c Merge branch 'PHP-5.5' 2013-07-18 11:12:01 +02:00
Julien Pauli 53a7e00911 New NEWS 2013-07-18 10:22:57 +02:00
Anatol Belski 4bcc5a87d7 added zend_int.h to zend*.dsp 2013-07-18 01:09:03 -07:00
Anatol Belski 0605bebdb6 adjusted zend_types.h 2013-07-18 01:05:27 -07:00
Anatol Belski ec0300ec25 added zend_int.h 2013-07-18 01:04:37 -07:00
Yasuo Ohgaki 0a7c88884e Merge branch 'PHP-5.5'
* PHP-5.5:
  Improve php.ini-* documentation
2013-07-18 14:10:34 +09:00
Johannes Schlüter 2a13fb106d Remove PHP3 conversion scripts 2013-07-17 23:32:23 +02:00
Johannes Schlüter 57c50f8fed Drop PHP 4 related README 2013-07-17 23:25:44 +02:00
Johannes Schlüter f7e204d7ed Slightly modernize ext_skel and sekelton/
- .svnignore ->.gitignore
- Add .gitignore entries for DSO stand-alone builds stuff
- Docs don't use CVS but SVN
- reorder extname.c file so it needs less forward declarations
- take forward declarations out of php_extname.h
- Drop #if for 12 years old PHP version compatibility
2013-07-17 23:18:13 +02:00
Stanislav Malyshev a5d177cbc8 Merge branch 'PHP-5.5'
* PHP-5.5:
  5.4.19 is next
2013-07-17 13:52:39 -07:00
Anatol Belski 8b8f7d4a5a the very first porting try, many things not worky 2013-07-17 09:48:13 -07:00
Anatol Belski a5302f286e Merge branch 'string_size_refactor_take_2' into str_size_and_int64
* string_size_refactor_take_2:
  fixes to zend
  more fixes to streams
  fixes to SAPI.c
  fixes to plain stream wrapper
  fixes to xp_socket.c
  fixes to zend_ini and output
2013-07-17 09:24:21 -07:00
Anatol Belski d4c546b956 fixes to zend 2013-07-17 09:11:51 -07:00
Arpad Ray b594949144 Merge branch 'PHP-5.5'
* PHP-5.5:
  regenerate url scanner
  Fixed bug #50308 - session id not appended properly for empty anchor tags
2013-07-17 16:28:12 +01:00
Anatol Belski 9703f57bd1 more fixes to streams 2013-07-17 06:30:28 -07:00
Anatol Belski cc3ec2936c fixes to SAPI.c 2013-07-17 06:06:35 -07:00
Anatol Belski 06fe769905 fixes to plain stream wrapper 2013-07-17 05:50:33 -07:00
Anatol Belski c292a18514 fixes to xp_socket.c 2013-07-17 04:53:56 -07:00
Anatol Belski eb5ab08267 fixes to zend_ini and output 2013-07-17 03:31:17 -07:00
Arpad Ray fb53871d94 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix bug #62129 - rfc1867 crashes php even though turned off
2013-07-17 11:09:37 +01:00
Stanislav Malyshev 5c0ad4c72c Merge branch 'PHP-5.5'
* PHP-5.5:
  add news for xml fix
2013-07-16 15:40:20 -07:00
Anatol Belski be721d5d8b Merge branch 'PHP-5.5'
* PHP-5.5:
  fix TS build
2013-07-16 18:06:05 +02:00
Anatol Belski 12aec9ec8e Merge branch 'PHP-5.5'
* PHP-5.5:
  added sapi check for dl() test
2013-07-16 15:43:59 +02:00
Johannes Schlüter dc489c30f0 Merge branch 'PHP-5.5' 2013-07-16 13:56:06 +02:00
Anatol Belski 83a60d45f5 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed typo ensuring header str is \0 terminated
2013-07-16 00:15:54 +02:00
Gustavo Lopes 2443df37fd Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS for 710150c and e2744f1
  socket: support unix paths in the abstract namespace
  socket: fix bug #65260 (SCM_RIGHTS)
2013-07-16 00:03:00 +02:00
Anthony Ferrara 6bd00eda6b Merge pull request #2 from weltling/string_size_refactor_take_2
Fixes by the end of the day
2013-07-15 09:36:03 -07:00
Anatol Belski fb91fc6e2c Merge branch 'PHP-5.5'
* PHP-5.5:
  fix buffer overrun
2013-07-15 17:35:52 +02:00
Anatol Belski af377da60a Merge branch 'PHP-5.5'
* PHP-5.5:
  kick unused var
2013-07-15 17:23:48 +02:00
Stanislav Malyshev e92a63c9ee Merge branch 'PHP-5.5'
* PHP-5.5:
  Remove PWS (Personal Web Server) references
2013-07-15 00:38:50 -07:00
Stanislav Malyshev 6aa694a8d8 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too)
  fix invalid variable name at ext/spl/internal/multipleiterator.inc
2013-07-15 00:36:43 -07:00
Stanislav Malyshev 7bd8dfae63 Merge branch 'PHP-5.5'
* PHP-5.5:
  revert false fix
  typo fixes
  less serious compatAbility fixes
  typos (orig)
  revert false fix
  typo fixes
  typos (orig)
  less serious compatAbility fixes
2013-07-15 00:28:21 -07:00
Veres Lajos c2088f8b81 revert false fix 2013-07-15 00:19:56 -07:00
Veres Lajos 1b06e0be96 typo fixes 2013-07-15 00:19:49 -07:00
Veres Lajos d17e8ac32f less serious compatAbility fixes 2013-07-15 00:19:39 -07:00
Veres Lajos 6c4af15d6c typos (orig) 2013-07-15 00:19:32 -07:00
Stanislav Malyshev 2c8a4af892 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix bug #62665: add curl.cainfo to php.ini
2013-07-14 23:57:16 -07:00
Stanislav Malyshev 50f15bb921 Merge branch 'PHP-5.5'
* PHP-5.5:
  add news for bug #65219
  Add built-in web server to invocation list
  Terminology: change embedded web server to built-in web server to align with cli usage
  Align -B and -E parameter names with cli usage (begin_code and end_code)
  Fix Bug #65219 DBSETLDBNAME should be called before login to set DBNAME in login record
2013-07-14 17:07:33 -07:00
Anatol Belski 14b67ed6da Merge branch 'PHP-5.5'
* PHP-5.5:
  fix uninitialized memory usage
2013-07-14 20:46:48 +02:00
Xinchen Hui 75808151e3 Merge branch 'PHP-5.5'
Conflicts:
	Zend/zend_vm_execute.h
2013-07-14 12:01:50 +08:00
Felipe Pena b64e2218f2 Merge branch 'PHP-5.5'
* PHP-5.5:
  - Bug #65228 (FTPs memory leak) patch by: marco dot beierer at mbsecurity dot ch
2013-07-13 17:54:52 -03:00
Stanislav Malyshev b98f346587 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix version - not -dev anymore since 5.5.0 release
  - Fixed bug #65227 (Memory leak in gmp_cmp second parameter)
  Fixed meta data retrieve when OID is larger than 2^31
  Fixed meta data retrieve when OID is larger than 2^31
  Inprove pg_unescape_bytea() error message

Conflicts:
	Zend/zend.h
	ext/gmp/gmp.c
2013-07-12 17:32:15 -07:00
Stanislav Malyshev 732989c352 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix the date for 5.4.17
2013-07-12 10:58:32 -07:00
Stanislav Malyshev e885dac150 Merge branch 'PHP-5.5'
* PHP-5.5:
  update 5.4.17 date
2013-07-12 10:55:43 -07:00
Stanislav Malyshev f4dab70faf Merge branch 'PHP-5.5'
* PHP-5.5:
  update 5.4.17 date
2013-07-12 10:54:02 -07:00
Anatol Belski 5ae81ec123 fix uuencode 2013-07-11 08:12:30 -07:00
Anatol Belski 8f7abf4371 fix base64 stuff 2013-07-11 07:02:58 -07:00
Anatol Belski e17ef23c2c fixes to url processing stuff 2013-07-11 06:57:22 -07:00
Anatol Belski a9b623aa0b huge fix to spl and more 2013-07-11 05:37:09 -07:00
Anatol Belski 7331e4c9c8 Merge branch 'master' of https://github.com/php/php-src into string_size_refactor_take_2 2013-07-11 03:00:30 -07:00
Anatol Belski 42c8f29277 fix 's' vs 'S' for datetime 2013-07-11 02:58:53 -07:00
Yasuo Ohgaki 914f8fd304 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed meta data retrieve when OID is larger than 2^31

Conflicts:
	ext/pdo_pgsql/pgsql_statement.c
2013-07-11 12:25:24 +09:00
Yasuo Ohgaki 0ed36d4478 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed meta data retrieve when OID is larger than 2^31
2013-07-11 12:23:23 +09:00
Yasuo Ohgaki 8679bffaca Fixed meta data retrieve when OID is larger than 2^31 2013-07-11 12:23:11 +09:00
Yasuo Ohgaki c4f241ef88 Merge branch 'PHP-5.5'
* PHP-5.5:
  Inprove pg_unescape_bytea() error message
2013-07-11 12:13:22 +09:00
Yasuo Ohgaki ed00dc8f82 Inprove pg_unescape_bytea() error message 2013-07-11 12:13:09 +09:00
Anatol Belski ecb55dd9f5 Merge branch 'PHP-5.5'
* PHP-5.5:
  updated NEWS
  Fixed bug #65226 chroot() does not get enabled
2013-07-11 00:52:08 +02:00
Christopher Jones 56b2b74409 Merge branch 'PHP-5.5'
* PHP-5.5:
  Cleanup temp test file
2013-07-10 11:22:16 -07:00
Johannes Schlüter 479174c21c Merge branch 'PHP-5.5' 2013-07-10 19:47:26 +02:00
Johannes Schlüter 9c0cd00b44 Merge branch 'PHP-5.5' 2013-07-10 19:38:29 +02:00
Sara Golemon 95017c0522 Add a couple more test cases to parse_url() tests
http://::# (valid but silly)
http://#   (invalid)
2013-07-10 08:26:47 -07:00
Anatol Belski c7490a6edd add usleep() to the header, already exported to dll 2013-07-10 16:16:33 +02:00
Anatol Belski 638f1c3b79 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix possible resource leak and make sure there's something to qsort()
2013-07-10 13:32:13 +02:00
Anatol Belski 59d95c1537 Merge branch 'master' of https://github.com/php/php-src into string_size_refactor_take_2 2013-07-10 01:09:28 -07:00
Anatol Belski 309d3b512e Merge branch 'string_size_refactor_take_2' of https://github.com/ircmaxell/php-src into string_size_refactor_take_2 2013-07-10 01:09:01 -07:00
Anatol Belski 03ed6fc0b1 string sze_t fix for internal strings 2013-07-10 00:43:19 -07:00
Christopher Jones 3fd987f493 Merge branch 'PHP-5.5'
* PHP-5.5:
  Cleanup temp file
2013-07-09 14:53:05 -07:00
Anatol Belski acd85d48f0 strig size_t fixes to zend_alloc.* 2013-07-09 06:13:08 -07:00
Patrick Allaert b980e4fedc Fixed #65225: PHP_BINARY incorrectly set 2013-07-09 15:05:10 +02:00
Derick Rethans 3cdd09a76e Merge branch 'PHP-5.5' 2013-07-09 09:07:21 +01:00
Yasuo Ohgaki baac810eb8 Improve pg_unescape_bytea() error message 2013-07-09 14:54:03 +09:00
Yasuo Ohgaki 84e6576203 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed pgsql_stmt_get_column_meta() OID signedness
2013-07-09 07:02:09 +09:00
Yasuo Ohgaki 98e6473f98 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed pgsql_stmt_get_column_meta() OID signedness
2013-07-09 07:00:47 +09:00
Yasuo Ohgaki 24037fd3d9 Fixed pgsql_stmt_get_column_meta() OID signedness 2013-07-09 06:59:50 +09:00
Christopher Jones 0cf978c92e Merge branch 'PHP-5.5'
* PHP-5.5:
  Bump PECL package info version check to allow PECL installs with PHP 5.5+
2013-07-08 13:39:26 -07:00
Christopher Jones fbebe431b4 Merge branch 'PHP-5.5'
* PHP-5.5:
  Update NEWS
2013-07-08 13:35:21 -07:00
Andrey Hristov e78ca0b634 Merge branch 'master' of ssh://git.php.net/php-src 2013-07-08 20:26:38 +02:00
Andrey Hristov a5d2854bdc Merge branch 'PHP-5.5' 2013-07-08 20:26:04 +02:00
Yasuo Ohgaki 870d238b06 Merge branch 'PHP-5.5'
* PHP-5.5:
  Added warning for hex2bin() when input is invalid string
  Update NEWS
2013-07-08 19:15:04 +09:00
Yasuo Ohgaki 4fd1e24ee5 Merge branch 'PHP-5.5'
* PHP-5.5:
  Add warning to pg_unescape_bytea() when invalid parameter is passed
2013-07-08 18:53:12 +09:00
Xinchen Hui 11b757d53e Merge branch 'PHP-5.5' 2013-07-08 11:21:54 +08:00
Rob Richards b955dbecfb Merge branch 'PHP-5.5'
# By Nuno Lopes (2) and Rob Richards (1)
* PHP-5.5:
  truncate results at depth of 255 to prevent corruption
  fix assembly of safe_address() for x86 and x86_64
  fix assembly of safe_address() for x86 and x86_64
2013-07-06 08:01:31 -04:00
Anthony Ferrara 3744ff7c18 Merge pull request #1 from weltling/string_size_refactor_take_2
windows fixes
2013-07-05 05:26:40 -07:00
Anatol Belski 8db3e3738c trivial fixes to ext\standard 2013-07-04 09:35:05 -07:00
Anatol Belski bf18c56fb7 trivial fixes to spl 2013-07-04 08:50:58 -07:00
Anatol Belski 890345eda0 fix spl_autoload_* 2013-07-04 06:41:48 -07:00
Anatol Belski ca0e018c95 windows fixes 2013-07-04 04:27:40 -07:00
Ard Biesheuvel e4192e4cb4 Merge branch 'PHP-5.5' 2013-07-04 10:32:55 +02:00
Nuno Lopes 97e9d01dc7 fix assembly of safe_address() for x86 and x86_64 2013-07-03 17:53:46 -04:00
Anatol Belski 675beb06a6 Merge branch 'PHP-5.5'
* PHP-5.5:
  Extended the test for bug #65184
2013-07-03 22:53:34 +02:00
Felipe Pena 0107b2afe8 Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fixed build on FreeTDS 0.82
2013-07-03 15:04:30 -03:00
Johannes Schlüter d7a59d7dac Merge branch 'PHP-5.5' 2013-07-03 17:11:20 +02:00
Johannes Schlüter ebd94fa30d Merge branch 'PHP-5.5' 2013-07-03 16:59:17 +02:00
Anatol Belski 9365967dfd Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #65184 strftime() returns insufficient-length
  NEWS for two lst intl changes
2013-07-03 11:25:09 +02:00
Sebastian Bergmann 9f5fc5c0ee Sync list of supported bison version with PHP-5.5 2013-07-03 06:52:44 +02:00
Gustavo André dos Santos Lopes c1db6f8bdd Merge branch 'PHP-5.5'
* PHP-5.5:
  intl: fix extra space in constant name
  intl: add intlcal_set_minimal_days_in_first_week()
2013-07-03 05:17:04 +01:00
Anthony Ferrara f4c4fe417a Get core test suite to really pass, fully. Woot 2013-07-02 11:51:45 -04:00
Anthony Ferrara 3db6b5112f Get basic language tests to all pass (minus xfails) 2013-07-02 11:27:48 -04:00
Anthony Ferrara 91abad1e1b Better test coverage 2013-07-02 10:20:01 -04:00
Anthony Ferrara 6e008d40c2 It compiles. Sort-of. In a way. Yeah. But nothing works. Sigh 2013-07-02 09:46:30 -04:00
Gernot Vormayr a90a93f1a4 Add apparmor change hat functionality to fpm 2013-07-02 13:06:02 +02:00
Remi Collet c28e77cbbc Merge branch 'PHP-5.5'
* PHP-5.5:
  fix typo in php man page
2013-07-02 12:19:43 +02:00
Remi Collet 0ecf03ff38 Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS
  Fixed Bug #65142 Missing phar man page
  NEWS
  Fixed Bug #65143 Missing php-cgi man page
2013-07-02 10:48:38 +02:00
Anatol Belski a1c2dbb466 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed mysql tests parsing phpinfo()
  Add a few links
  Update NEWS
  Fixed bug #35703: when session_name("123") consist only digits, should warning
  Fixed bug #49175: mod_files.sh does not support hash bits
2013-07-02 08:25:01 +02:00
Anthony Ferrara 66845fb6a5 More work, get strings working, sort-of... 2013-07-01 17:59:11 -04:00
Anthony Ferrara 89aea2f103 Refactor file.c to use new string types 2013-07-01 17:15:25 -04:00
Anthony Ferrara ea58b542d6 Re-do a lot of it using a conditional define, and legacy type information for APIs 2013-07-01 16:53:54 -04:00
Christopher Jones 7a331856df Merge branch 'master' of https://git.php.net/repository/php-src
# By Yasuo Ohgaki (5) and others
# Via Stanislav Malyshev (5) and others
* 'master' of https://git.php.net/repository/php-src:
  added test code for #65045.
  fixed #65045: mb_convert_encoding breaks well-formed character.
  Don't try to clean up generator stack on unclean shutdown
  NEWS
  Added PHP_FCGI_BACKLOG, overrides the default listen backlog
  Merge branch 'PHP-5.5' into master
  Fixed bug #49175: mod_files.sh does not support hash bits
  Fixed bug #35703: when session_name("123") consist only digits, should warning
  Fixed bug #49175: mod_files.sh does not support hash bits
  Fixed bug #49175: mod_files.sh does not support hash bits
  add fix for  #60560 into upgrading
  Add a __wakeup() method to SplFixedArray, thereby fixing serialising an
  Update NEWS
  small optimization
  fix bug #61860: use USearch for searches, it does the right thing
2013-07-01 13:46:01 -07:00
Rui Hirokawa 1db66942e1 added test code for #65045. 2013-06-30 15:31:36 +09:00
Rui Hirokawa c6a7549efc fixed #65045: mb_convert_encoding breaks well-formed character. 2013-06-30 15:30:45 +09:00
Nikita Popov 4d606cf01e Merge branch 'PHP-5.5' 2013-06-29 21:57:36 +02:00
Arnaud Le Blanc 4cf20656ba Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS
  Added PHP_FCGI_BACKLOG, overrides the default listen backlog
2013-06-29 17:55:39 +02:00
Yasuo Ohgaki bedadf2bb2 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #35703: when session_name("123") consist only digits, should warning
2013-06-29 09:44:45 +09:00
Yasuo Ohgaki cfa667846f Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed bug #35703: when session_name("123") consist only digits, should warning
2013-06-29 09:43:06 +09:00
Yasuo Ohgaki f1c8d0b4e3 Merge branch 'PHP-5.5' into master
Fixed bug #49175: mod_files.sh does not support hash bits
2013-06-29 09:23:37 +09:00
Yasuo Ohgaki bfb4c3156f Fixed bug #35703: when session_name("123") consist only digits, should warning 2013-06-29 08:07:44 +09:00
Yasuo Ohgaki 5f0656b89d Fixed bug #49175: mod_files.sh does not support hash bits 2013-06-29 06:50:07 +09:00
Yasuo Ohgaki 520c08adf0 Fixed bug #49175: mod_files.sh does not support hash bits 2013-06-29 06:45:18 +09:00
Stanislav Malyshev 66667dda47 Merge branch 'PHP-5.5'
* PHP-5.5:
  add fix for  #60560 into upgrading
2013-06-28 14:02:12 -07:00
Stanislav Malyshev d231111972 Merge branch 'PHP-5.5'
* PHP-5.5:
  Add a __wakeup() method to SplFixedArray, thereby fixing serialising an
  Update NEWS
  small optimization
  fix bug #61860: use USearch for searches, it does the right thing
2013-06-28 13:56:31 -07:00
Ralf Lang f978f11e2e ws 2013-06-28 08:38:34 +02:00
Ralf Lang da04b2e28c Patch for https://bugs.php.net/bug.php?id=44522 to allow uploading files
above 2G.

This is essentially the same as the patch
"uploads_larger_than_2g_HEAD_v2 (last revision 2012-03-26 03:59 UTC) by
jason at infininull dot com)" but using off_t instead of signed long
(originally: uint)

I tested this on 64bit linux and succeeded uploading a file of 4.8 G.
The File did not get corrupted or truncated in any way.

I did not yet test this under windows or 32 bit linux

Note that there are still limitations:

* Did not test for files > 8 G
* php does not yet reject absurdly high values
* Still limited by underlying file system specific limits and free space
* in upload
* tmp dir and destination dir
2013-06-28 08:32:10 +02:00
Christopher Jones 8d9fcbba9e Merge branch 'master' of https://git.php.net/repository/php-src
# By Felipe Pena (11) and others
# Via Felipe Pena (14) and others
* 'master' of https://git.php.net/repository/php-src: (27 commits)
  Fix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented
  BC fix for PR 109 merge - create_sid() method in SessionHandler
  Tests, fixes and optimisations
  Add create_sid to session_set_save_handler and SessionHandler
  Fixed symbol export
  Update NEWS
  BC fix for PR 109 merge - create_sid() method in SessionHandler
  Update NEWS:w
  Fixed bug #65136 (RecursiveDirectoryIterator segfault)
  - BFN
  - Fixed bug #64467 (Segmentation fault after imap_reopen failure) patch by: askalski at gmail dot com
  - Reclassify bug
  - BFN
  - Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at web dot de
  - Fixed bug #63409 (php-dba function test fails on big-endian machine) patch by: tianhonglouis at gmail dot com
  - Fixed test
  add new test
  Update NEWS
  Fixed bug #65015 (pg_send_query does not flush send buffer) patch submitted by: adam at vektah dot net
  - Fixed typo on condition
  ...
2013-06-27 16:48:42 -07:00
Arpad Ray da31bef9cb Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented
  Update NEWS
  BC fix for PR 109 merge - create_sid() method in SessionHandler
  Tests, fixes and optimisations
  Add create_sid to session_set_save_handler and SessionHandler
2013-06-27 19:25:11 +01:00
Arpad Ray ada46c75f4 BC fix for PR 109 merge - create_sid() method in SessionHandler
Creates a new SessionIdInterface and moves create_sid() into it, so existing
handlers implementing SessionHandlerInterface don't require create_sid().
SessionHandler still includes the method so the default mod can be called, but
now implements both interfaces.

Also added several more tests for this feature.
2013-06-27 13:06:22 +01:00
Leigh b794cce4fd Tests, fixes and optimisations
* Amended existing tests to cater for new functionality.
* Implemented fixes and optimisations recommended by NikiC
* Added create_sid to the registered interface. This was breaking
tests. It also now breaks BC for people implementing the interface
directly instead of extending the class.
2013-06-27 13:06:22 +01:00
Leigh 074c26a68b Add create_sid to session_set_save_handler and SessionHandler
A lot of code already existed to allow a custom create_sid handler, but
lacked a specific implementation.

Therefore I have added a 7th (optional) argument
session_set_save_handler, to allow a user function to be supplied for
session id generation.

If a create_sid function is not supplied, the default function is
called in its absence to preserve backwards compatibility.

Likewise create_sid only added to SessionHandler class, and not the
interface to maintain backwards compatibility. If the result is not
overridden, the default is called.
2013-06-27 13:06:22 +01:00
Anatol Belski eb190bb571 Fixed symbol export
That's needed for baabd11929 to link
properly.
2013-06-27 14:00:56 +02:00
Xinchen Hui a441d9274b Merge branch 'PHP-5.5' 2013-06-27 12:38:52 +08:00
Felipe Pena 86a54638ed Merge branch 'PHP-5.5'
* PHP-5.5:
  - BFN
  - Fixed bug #64467 (Segmentation fault after imap_reopen failure) patch by: askalski at gmail dot com
  - Reclassify bug
2013-06-26 19:16:37 -03:00
Felipe Pena 4113b5aee3 Merge branch 'PHP-5.5'
* PHP-5.5:
  - BFN
  - Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at web dot de
2013-06-26 15:08:57 -03:00
Felipe Pena c6a218c76b Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fixed bug #63409 (php-dba function test fails on big-endian machine) patch by: tianhonglouis at gmail dot com
2013-06-26 13:50:47 -03:00
Felipe Pena c743d0c9dc Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fixed test
2013-06-26 13:36:50 -03:00
Andrey Hristov 793694b9d8 Merge branch 'PHP-5.5' 2013-06-26 16:51:42 +02:00
Yasuo Ohgaki eeeb7a281a Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #65015 (pg_send_query does not flush send buffer) patch submitted by: adam at vektah dot net
2013-06-26 16:23:25 +09:00
Yasuo Ohgaki 6be36cc381 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed bug #65015 (pg_send_query does not flush send buffer) patch submitted by: adam at vektah dot net
2013-06-26 16:19:31 +09:00
Felipe Pena 802a25e0c9 Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fixed typo on condition
2013-06-25 21:53:42 -03:00
Felipe Pena 0c7cf58092 Merge branch 'PHP-5.5'
* PHP-5.5:
  - BFN
2013-06-25 21:44:17 -03:00
Felipe Pena 509e89448e Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fixed bug #62475 (variant_* functions causes crash when null given as an argument)
  Update NEWS
  Update NEWS
  - BFN
2013-06-25 21:40:30 -03:00
Christopher Jones d1bed34b76 Merge branch 'master' of https://git.php.net/repository/php-src
# By Felipe Pena
# Via Felipe Pena (8) and Christopher Jones (3)
* 'master' of https://git.php.net/repository/php-src:
  - Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
  - BFN
  - Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
2013-06-25 17:28:27 -07:00
Felipe Pena 83bc4fb40a Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
  - BFN
2013-06-25 21:19:06 -03:00
Felipe Pena bce86874f6 Merge branch 'master' of git.php.net:/php-src 2013-06-25 18:01:32 -03:00
Felipe Pena f0823ac493 Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
  - BFN
2013-06-25 18:00:47 -03:00
Christopher Jones 92c87b02a9 Merge branch 'PHP-5.4'
* PHP-5.4:
  - BFN
2013-06-25 13:25:19 -07:00
Christopher Jones 2d654dc337 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  - Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana
2013-06-25 13:23:58 -07:00
Felipe Pena 5c71d4d785 Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana
2013-06-25 16:26:48 -03:00
Christopher Jones 53ec065077 Merge branch 'PHP-5.4'
* PHP-5.4:
  Minium changes to allow PDO_OCI to build with Oracle Database 12c libraries. (note OCI8 already builds with Oracle Database 12c)
2013-06-25 12:00:56 -07:00
Xinchen Hui d99a76ca96 Merge branch 'PHP-5.5' 2013-06-25 13:48:54 +08:00
Xinchen Hui d8374c5590 Merge branch 'PHP-5.5' 2013-06-25 13:40:19 +08:00
Felipe Pena ba3278d9e6 Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fixed bug #61594 (ext/session/mod_mm.c: missing free of ps_mm_instance) patch by: jlawall at hotmail dot com
  - BFN
2013-06-24 16:50:19 -03:00
Felipe Pena 33472f78f9 Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fixed bug #61387 (NULL valued anonymous column causes segfault in odbc_fetch_array) patch by: Brandon Kirsch
2013-06-24 14:48:28 -03:00
Xinchen Hui 83673eaf1d Merge branch 'PHP-5.5' 2013-06-24 23:53:54 +08:00
David Soria Parra e972b54b30 Merge branch 'PHP-5.5'
* PHP-5.5:
  Notify doc team BEFORE we release
2013-06-24 17:44:04 +02:00
David Soria Parra a496e62f13 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix #65108 (is_callable() triggers Fatal Error)
2013-06-24 17:22:02 +02:00
Remi Collet 8e4e38aaee Merge branch 'PHP-5.5'
* PHP-5.5:
  fix imagecreatefromwebp and imagewebp protos
2013-06-24 11:15:56 +02:00
Remi Collet 8c694401bb Merge branch 'PHP-5.5'
* PHP-5.5:
  Use same logic to load WebP image that other formats
2013-06-24 11:11:02 +02:00
Remi Collet 6c56d785ae Merge branch 'PHP-5.5'
* PHP-5.5:
  Upstream fix from https://bitbucket.org/libgd/gd-libgd/issue/75
2013-06-24 11:04:10 +02:00
Dmitry Stogov 0c9de2d94b Merge branch 'PHP-5.5'
* PHP-5.5:
  OPcache must be compatible with LiteSpeed SAPI

Conflicts:
	NEWS
2013-06-24 12:01:58 +04:00
Stanislav Malyshev 91cc70c430 Merge branch 'PHP-5.5'
* PHP-5.5:
  seems to be working fine for me on 32-bit
2013-06-23 23:38:15 -07:00
Stanislav Malyshev 30227f7a59 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix bug #62759: Buggy grapheme_substr() on edge case
2013-06-23 21:27:20 -07:00
Stanislav Malyshev 46c46921b1 Merge branch 'PHP-5.5'
* PHP-5.5:
  Require second parameter of imagecrop()
2013-06-23 20:30:03 -07:00
Stanislav Malyshev e02b41d25c Merge branch 'PHP-5.5'
* PHP-5.5:
  Implements feature Bug #63472 ability to set SO_BINDTODEVICE on socket.
2013-06-23 15:26:30 -07:00
Stanislav Malyshev c593b42a0c Merge branch 'PHP-5.5'
* PHP-5.5:
  Adding test to verify that __sleep can handle parent classes' private members
  Adding test to stabelize keys used when converting objects to arrays
2013-06-23 13:55:03 -07:00
Adam Harvey f94f17397e Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix bug #65088 (Generated configure script is malformed on OpenBSD).
2013-06-23 11:04:36 -07:00
Remi Collet 20dbd27108 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed Bug #65060 imagecreatefrom... crashes with user streams Fixed Bug #65084 imagecreatefromjpeg fails with URL
2013-06-21 14:11:33 +02:00
Ard Biesheuvel 9b22faa5b8 Merge branch 'PHP-5.5' 2013-06-21 11:27:23 +02:00
Pierre Joye 4718f892cb Merge branch 'master' of git.php.net:php-src 2013-06-20 22:34:04 +02:00
Pierre Joye a1d0a869be Merge branch 'PHP-5.5'
* PHP-5.5:
  fix #65070, bgcolor does not use the same format as the input image with imagerotate
  fix #65070, bgcolor does not use the same format as the input image with imagerotate
  Fix the spelling of the php_cli_server_http_response_status_code_pair typedef.
  Change the search in get_status_string() to correctly handle unknown codes.
  Update git rules (5.5 is stable, 5.3 sec only)
  skip test for bug #64936 when tokenizer not built
  Bump version
  Update credits
  Merge NEWS from PHP 5.4 branch
  Reorder NEWS for PHP 5.5.0 final

Conflicts:
	configure.in
	ext/gd/libgd/gd_interpolation.c
	main/php_version.h
2013-06-20 22:32:52 +02:00
Adam Harvey e41eb5272f Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix the spelling of the php_cli_server_http_response_status_code_pair typedef.
  Change the search in get_status_string() to correctly handle unknown codes.
2013-06-20 09:43:00 -07:00
Ard Biesheuvel 4cd2b7212f Fix non-specialized executor build
Removed a couple of calls to FREE_OP2() that were left behind in
the handlers for break and continue opcodes after commit 7628da98
2013-06-20 17:26:05 +02:00
Johannes Schlüter 3e6b312b55 Merge branch 'PHP-5.5' 2013-06-20 11:57:56 +02:00
Remi Collet a964c5def8 Merge branch 'PHP-5.5'
* PHP-5.5:
  skip test for bug #64936 when tokenizer not built
2013-06-20 08:43:11 +02:00
David Soria Parra f77e3be102 Merge branch 'PHP-5.5'
* PHP-5.5:
  Bump version
  Update credits
  Merge NEWS from PHP 5.4 branch
  Reorder NEWS for PHP 5.5.0 final
2013-06-19 22:14:08 +02:00
Pierre Joye d5b1111fb0 Merge branch 'PHP-5.5'
* PHP-5.5:
  add notes about opcache windows issue and migration from APC
2013-06-19 17:59:30 +02:00
Anatol Belski d9f538bc68 Merge branch 'PHP-5.5'
* PHP-5.5:
  added some tests based on bug #64395
2013-06-19 16:25:08 +02:00
Johannes Schlüter 96c1e0440b Merge branch 'PHP-5.5' 2013-06-19 15:09:45 +02:00
Remi Collet 04b2f8d53e Merge branch 'PHP-5.5'
* PHP-5.5:
  Related to bug #65047 (Test skip on client / server version)
2013-06-19 12:27:12 +02:00
Matteo Beccati 77032bcd9c Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #65047 (Test skip on client / server version)
  Remove broken client version checking
  Clean up leftover file after the test
2013-06-19 11:53:21 +02:00
Stanislav Malyshev 07a38ea80c Merge branch 'PHP-5.5'
* PHP-5.5:
  sync NEWS
2013-06-18 23:09:36 -07:00
Stanislav Malyshev a984dd4eb4 Merge branch 'PHP-5.5'
* PHP-5.5:
  5.4.18 next
2013-06-18 22:59:34 -07:00
Xinchen Hui ce1cb1f7a6 Merge branch 'PHP-5.5' 2013-06-19 11:17:55 +08:00
Nikita Popov 42729c1baf Merge branch 'PHP-5.5' 2013-06-17 23:49:08 +02:00
Nikita Popov ae91084067 Remove unnecessary NULL checks from zend_hash
Our memory allocation functions (including the persistent ones)
are infallible, so no need to check for NULL.
2013-06-17 18:51:59 +02:00
Nikita Popov ca660c2f77 Update NEWS, UPGRADING and UPGRADING.INTERNALS 2013-06-17 18:27:22 +02:00
Nikita Popov 7713b8c2ac GMP improvements
As per RFC https://wiki.php.net/rfc/operator_overloading_gmp
2013-06-17 17:59:12 +02:00
Nikita Popov 3823321c5c Implement internal operator overloading
As pre RFC https://wiki.php.net/rfc/operator_overloading_gmp
2013-06-17 17:48:13 +02:00
Stanislav Malyshev 1143f58a70 Merge branch 'PHP-5.5'
* PHP-5.5:
  Merge branch 'pull-request/320'
  Merge branch 'pull-request/320'
2013-06-17 01:07:28 -07:00
Stanislav Malyshev a434251322 Merge branch 'PHP-5.5'
* PHP-5.5:
  Tests: PDO Mysql - update for fixed getColumnMeta()
  fix bug #48724
2013-06-17 00:42:36 -07:00
Stanislav Malyshev a72fc256f4 Merge branch 'PHP-5.5'
* PHP-5.5:
  readline can output control codes
  Bug #55694: Update readline test to support attempted_completion_over variable
  Bug #55694: Expose attempted_completion_over variable from readline library
2013-06-17 00:17:28 -07:00
Xinchen Hui 875df12c0b Merge branch 'PHP-5.5' 2013-06-17 13:25:04 +08:00
Stanislav Malyshev dea16af29a Merge branch 'PHP-5.5'
* PHP-5.5:
  Identation Fixed
  Identation Fixed
2013-06-16 18:14:32 -07:00
Stanislav Malyshev 8b3d31c1c3 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix bug #64764: Add status option to fpm init.d script
2013-06-16 16:56:38 -07:00
Stanislav Malyshev 7978e44f08 Merge branch 'PHP-5.5'
* PHP-5.5:
  update NEWS
2013-06-16 16:41:37 -07:00
Stanislav Malyshev 97c56e1eb1 Merge branch 'PHP-5.5'
* PHP-5.5:
  news for #64166
2013-06-16 16:40:56 -07:00
Stanislav Malyshev e3cd0d1417 Merge branch 'PHP-5.5'
* PHP-5.5:
  add more tests for bug #64166
  Move unsigned char declaration to top of block
  trailing ws
  Fix #64166: quoted-printable-encode stream filter incorrectly discarding whitespace
  Fix #64166: quoted-printable-encode stream filter incorrectly discarding whitespace
2013-06-16 16:39:06 -07:00
Stanislav Malyshev 6db7e31fa6 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix bug #64936 - clean doc comment state at the beginning and end of the scan
  ws fix
2013-06-16 15:30:44 -07:00
Anatol Belski fd706595d4 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix test
2013-06-17 00:11:05 +02:00
Xinchen Hui 0842d5c06e Merge branch 'PHP-5.5' 2013-06-16 22:57:01 +08:00
Boris Lytochkin 3457096758 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix typo in test
2013-06-16 00:10:06 +04:00
Boris Lytochkin 6ab78c9fde Merge branch 'master' of https://git.php.net/push/php-src
* 'master' of https://git.php.net/push/php-src: (171 commits)
  Fixed bug #63186 (compile failure on netbsd)
  fix test for bug #60322
  ensure the error_reporting level to get expected notice
  fixed tests
  missing tests for bug #53437
  fixed EOL
  added closing ?>
  fix double entry
  Merge branch 'pull-request/341'
  Merge branch 'pull-request/341'
  Merge branch 'pull-request/341'
  split the test for 32 and 64 bit
  typo fixes (argument)
  typo fixes (accommodate, parameter)
  missing colon
  Backported the fix for bug #53437
  Backported the fix for bug #53437
  fixed the test
  Fix a BC breach related to bug #53437
  Fixed bug #64988 (Class loading order affects E_STRICT warning)
  ...
2013-06-16 00:04:22 +04:00
Matteo Beccati 55656d616c Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #63186 (compile failure on netbsd)
2013-06-14 16:56:04 +02:00
Stanislav Malyshev 3716599502 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix test for bug #60322
2013-06-13 10:31:31 -07:00
Anatol Belski c1772cc3df Merge branch 'PHP-5.5'
* PHP-5.5:
  ensure the error_reporting level to get expected notice
2013-06-12 13:15:32 +02:00
Anatol Belski 00ba7d416f Merge branch 'PHP-5.5'
* PHP-5.5:
  fixed tests
2013-06-11 12:40:30 +02:00
Anatol Belski da094040fb Merge branch 'PHP-5.5'
* PHP-5.5:
  missing tests for bug #53437
2013-06-11 11:24:33 +02:00
Anatol Belski 8b74d46026 Merge branch 'PHP-5.5'
* PHP-5.5:
  fixed EOL
2013-06-11 08:33:19 +02:00
Anatol Belski c90e95baf6 Merge branch 'PHP-5.5'
* PHP-5.5:
  added closing ?>
2013-06-11 08:26:07 +02:00
Stanislav Malyshev 4e56ac50e5 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix double entry
  Merge branch 'pull-request/341'
2013-06-10 18:16:23 -07:00
Stanislav Malyshev 8ac131503d Merge branch 'PHP-5.5'
* PHP-5.5:
  Merge branch 'pull-request/341'
  Merge branch 'pull-request/341'
2013-06-10 14:31:57 -07:00
Anatol Belski d7c943e2a1 Merge branch 'PHP-5.5'
* PHP-5.5:
  split the test for 32 and 64 bit
2013-06-10 22:49:56 +02:00
Stanislav Malyshev 09bc6d7cf6 Merge branch 'PHP-5.5'
* PHP-5.5:
  typo fixes (argument)
  typo fixes (accommodate, parameter)
2013-06-10 13:37:56 -07:00
Anatol Belski 00495d160b Merge branch 'PHP-5.5'
* PHP-5.5:
  missing colon
2013-06-10 19:55:51 +02:00
Anatol Belski 464ad59a3b Merge branch 'PHP-5.5'
* PHP-5.5:
  Backported the fix for bug #53437
  Backported the fix for bug #53437
2013-06-10 19:53:27 +02:00
Anatol Belski b80b8373af Merge branch 'PHP-5.5'
* PHP-5.5:
  fixed the test
2013-06-10 18:31:40 +02:00
Anatol Belski 44d9060648 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix a BC breach related to bug #53437
2013-06-10 17:50:13 +02:00
Xinchen Hui 1689a7fe98 Merge branch 'PHP-5.5' 2013-06-10 21:33:47 +08:00
Stanislav Malyshev 9069d4081d Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix image method signatures
2013-06-10 02:24:10 -07:00
Jakub Vrana b787fdebba Fix image method signatures 2013-06-10 02:13:13 -07:00
Dmitry Stogov 36dc1ed4b0 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded
  Fix spelling and correct typo.
  Fix spelling and correct typo.
2013-06-10 12:57:36 +04:00
Dmitry Stogov 56c9a2f4f6 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed test script
2013-06-10 12:56:33 +04:00
Stanislav Malyshev 1355908149 Merge branch 'PHP-5.5'
* PHP-5.5:
  PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded
2013-06-10 01:53:36 -07:00
Stanislav Malyshev f9822bd099 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix spelling and correct typo.
2013-06-10 01:42:41 -07:00
Stanislav Malyshev 8697c27000 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix spelling and correct typo.
2013-06-10 01:41:26 -07:00
Dmitry Stogov 14a943ae86 Merge branch 'PHP-5.5'
* PHP-5.5:
  Callback has to be restored in MSHUTDOWN
2013-06-10 12:34:34 +04:00
Dmitry Stogov 738dfc69e7 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed comments
2013-06-10 12:06:14 +04:00
Dmitry Stogov 95d88cc66a Merge branch 'PHP-5.5'
* PHP-5.5:
  Avoid multiple allocations of the same key in different processes
2013-06-10 11:44:54 +04:00
Dmitry Stogov 456ef2ebfa Merge branch 'PHP-5.5'
* PHP-5.5:
  Compact HashTables before storing them in shared memory

Conflicts:
	ext/opcache/ZendAccelerator.c
2013-06-10 11:25:41 +04:00
Dmitry Stogov 841e1f0364 Merge branch 'PHP-5.5'
* PHP-5.5:
  Use size_t instead of int
2013-06-10 10:37:53 +04:00
Xinchen Hui 00c7440b81 Merge branch 'PHP-5.5' 2013-06-09 22:26:18 +08:00
Xinchen Hui afe547d335 Merge branch 'PHP-5.5' 2013-06-09 14:26:16 +08:00
Xinchen Hui 4600578830 Merge branch 'PHP-5.5' 2013-06-09 13:50:06 +08:00
Matteo Beccati 2c0f09540e Fixed signedness warning 2013-06-07 09:38:58 +02:00
Matteo Beccati a649f42b20 NEWS 2013-06-07 09:36:54 +02:00
Matteo Beccati 19ead23e8e Fixed bug #63657 (pgsqlCopyFrom/To methods use Postgres < 7.3 syntax)
Although still supported (for now), I've replaced with pre-9.0 syntax.
Still not cutting edge, but it works with any version PDO_pgsql is
compatible with (7.4+) and will possibly keep working for longer than
what we already had.
2013-06-07 09:36:54 +02:00
Matteo Beccati 2f7f34374c NEWS 2013-06-07 09:36:53 +02:00
Stanislav Malyshev fbf1dff674 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix 5.4.16 date
2013-06-06 13:27:39 -07:00
Anatol Belski 73c627ccd5 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix NEWS
2013-06-06 18:58:23 +02:00
Anatol Belski c6b569011a Merge branch 'PHP-5.5'
* PHP-5.5:
  updated NEWS
  updated NEWS
  Fixed bug #64934 Apache2 TS crash with get_browser()
2013-06-06 18:53:41 +02:00
David Soria Parra 83580ea956 Merge branch 'PHP-5.5'
* PHP-5.5:
  News update
  PHP 5.5.0RC3 NEWS
2013-06-05 23:09:27 +02:00
Johannes Schlüter 9a9f42767d Merge branch 'PHP-5.5' 2013-06-05 16:35:27 +02:00
Xinchen Hui ecfc3599a7 Merge branch 'PHP-5.5' 2013-06-05 17:32:09 +08:00
Stanislav Malyshev 3c8c200d0a Merge branch 'PHP-5.5'
* PHP-5.5:
  fix CVE-2013-2110 - use correct formula to calculate string size
2013-06-04 22:01:02 -07:00
Matteo Beccati b62b8b4528 Fixed Bug #42614 (PDO_pgsql: add pg_get_notify support) 2013-06-05 01:58:55 +02:00
Matteo Beccati baabd11929 Refactored custom PDO_pgsql methods to trigger errors/exceptions
BC Break: the custom methods were previously just return false on
failure. Now they throw an exception with a proper error message.
An hopefully welcome improvement, but some application might be
depending on the old behaviour. FWIW the PDO::pgsqlCopy* methods
are not documented, even though they are available since 5.3.x.
2013-06-05 01:58:37 +02:00
Matteo Beccati 1e36e45d97 Allow PDO drivers custom methods to trigger errors/exceptions
Moved a few definitions from php_pdo_int.h to a new php_pdo_error.h
header file that can be included if drivers need PDO's own error
handling to be triggered within custom methods (e.g. PDO::pgsqlLOBOpen).
2013-06-04 16:49:16 +02:00
Stanislav Malyshev b144c26319 Merge branch 'PHP-5.5'
* PHP-5.5:
  news for dblib fixes
  FIX BUG #55647, #60512, #60512, #61900, #64338, #64808, #63638
  Fix PDO_DBLIB bugs: #64338, #64808, #63638

Conflicts:
	ext/pdo_dblib/dblib_driver.c
	ext/pdo_dblib/dblib_stmt.c
2013-06-03 22:03:25 -07:00
Remi Collet 57dd91be82 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed Bug #64962 	imagerotate produce corrupted image
2013-06-03 15:02:43 +02:00
Remi Collet 809b13d67b Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS
  Fixed Bug #64961 segfault in imagesetinterpolation
2013-06-03 14:17:22 +02:00
Matteo Beccati 760099c2e6 Merge branch 'PHP-5.5'
* PHP-5.5:
  Clean up leftover test files
  Improved test portability so that it doesn't fail with pdo_pgsql
  Fix PDO::inTransaction() test for pgsql
2013-06-02 13:39:45 +02:00
Matteo Beccati ab25fcb2a1 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #64609 (pg_convert enum type support)
2013-06-02 06:34:14 +02:00
Matteo Beccati 924605eeb4 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #62857 (bytea test failures)
2013-06-01 23:23:31 +02:00
Stanley Sufficool c34a2757db FIX BUG #55647
PDO DBLIB was returning false if there were no results after a
statement was executed. This should be the fetch methods response
not the execute method response.
2013-06-01 00:38:09 -07:00
Stanley Sufficool d9be9e0231 FIX BUG #60512 (the correct way this time)
Last fix just truncated the password. This fixes the message
handler per the bug report.
2013-06-01 00:03:44 -07:00
Stanley Sufficool 3b54de3db0 FIX BUG #60512
FreeTDS will segfault when passwords over 30 characters are used.
Truncate the password and let the server return an error if the
password is still invalid.
2013-05-31 23:58:16 -07:00
Stanley Sufficool 317653e694 FIX BUG #61900
PDO DBLIB was not setting error and message handlers when FreeTDS was used.
Updated to set error and message handlers the same way as mssql.
2013-05-31 23:24:57 -07:00
Stanley Sufficool 0e2bcf3373 FIX BUG #64338, #64808, #63638
PDO DBLIB would segfault on getcolumn meta when colno was
out of bounds. DBLIB connection specified null arg to dbsetopt
per Microsoft technical docs, but FreeTDS complains. The SQL USE
statement was invalid for SQL Azure, use DBSETLDBNAME instead.
2013-05-31 22:53:08 -07:00
Matteo Beccati d22c7368e7 Merge branch 'PHP-5.5' 2013-05-31 16:27:16 +02:00
Remi Collet f8b4c0815a Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #64949 (Buffer overflow in _pdo_pgsql_error)
  Use size_t everywhere instead
  This needs to be a long Otherwise we are limited to a 32G opcache segment
2013-05-31 08:46:18 +02:00
Stanley Sufficool 0074cd2675 pdo_dblib: fix bug #64522DBLIB statement destructor was being called late and clobbered results from subsequent statement objects sharing the same connection 2013-05-30 21:59:00 -07:00
Rasmus Lerdorf e02add77fc Use size_t everywhere instead 2013-05-29 14:34:22 -07:00
Rasmus Lerdorf 80c13e9965 This needs to be a long
Otherwise we are limited to a 2G opcache segment
2013-05-29 14:26:42 -07:00
Dmitry Stogov 029c1da846 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed incorrect argument number
2013-05-29 11:15:27 +04:00
Dmitry Stogov 9e019f1099 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Fix #64745 hash_pbkdf2 truncation issue
2013-05-29 00:02:13 +04:00
Dmitry Stogov 458f02c471 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed crash during search in empty persistent HashTable
2013-05-29 00:01:35 +04:00
Anthony Ferrara 2129c70896 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix #64745 hash_pbkdf2 truncation issue
2013-05-28 15:38:11 -04:00
Pierre Joye 8059ec1832 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix #64898imagerotate is broken with bilinear interpolation
2013-05-27 09:22:00 +02:00
Anatol Belski 6e081f8a82 Merge branch 'PHP-5.5'
* PHP-5.5:
  reduced the file size even more
2013-05-25 00:11:09 +02:00
Anatol Belski 3a3828669f Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #64916 finfo testcase contains copyrighted music.
2013-05-25 00:02:34 +02:00
Remi Collet 76ad52ccc5 Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS
  Fixed Bug #64915 (error_log ignored when daemonize=0)
2013-05-24 12:11:16 +02:00
David Soria Parra cd23df35b2 Merge branch 'PHP-5.5'
* PHP-5.5:
  News for upcoming RC3 if necessary
  News for RC2
2013-05-23 00:57:30 +02:00
Johannes Schlüter 925a71e583 Merge branch 'PHP-5.5' 2013-05-22 17:20:49 +02:00
Remi Collet 88db679742 Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS
  NEWS
  Fixed bug #64895 Integer overflow in SndToJewish
2013-05-22 08:30:00 +02:00
Stanislav Malyshev 7b0d91643b Merge branch 'PHP-5.5'
* PHP-5.5:
  merge NEWS from 5.3
  fix order
2013-05-21 23:26:40 -07:00
Sara Golemon ee366ea516 Merge branch 'PHP-5.5'
* PHP-5.5:
  Don't double-quote name of namespaced function.
2013-05-19 13:35:09 -07:00
Remi Collet 57b35f1b0d Merge branch 'PHP-5.5'
* PHP-5.5:
  Integer overflow in SndToJewish leads to php hang AT least in (inputDay is long, metonicCycle is int):    metonicCycle = (inputDay + 310) / 6940;
2013-05-21 18:09:22 +02:00
Andrey Hristov e19b7c2b57 Merge branch 'PHP-5.5' 2013-05-21 13:28:09 +02:00
Remi Collet 07c58d4191 Merge branch 'PHP-5.5'
* PHP-5.5:
  UPGRADING
2013-05-21 12:32:23 +02:00
Remi Collet 6dc95b4df3 Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS
  Add --with-fpm-systemd option to report health to systemd, and systemd_interval option to configure this. The service can now use Type=notify in the systemd unit file.
2013-05-21 09:54:54 +02:00
Dmitry Stogov bf146ad5b5 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #64720 (SegFault on zend_deactivate)

Conflicts:
	NEWS
2013-05-21 10:33:57 +04:00
Stanislav Malyshev 1c41a495d4 Merge branch 'PHP-5.5'
* PHP-5.5:
  add reporter
2013-05-20 02:02:46 -07:00
Stanislav Malyshev 3ce366b7cd Merge branch 'PHP-5.5'
* PHP-5.5:
  fix bug #64660 - yyparse can return 2, not only 1
2013-05-20 00:58:12 -07:00
Stanislav Malyshev fe1c83925c Merge branch 'PHP-5.5'
* PHP-5.5:
  fix 5.4.16 relase date
2013-05-19 23:55:45 -07:00
Pierre Joye 9ef6b30dc3 Merge branch 'PHP-5.5'
* PHP-5.5:
  entry for #64214
  other fix for #64214, unmodified file may not have old fp set, causing other possible crashes
2013-05-17 11:51:18 +02:00
Dmitry Stogov 76516701ae Added missing ZE/OPcache related entries 2013-05-17 13:35:32 +04:00
Johannes Schlüter 22da0b7364 Recover NEWS
Apperently wrongly merged in revision 488933792a
2013-05-17 11:22:04 +02:00
Dmitry Stogov 273ad58295 Improved IS_VAR operands fetching 2013-05-17 13:15:09 +04:00
Sara Golemon cfd1045822 Add optional second arg to unserialize()
Returns the number of bytes consumed by reference for
streaming unserialization.

Actual unserialization behavior is not modified at all.

The need for this came up while trying to parse SplDoublyLinkedList's
serialization format which uses a non-standard stream of serialized values.
2013-05-16 15:18:35 -07:00
Anatol Belski bc656cde04 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed error handling for ext/sockets under win
2013-05-16 19:29:42 +02:00
Anatol Belski 2933f77e39 Merge branch 'PHP-5.5'
* PHP-5.5:
  updated NEWS
  Fixed bug #64853Use of no longer available ini directives causes crash on TS build
2013-05-16 08:45:02 +02:00
Pierre Joye f5d5a50a1c Merge branch 'PHP-5.5'
* PHP-5.5:
2013-05-15 15:55:20 +02:00
Pierre Joye ebadc02273 Merge branch 'master' of git.php.net:php-src 2013-05-15 15:55:13 +02:00
David Soria Parra c5841f8cb7 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix array_colum segfault
2013-05-15 14:43:03 +02:00
Anatol Belski 8fa8591cfa Merge branch 'PHP-5.5'
* PHP-5.5:
  fixe preprocessor definition
2013-05-15 14:24:46 +02:00
Anatol Belski d8e44e3d70 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix unitialized vars when sql.safe_mode=1
  more check for php_stream_fopen_tmpfile failure
2013-05-15 11:17:57 +02:00
Pierre Joye 3ed4bf8fd9 Merge branch 'PHP-5.5'
* PHP-5.5:
  more check for php_stream_fopen_tmpfile failure
2013-05-14 16:46:40 +02:00
Andrey Hristov 09cc4484a2 Merge branch 'master' of ssh://git.php.net/php-src 2013-05-14 12:57:19 +02:00
Andrey Hristov 47c5ba4c0c Merge branch 'PHP-5.5'
Conflicts:
	NEWS
2013-05-14 12:57:02 +02:00
Anatol Belski b1480987f9 Merge branch 'PHP-5.5'
* PHP-5.5:
  updated libmagic.patch after fix for #64830
2013-05-14 11:16:17 +02:00
Anatol Belski 4206e2d870 Merge branch 'master' of git.php.net:php-src 2013-05-14 09:44:36 +02:00
Anatol Belski 1f2e0cb8f5 Merge branch 'PHP-5.5'
* PHP-5.5:
  updated NEWS
  Fixed bug #64830 mimetype detection segfaults on mp3 file
2013-05-14 09:42:57 +02:00
Pierre Joye bb5f8626eb Merge branch 'PHP-5.5'
* PHP-5.5:
  php_stream_fopen_tmpfile may file, causing any following stream usage to crash
2013-05-14 09:21:38 +02:00
Anatol Belski 65fda25024 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix heap overflow warnings on win x64 debug crt
2013-05-13 14:27:12 +02:00
Anatol Belski 39d48c4bfa Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #64825 Invalid free unserializing DateTimeZone
2013-05-12 21:30:21 +02:00
Anatol Belski 1477471f6c Merge branch 'PHP-5.5'
* PHP-5.5:
  updated NEWS
  updated NEWS
  Fixed bug #64821 Custom Exceptions crash when internal properties overridden
2013-05-12 14:10:24 +02:00
Anatol Belski cf72450c88 Merge branch 'PHP-5.5'
* PHP-5.5:
  fixed variable corruption under win x64
2013-05-11 02:48:24 +02:00
jas- 525e27e1e5 Fix for challenge string length pointed out by Kalle Nielsen 2013-05-06 18:43:13 -06:00
jas- 8f56ac8401 Address feature request #38917 for native SPKAC (HTML5 keygen element) support 2013-05-06 16:36:06 -06:00
Xinchen Hui da07e91c3a Merge branch 'PHP-5.5' 2013-05-09 15:57:56 +08:00
Gustavo Lopes ab9a3ca669 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix bug #64506: fix build with --disable-ipv6
2013-05-08 19:58:43 +02:00
Gustavo Lopes ab38bf1931 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix bug #64506: fix build with --disable-ipv6
2013-05-08 19:57:23 +02:00
Gustavo Lopes 6f3c3862ca Fix bug #64506: fix build with --disable-ipv6 2013-05-08 19:56:40 +02:00
Anatol Belski 3a8776a288 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed news, rc1 is already branched
  Fixed bug #64769 mbstring PHPTs crash on Windows x64
2013-05-08 19:26:04 +02:00
Anatol Belski 506ecc0a73 Merge branch 'master' of git.php.net:php-src 2013-05-08 19:19:24 +02:00
Anatol Belski 5490fe2402 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #64769 mbstring PHPTs crash on Windows x64
2013-05-08 19:18:00 +02:00
Anatol Belski d2a784baa6 Fixed bug #64769 mbstring PHPTs crash on Windows x64
The tricky business going there in oniguruma is saving a pointer
in an int variable, passing that variable into a function and making
it a pointer again. On 64bit windows casting a pointer to a 32 bit
int will truncate that pointer. This kind of things won't work on
Windows x64.

[SNIPPET]
unsigned long ul0[2], ul1, *ul2;

ul0[0] = 42uL;
ul0[0] = 24uL;

ul1 = (unsigned long)ul0;
ul2 = (unsigned long *)ul1;

/* now it's broken, accessing ul2[0] will crash. */
[/SNIPPET]

To make it portable, ULONG_PTR should be used in this case.

In oniguruma this behaviour is to see at least in the following
codepath:

ext/mbstring/oniguruma/enc/unicode.c:10938
ext/mbstring/oniguruma/st.c:308
ext/mbstring/oniguruma/enc/unicode.c:10859
2013-05-08 18:58:32 +02:00
David Soria Parra f10fc6fcee Merge branch 'PHP-5.5'
* PHP-5.5:
  News for RC2
  NEWS for RC1
2013-05-08 18:57:23 +02:00
Johannes Schlüter 7cf806a033 Merge branch 'PHP-5.5' 2013-05-08 18:03:53 +02:00
Remi Collet 70e0118b1b Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #64785 : restore 5.4 behaviour, libpng is mandatory
2013-05-08 07:37:46 +02:00
Ard Biesheuvel 046594caad Merge branch 'PHP-5.5' 2013-05-07 22:08:24 +02:00
Remi Collet f5973141af Merge branch 'PHP-5.5'
* PHP-5.5:
  gd: fix 2 failed tests (bundled lib) due to arithmetic precision (allow minor diff).
2013-05-06 10:25:41 +02:00
Remi Collet 9b30ee7e0b Merge branch 'PHP-5.5'
* PHP-5.5:
  gd: fix previous (bad include)
2013-05-06 10:07:11 +02:00
Remi Collet 03091c834c Merge branch 'PHP-5.5'
* PHP-5.5:
  Revert removal of overflow2 use in gd.c Function provided by gd_security with bundled libgd Function provided by gd_compat with system libgd
2013-05-06 10:02:34 +02:00
Remi Collet 76665ca070 Merge branch 'PHP-5.5'
* PHP-5.5:
  gd: fix include...
2013-05-05 10:39:37 +02:00
Remi Collet 87de7b353b Merge branch 'PHP-5.5'
* PHP-5.5:
  Move (back) missing functions in system libgd to gd_compat - display libPng version in all cases - gd_compat.c in ext/gd (nothing in ext/gd/libgd)
2013-05-05 09:56:52 +02:00
Remi Collet e7ffb77341 Merge branch 'PHP-5.5'
* PHP-5.5:
  gd: don't include png.h (breaks build on some old version), so report libPNG version only with external libgd
2013-05-05 08:35:34 +02:00
Remi Collet a47c5ed855 Merge branch 'PHP-5.5'
* PHP-5.5:
  gd: missing comma
2013-05-05 06:52:35 +02:00
Remi Collet dca2cd2f98 Merge branch 'PHP-5.5'
* PHP-5.5:
  gd: fix typo and cleanups
2013-05-04 20:36:42 +02:00
Remi Collet 71e76816ce Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS
  fix build with bundled libgd
  Move png and jpeg version functions to gd.c so the external library build doesn't include anything from libgd/.
  Remove extra unused functions from gd_compat.h
  Rewrite Xpm library check so it doesn't break on MultiArch systems
  Required GD >= 2.1.0 or GD bundled, this allows us to remove most of the #ifdef
  * Remove overflow2, getmbi and skipheaders from gd_compat.h * Add missing return in _php_ctx_getmbi * Reintroduce imagecreatefromxbm by checking for gdCreateImageFromXbm
  Remove overflow2, getmbi and skipheader, since they are not needed anymore.
  Allow to use new GD-2.1.0 function from system library
2013-05-04 16:54:46 +02:00
Xinchen Hui d6de58d7e4 Merge branch 'PHP-5.5' 2013-05-04 20:45:07 +08:00
Anatol Belski a14a809aff Merge branch 'PHP-5.5'
* PHP-5.5:
  better fix for bug #64770
  better fix for bug #64770
2013-05-04 12:20:36 +02:00
Boris Lytochkin 98063b6531 Merge branch 'PHP-5.5'
* PHP-5.5:
  remove OS-specific OIDs from 'WALK multiple on single OID with OID suffix as keys' test part
2013-05-04 00:06:15 +04:00
Boris Lytochkin 7f5a4cd70a Merge branch 'PHP-5.5'
* PHP-5.5:
  re-work walkaround for net-snmp BUGid 2027834, no need to detect it anymore add test for Bug #64159 bump default buffer size for values(32->512): do not reallocate buffers in 99% cases
  cut PHP_VERSION_ID - we know API version now
2013-05-03 23:22:27 +04:00
Boris Lytochkin 86fbf51ac1 Merge branch 'master' of https://git.php.net/push/php-src
* 'master' of https://git.php.net/push/php-src:
  updated NEWS
  updated NEWS
  Fixed bug #64770 stream_select() fails with pipes
2013-05-03 19:25:33 +04:00
Anatol Belski 88c83469b5 Merge branch 'PHP-5.5'
* PHP-5.5:
  updated NEWS
  updated NEWS
  Fixed bug #64770 stream_select() fails with pipes
2013-05-03 17:06:16 +02:00
Boris Lytochkin cdba4ee320 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #64159 (Truncated snmpget)
  Fixed bug #64159 (Truncated snmpget)
2013-05-03 15:47:29 +04:00
Boris Lytochkin 1e5bcd4cf5 Merge branch 'PHP-5.5'
* PHP-5.5:
  update NEWS
  update NEWS
  Fix bug #64765 (enclose IPv6 address into square brackets)
2013-05-03 12:26:16 +04:00
Boris Lytochkin ae54e37793 Merge branch 'master' of https://git.php.net/push/php-src
* 'master' of https://git.php.net/push/php-src: (346 commits)
  NEWS
  NEWS
  NEWS
  From code coverity scan, syscall return value must be check.
  fix more resource leaks
  From code coverity scan - fix some memory leak - fix some resources leak (fd) - create fpm_worker_pool_free (shared use) - possible null dref (wp->user and wp->home can be null)
  fixed size array cannot be null
  use limit_extensions as we use security_limit_extensions later (free)
  unused variable
  fix possible null deref (detected by code coverity scan)
  updated lib versions
  Oops
  Harden loopback tests
  Fix race condition when ext/hash/tests run in parallel
  Remove trailing space in NEWS
  NEWS for 514afd67
  Fix bug #64729: compilation failure on x32
  don't include smart_str.h in a too global header, fixes #64718
  NEWS
  When Apache use RewriteRule to redirect, via mod_proxy_fgi, to php-fpm the SCRIPT_FILENAME may contains the QUERY_STRING.
  ...
2013-05-03 11:23:20 +04:00
Remi Collet 3db066759f Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS
  NEWS
  NEWS
2013-05-03 08:31:45 +02:00
Remi Collet 570290e208 Merge branch 'PHP-5.5'
* PHP-5.5:
  From code coverity scan, syscall return value must be check.
2013-05-03 08:23:20 +02:00
Remi Collet adf9ecfd4f Merge branch 'PHP-5.5'
* PHP-5.5:
  fix more resource leaks
2013-05-02 13:47:58 +02:00
Remi Collet d583064a51 Merge branch 'PHP-5.5'
* PHP-5.5:
  From code coverity scan - fix some memory leak - fix some resources leak (fd) - create fpm_worker_pool_free (shared use) - possible null dref (wp->user and wp->home can be null)
2013-05-02 13:31:38 +02:00
Remi Collet ecb17b9a2d Merge branch 'PHP-5.5'
* PHP-5.5:
  fixed size array cannot be null
2013-05-02 10:33:14 +02:00
Remi Collet 59820266c3 Merge branch 'PHP-5.5'
* PHP-5.5:
  use limit_extensions as we use security_limit_extensions later (free)
  unused variable
2013-05-02 10:16:01 +02:00
Remi Collet db9cfd7a82 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix possible null deref (detected by code coverity scan)
  Remove trailing space in NEWS
  NEWS for 514afd67
2013-05-02 09:39:06 +02:00
Anatol Belski 06f104aab9 Merge branch 'PHP-5.5'
* PHP-5.5:
  updated lib versions
2013-05-01 21:38:17 +02:00
Sara Golemon e836f8e38f Oops 2013-04-30 19:43:52 -07:00
Sara Golemon e217db8e69 Harden loopback tests
These tests depend on being able to bind port 31337.
Try a range of ports until one binds or we give up trying.
2013-04-30 19:30:55 -07:00
Sara Golemon 6aefaad46e Fix race condition when ext/hash/tests run in parallel 2013-04-30 16:28:37 -07:00
Gustavo Lopes 734cb61f81 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix bug #64729: compilation failure on x32
2013-04-30 19:38:00 +02:00
Johannes Schlüter bfb787b16f Merge branch 'PHP-5.5' 2013-04-30 14:28:18 +02:00
Remi Collet bd77763889 Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS
  When Apache use RewriteRule to redirect, via mod_proxy_fgi, to php-fpm the SCRIPT_FILENAME may contains the QUERY_STRING.
2013-04-30 09:03:28 +02:00
Dmitry Stogov 4558533ef3 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  fix #64738, fix implicit type declaration
2013-04-30 10:26:57 +04:00
Dmitry Stogov a9679227cf Merge branch 'PHP-5.5'
* PHP-5.5:
  Added SoapClient constructor option 'ssl_method' to specify ssl method
2013-04-30 10:26:29 +04:00
Pierre Joye fc666bdb83 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix #64738, fix implicit type declaration
2013-04-30 08:03:46 +02:00
Dmitry Stogov 05a88447ad Merge branch 'PHP-5.5'
* PHP-5.5:
  Avoid possible conditional jump depended on uninitialised value
2013-04-29 10:46:54 +04:00
Dmitry Stogov 3f48e8765d Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed compilation warnings (issue #92)
2013-04-29 10:32:50 +04:00
Stanislav Malyshev 4aecf0eb66 Merge branch 'PHP-5.5'
* PHP-5.5:
  Revert "Add CURL_WRAPPERS_ENABLE constant"
2013-04-28 22:28:53 -07:00
David Soria Parra 6bac9bb1e8 Merge branch 'PHP-5.5'
* PHP-5.5:
  Revert "Fix conversion from unsigned char to char"
2013-04-29 02:28:46 +02:00
Pierre Joye 03ab53b213 Merge branch 'master' of git.php.net:php-src 2013-04-27 17:59:40 +02:00
Pierre Joye eaec5522ff Merge branch 'PHP-5.5'
* PHP-5.5:
  fix #64725, wrong res check
2013-04-27 17:52:38 +02:00
Xinchen Hui 24a26df1f8 Merge branch 'PHP-5.5' 2013-04-27 23:50:29 +08:00
Xinchen Hui 9555531eea Merge branch 'PHP-5.5' 2013-04-27 23:42:34 +08:00
Anatol Belski 35364cd71d Merge branch 'PHP-5.5'
* PHP-5.5:
  updated libmagic.patch
2013-04-27 14:10:09 +02:00
Anatol Belski 232f5d0306 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug bug #64713 Compilation warnings in finfo
2013-04-27 13:51:31 +02:00
David Soria Parra e0e18a2b1d Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix implicit declaration warning for cdf_timestamp_to_timespec
  Fix #64711 ("value computed but not used" in parse_date.c)
  Fix implicit uint* to int* conversion warning
  Fix conversion from unsigned char to char
  Fix #64712 (Obsolete declarations in php_date.c)
2013-04-26 12:41:08 +02:00
Pierre Joye bba7f8aa31 Merge branch 'PHP-5.5'
* PHP-5.5:
  - #64710, check return val
  - #64710, kill unused var
  #64710, kill unused vars
  #64710, kill unused vars
  #64710, kill unused vars
  #64710, kill unused vars
  #64710, kill unused vars
  #64710, Implicit declaration
2013-04-26 08:16:02 +02:00
Pierre Joye fde3198daa Merge branch 'master' of git.php.net:php-src 2013-04-26 06:40:42 +02:00
Matt Ficken d35822b4fa Merge branch 'PHP-5.5'
* PHP-5.5:
  Adding sys_get_temp_dir() test specific for Windows.
2013-04-25 14:55:50 -07:00
Anatol Belski df236828b5 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed float precision change under Windows x64
2013-04-25 23:01:13 +02:00
Matt Ficken 67a72ceb93 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix Test Bug #64714
2013-04-25 11:37:36 -07:00
Johannes Schlüter 488933792a Merge branch 'PHP-5.5' 2013-04-25 18:05:56 +02:00
ptarjan 22f6b6dbec Fix zlib/tests/gzseek to create unique temporary files
When running tests in parallel these create a race condition.
Race conditions are bad.
2013-04-24 01:06:55 -07:00
David Soria Parra 4c0746228d Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS for RC1
  NEWS for PHP 5.5.0 Beta 4 again
  Fix curl build on windows
2013-04-25 08:25:10 +02:00
Remi Collet b0cf340eef Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #64707 missing declaration after dd0399f
2013-04-25 06:41:01 +02:00
Pierrick Charron dec5324d5e Merge branch 'PHP-5.5'
* PHP-5.5:
  Update NEWS file
2013-04-24 13:27:06 -04:00
Stanislav Malyshev aa2b3a4b31 Merge branch 'PHP-5.5'
* PHP-5.5:
  5.4.16-dev
2013-04-24 10:17:11 -07:00
Remi Collet e12abebf50 Merge branch 'PHP-5.5'
* PHP-5.5:
  gd: missing headers in previous
  allow use of gdImageCreateFromJpegEx with system libgd
2013-04-24 16:16:25 +02:00
Remi Collet 5897696a02 Merge branch 'PHP-5.5'
* PHP-5.5:
  We need both gdImageCreateFromJpeg* and gdImageCreateFromJpeg*Ex
  gd: fix proto comment
2013-04-24 16:11:34 +02:00
Remi Collet 7264179eef gd: fix proto comment 2013-04-24 14:43:59 +02:00
Anatol Belski d07b7c2fc0 Merge branch 'master' of git.php.net:php-src 2013-04-24 14:36:41 +02:00
Anatol Belski fba7c8491b Merge branch 'PHP-5.5'
* PHP-5.5:
  Removed fork of ext/zlib/tests/bug_52944.phpt
2013-04-24 14:35:34 +02:00
Remi Collet 1d72ea493d Merge branch 'PHP-5.5'
* PHP-5.5:
  gd: provide imageflip with system libgd when available
2013-04-24 14:32:09 +02:00
David Soria Parra 0f0cfaebd0 Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS for RC 1
  NEWS for beta 4
2013-04-24 12:57:24 +02:00
Stanislav Malyshev ef0d71092b Merge branch 'PHP-5.5'
* PHP-5.5:
  update credits
2013-04-23 22:03:55 -07:00
Stanislav Malyshev 50800356af Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix bug #64458 (dns_get_record result with string of length -1)
2013-04-23 21:46:27 -07:00
Pierrick Charron 74394733ed Merge branch 'PHP-5.5'
* PHP-5.5:
  Remove curl wrappers
2013-04-23 17:01:50 -04:00
Dmitry Stogov 302de03a5a Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed incorrect check. SEND_REF may be executed before DO_FCALL when EX(function_state).function is not yet set to the calling function.
2013-04-24 00:04:00 +04:00
Remi Collet 92a1640694 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix copy/paste in error message
2013-04-23 13:53:07 +02:00
Remi Collet 2fa178fa41 Merge branch 'PHP-5.5'
* PHP-5.5:
  enable WebP with system libgd when available
  (re)allow WBMP detection with system libgd provide getbmi and skipheader not exported functions in gd_compat.
2013-04-23 13:46:24 +02:00
Jefersson Nathan 89a657f80a Fixed identation on file 2013-04-23 08:24:15 -03:00
Sara Golemon 231e2d762a Merge branch 'PHP-5.5'
* PHP-5.5:
  array_column() - Use entire subject array when NULL passed for second param.
2013-04-22 16:20:41 -07:00
Sara Golemon 35df484b5b Merge branch 'PHP-5.5'
* PHP-5.5:
  Allow array_column() to take -1 as a valid value in third param
2013-04-22 15:55:38 -07:00
Sara Golemon caff01e751 Merge branch 'PHP-5.5'
* PHP-5.5:
  Harden array_column_basic.phpt against resource renumbering.
2013-04-22 13:37:36 -07:00
Sara Golemon 70c700cf8c Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix handling of double keys in array_column
2013-04-21 23:33:20 -07:00
Anatol Belski 8645309c4e Merge branch 'PHP-5.5'
* PHP-5.5:
  updated NEWS
  updated NEWS
  Fixed stream_socket_pair() on Windows x64 and
2013-04-22 19:01:07 +02:00
Derick Rethans cf0d902a84 Merge branch 'PHP-5.5' 2013-04-22 17:51:50 +01:00
Remi Collet 41ef288ced Merge branch 'PHP-5.5'
* PHP-5.5:
  temporary disable WBM detection with system libgd, as gdGetC, getmbi and skipheader not exported
2013-04-22 17:48:43 +02:00
Remi Collet 149cf2650a Merge branch 'PHP-5.5'
* PHP-5.5:
  overflow2 is not exported by system libgd
2013-04-22 17:39:54 +02:00
Dmitry Stogov 9ca60e2444 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed linkage with C++
  Includes 5 new phpTests to check that the error message DOM_NOT_FOUND is properly raised by the method DOMNode::insertBefore(newNode, [refNode]).
2013-04-22 15:40:46 +04:00
Xinchen Hui 0c1ef6898d Merge branch 'master' of https://github.com/dejalatele/php-src 2013-04-21 11:04:27 +08:00
Pierre Joye 39d203afb0 Merge branch 'PHP-5.5'
* PHP-5.5:
2013-04-20 18:25:27 +02:00
Pierre Joye d818fdcc47 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix x64 opcache, still uses fugly fixed addresses, see TODO entry for explanaton
2013-04-20 18:23:21 +02:00
Antonio Diaz Ruiz eebe602c58 Merge branch 'master' of https://github.com/dejalatele/php-src 2013-04-20 16:37:45 +02:00
Antonio Diaz Ruiz 9bf80bc294 Includes 5 new phpTests to check that the error message DOM_NOT_FOUND is properly raised by the method DOMNode::insertBefore(newNode, [refNode]).
Each file covers a different test case

    DOMNode_insertBefore_error2.phpt: refNode is a sibling of the node where newNode wanted to be inserted.
    DOMNode_insertBefore_error3.phpt: refNode is the parent of the node where newNode wanted to be inserted.
    DOMNode_insertBefore_error4.phpt: refNode is a brand new node.
    DOMNode_insertBefore_error5.phpt: refNode is a descendant (not child) of the node where newNode wanted to be inserted.
    DOMNode_insertBefore_error6.phpt: refNode is the node where newNode wanted to be inserted.
2013-04-20 16:28:46 +02:00
Xinchen Hui 2bcbe8fab9 Merge branch 'PHP-5.5' 2013-04-20 15:24:48 +08:00
Dmitry Stogov 1fe5ee4d6a Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed 5.2 ZTS build
2013-04-19 21:44:00 +04:00
Andrey Hristov 6ce68583be Merge branch 'PHP-5.5' 2013-04-19 16:47:47 +02:00
Dmitry Stogov fc2f2f7813 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Fix other typos & add test script
  Fix typo
  - Fixed ZTS build
2013-04-19 10:48:46 +04:00
Dmitry Stogov 1074bbd5a3 Fixed ZTS build 2013-04-19 10:48:21 +04:00
Dmitry Stogov 0040aa29b9 Fixed ZTS build 2013-04-19 10:43:00 +04:00
Xinchen Hui 676e737f5b Fix other typos & add test script 2013-04-19 11:21:44 +08:00
Xinchen Hui 580d6fe94d Fix typo 2013-04-19 10:55:11 +08:00
Felipe Pena 1192cfa58c - Fixed ZTS build 2013-04-18 19:27:02 -03:00
Dmitry Stogov 3735d96ce0 Disable FCALL optimization pass for PHP older than 5.4
Added an optimization pass to convert FCALL_BY_NAME into DO_FCALL.
2013-04-18 22:26:37 +04:00
Dmitry Stogov 60a59d27b4 Disable FCALL optimization pass for PHP older than 5.4 2013-04-18 22:22:48 +04:00
Dmitry Stogov edfeab8bf2 Added an optimization pass to convert FCALL_BY_NAME into DO_FCALL. 2013-04-18 22:12:31 +04:00
Dmitry Stogov 7deb3d41eb Merge branch 'PHP-5.5' into PHP-5.5-opcache
* PHP-5.5:
  Fixed compiler warning "cast from pointer to integer of different size"
2013-04-18 14:19:17 +04:00
Xinchen Hui 0acdeec743 Merge branch 'PHP-5.5' 2013-04-18 17:33:21 +08:00
Dmitry Stogov 5cdc71ae07 Optimizer may hide some repeating error messages 2013-04-18 11:54:27 +04:00
Dmitry Stogov 26c761915b Optimizer may hide some repeating error messages 2013-04-18 11:53:44 +04:00
Dmitry Stogov 745531b120 Merge identical constants (and related cache_slots) in op_array->literals table. 2013-04-18 10:50:40 +04:00
Dmitry Stogov 2bfb523f45 Merge identical constants (and related cache_slots) in op_array->literals table. 2013-04-18 10:48:16 +04:00
Antonio Diaz Ruiz 4ee47678a0 Fixs the name of the variable in the assertion 2013-04-17 23:06:36 +02:00
Antonio Diaz Ruiz 8a019f3882 Using absolute path to get the file note.xml 2013-04-17 22:30:04 +02:00
Antonio Diaz Ruiz b41145bc5c Fix the path of the book.xml file 2013-04-17 22:09:05 +02:00
Dmitry Stogov 36d343c0c4 Merge branch 'PHP-5.5' into PHP-5.5-opcache
* PHP-5.5:
  Initialize literals hash_value and cache_slot
  Added curl config test for windows
  updated lib versions
  updated lib versions
  fixed EOL
  updated lib versions
  allow lcov 1.10
  allow lcov 1.10

Conflicts:
	ext/opcache/Optimizer/zend_optimizer.c
2013-04-17 21:32:08 +04:00
Dmitry Stogov bc959fbaff Merge branch 'PHP-5.5'
* PHP-5.5:
  Initialize literals hash_value and cache_slot

Conflicts:
	ext/opcache/Optimizer/zend_optimizer.c
2013-04-17 21:27:19 +04:00
Anatol Belski cd3dc3308b Merge branch 'PHP-5.5'
* PHP-5.5:
  Added curl config test for windows
2013-04-17 14:26:26 +02:00
Anatol Belski 08fa45a372 Merge branch 'PHP-5.5'
* PHP-5.5:
  updated lib versions
  updated lib versions
  fixed EOL
  updated lib versions
  allow lcov 1.10
  allow lcov 1.10
  allow lcov 1.10
2013-04-17 13:21:20 +02:00
Antonio Diaz Ruiz a67ce30262 PHP tests to check the DOM_NOT_FOUND error message is properly raised by the DOMNode::insertBefore method 2013-04-15 23:30:58 +02:00
krakjoe 2c0d93bcbf zend_register_null_constant
fixed zend_register_bool_constant usage in macros
use REGISTER_MAIN_* in zend_register_standard_constants
2013-04-15 20:47:13 +01:00
krakjoe a49bb472a3 zend_API.h included
ZVAL_* family in use
2013-04-15 18:40:09 +01:00
krakjoe 2966e63faf use Z_* family macros 2013-04-15 18:27:45 +01:00
krakjoe f11d620cb6 zend_register_bool_constant patch 2013-04-15 18:13:09 +01:00
Dmitry Stogov e16f24327d Merge branch 'PHP-5.5' into PHP-5.5-opcache
* PHP-5.5:
  allow lcov 1.10
  Fixed bug (Wrong ce cached)
  apply change from opcache readme to php.ini
  lucky that the name is not used, fix name of encoder
2013-04-15 12:09:02 +04:00
Nuno Lopes dacbf70f92 allow lcov 1.10 2013-04-13 16:51:58 -04:00
Dmitry Stogov a0e3ca1c98 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Fixed bug (Wrong ce cached)
  apply change from opcache readme to php.ini
  lucky that the name is not used, fix name of encoder
2013-04-11 15:32:54 +04:00
Dmitry Stogov a78c7a4206 Added script level constant replacement 2013-04-11 15:31:35 +04:00
Dmitry Stogov 276847caba Added script level constant replacement 2013-04-11 15:18:35 +04:00
Xinchen Hui bcb223a626 Merge branch 'PHP-5.5' 2013-04-11 14:29:51 +08:00
Pierre Joye e2f3c7f2bc Merge branch 'PHP-5.5'
* PHP-5.5:
  lucky that the name is not used, fix name of encoder
2013-04-11 07:08:58 +02:00
Remi Collet ab165d3465 Merge branch 'PHP-5.5'
* PHP-5.5:
  apply change from opcache readme to php.ini
2013-04-11 07:06:36 +02:00
Dmitry Stogov 6893a19dbf Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  update NEWS
  updated NEWS
  Fixed bug #64342 ZipArchive::addFile() has to check for file existence
2013-04-10 23:12:25 +04:00
Dmitry Stogov b8867354c4 Merge branch 'PHP-5.5'
* PHP-5.5:
  Added opcache related entries
2013-04-10 23:11:35 +04:00
Anatol Belski 622af62502 Merge branch 'master' of git.php.net:php-src 2013-04-10 20:52:29 +02:00
Anatol Belski 9386ba9e97 Merge branch 'PHP-5.5'
* PHP-5.5:
  update NEWS
  updated NEWS
  Fixed bug #64342 ZipArchive::addFile() has to check for file existence
2013-04-10 20:47:55 +02:00
Pierre Joye ea14901ca4 Merge branch 'master' of git.php.net:php-src 2013-04-10 20:14:46 +02:00
Pierre Joye ca1962949e Merge branch 'PHP-5.5'
* PHP-5.5:
  add external 2.1 detection and fix gd_compat for 2.1+
2013-04-10 20:14:00 +02:00
Dmitry Stogov fd15a71184 Merge branch 'PHP-5.5'
* PHP-5.5:
  Allow wilcards in opcache.blacklist_filename
2013-04-10 21:42:50 +04:00
Dmitry Stogov 28a0c38ee4 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed support for PHP-5.3
2013-04-10 21:27:54 +04:00
Dmitry Stogov 5868b93c49 Merge branch 'PHP-5.5'
* PHP-5.5:
  Added missing ARG_INFO
2013-04-10 16:47:13 +04:00
Dmitry Stogov 3353ba1105 Merge branch 'PHP-5.5'
* PHP-5.5:
  Numeric string constants used as array indeces have to be converted to long at compile time
2013-04-10 15:34:36 +04:00
Johannes Schlüter c454c85511 Merge branch 'PHP-5.5' 2013-04-10 09:48:37 +02:00
Alexander Moskaliov 4883185917 Remove semicolon 2013-04-10 11:06:05 +04:00
Xinchen Hui d1643bd582 Merge branch 'PHP-5.5' 2013-04-10 13:48:38 +08:00
Alexander Moskalev a8dc4f0b18 Fix DateInterval->days value
when object was created not from DateTime::diff()
2013-04-10 00:12:39 +04:00
David Soria Parra 1a8575ab05 Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS section for next beta
  NEWS for PHP 5.5.0 Beta 3
2013-04-09 20:34:50 +02:00
Dmitry Stogov caa2bccb8f Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed CFG construction bugs
2013-04-09 17:49:45 +04:00
Dmitry Stogov 619fb50096 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  fix possible NULL deref
2013-04-09 12:11:26 +04:00
Dmitry Stogov c8758c91a7 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  fix null deref
  Fixed bugs #47675 and #64577 (fd leak on Solaris)
2013-04-09 12:10:06 +04:00
Pierre Joye d0cd049312 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix possible NULL deref
2013-04-09 10:09:54 +02:00
Dmitry Stogov 255ed92b34 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed ZTS build
2013-04-09 12:09:33 +04:00
Pierre Joye eb7d0ce3b0 Merge branch 'master' of git.php.net:php-src 2013-04-09 10:06:00 +02:00
Pierre Joye f4308084d8 Merge branch 'PHP-5.5'
# By Pierre Joye (1) and Rasmus Lerdorf (1)
* PHP-5.5:
  fix null deref
  Fixed bugs #47675 and #64577 (fd leak on Solaris)
2013-04-09 10:04:41 +02:00
Dmitry Stogov 1d8b6de2a4 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed issue #26 (added opcache_invalidate(string $filename [, bool $force = false]) function)
2013-04-09 11:59:30 +04:00
Dmitry Stogov 68d567d56c Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed issue #82 (allow comments in blacklist file, lines started with ";")
2013-04-09 10:53:12 +04:00
Pierre Joye 396b1109cf Merge branch 'PHP-5.5'
* PHP-5.5:
  ws and comment for recommended aa method
2013-04-09 07:05:03 +02:00
Pierre Joye 28a9181ceb Merge branch 'master' of git.php.net:php-src 2013-04-09 06:46:58 +02:00
Pierre Joye 21cfbdf42c Merge branch 'PHP-5.5'
* PHP-5.5:
  fix some unitialized values and typo
2013-04-09 06:45:24 +02:00
Anatol Belski 5027736ce7 Merge branch 'PHP-5.5'
* PHP-5.5:
  updated libmagic.patch
2013-04-08 16:24:32 +02:00
Anatol Belski a1c96ebbd9 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix ident
2013-04-08 15:52:07 +02:00
Anatol Belski 6b56ec449b Merge branch 'PHP-5.5'
* PHP-5.5:
  Refactored the previous memleak fix
2013-04-08 14:34:21 +02:00
Anatol Belski 8b12bcaae8 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix memory leak at apprentice.c:1095
2013-04-08 12:50:47 +02:00
Anatol Belski 631ab1f373 Merge branch 'PHP-5.5'
* PHP-5.5:
  fixed EOL
2013-04-08 09:21:20 +02:00
Anatol Belski c71d4b1ca7 Merge branch 'PHP-5.5'
* PHP-5.5:
  updated NEWS
  upgraded libmagic to 5.14
  leave a sane environment behind (even if empty) when exiting some OS atexit() handlers call getenv()
2013-04-07 22:20:57 +02:00
Nuno Lopes 1a71bf646e leave a sane environment behind (even if empty) when exiting
some OS atexit() handlers call getenv()
2013-04-07 02:32:20 -04:00
Xinchen Hui bd96813042 Merge branch 'PHP-5.5' 2013-04-05 23:28:23 +08:00
Xinchen Hui d28b5e8ff2 Merge branch 'PHP-5.5' 2013-04-05 21:35:41 +08:00
Xinchen Hui 1471ec7dcf Merge branch 'PHP-5.5' 2013-04-05 14:28:27 +08:00
Rasmus Lerdorf cb54fada51 Fixed bugs #47675 and #64577 (fd leak on Solaris) 2013-04-04 19:24:12 -07:00
Johannes Schlüter e9cc55a803 Merge branch 'PHP-5.5' 2013-04-04 15:38:35 +02:00
Xinchen Hui 2794d455ea Merge branch 'PHP-5.5' 2013-04-04 19:31:21 +08:00
Xinchen Hui 4788a961f1 Merge branch 'PHP-5.5' 2013-04-04 14:56:10 +08:00
Xinchen Hui cf0ee2d332 Merge branch 'PHP-5.5' 2013-04-04 14:49:58 +08:00
Nikita Popov d1ee0349d6 Merge branch 'PHP-5.5' 2013-04-03 20:30:31 +02:00
Xinchen Hui 8333dcce68 Merge branch 'PHP-5.5' 2013-04-03 19:52:56 +08:00
Xinchen Hui e15a97f924 Merge branch 'PHP-5.5' 2013-04-03 18:51:44 +08:00
Xinchen Hui 4799c8370b Merge branch 'PHP-5.5' 2013-04-03 10:21:24 +08:00
Xinchen Hui bd6a90dac7 Merge branch 'PHP-5.5' 2013-04-03 10:17:49 +08:00
Remi Collet db037caf18 Merge branch 'PHP-5.5'
* PHP-5.5:
  keep previous test to avoid any behavior change
2013-04-02 16:31:54 +02:00
Remi Collet 6cad4398a8 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix comment
  Fixed Bug #64565 copy doesn't report failure on partial copy
2013-04-02 16:24:33 +02:00
Rasmus Lerdorf 91c514c49a Merge branch 'PHP-5.5' 2013-04-01 16:30:34 -07:00
Rasmus Lerdorf 608b195c59 Merge branch 'PHP-5.4' into PHP-5.5 2013-04-01 16:30:10 -07:00
Rasmus Lerdorf 527ac404a1 The printf modifier for a double is just %f 2013-04-01 16:27:09 -07:00
Dmitry Stogov 11262fba8e Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed ZTS build
2013-04-01 21:17:26 +04:00
Xinchen Hui aa1c764e3e Merge branch 'PHP-5.5' 2013-04-01 19:16:44 +08:00
Xinchen Hui 79f68e285d Merge branch 'PHP-5.5' 2013-04-01 18:17:53 +08:00
Dmitry Stogov 71a45bec35 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed issue #79 (Optimization Problem/Bug)
  fix coverage data for the opcache optimizer
2013-04-01 11:34:37 +04:00
Nuno Lopes ed54776960 fix coverage data for the opcache optimizer 2013-03-31 15:43:08 -04:00
Xinchen Hui 971676e859 Merge branch 'PHP-5.5' 2013-03-31 21:27:22 +08:00
Xinchen Hui f4e16fe7ef Merge branch 'PHP-5.5' 2013-03-31 20:08:40 +08:00
Derick Rethans 6cdf379185 Merge branch 'PHP-5.5' 2013-03-31 11:07:49 +01:00
Derick Rethans 13004550a7 Merge branch 'PHP-5.5' 2013-03-31 10:56:23 +01:00
Derick Rethans bc6e26cdee Merge branch 'PHP-5.5' 2013-03-31 10:39:11 +01:00
Stanislav Malyshev da43e7e0cd Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix bug #64433: does not follow redirects for non-3xx response codes
2013-03-30 21:24:54 -07:00
Xinchen Hui ac9f53dd9c Merge branch 'PHP-5.5' 2013-03-29 23:49:35 +08:00
Xinchen Hui 3ea4210f8d Merge branch 'PHP-5.5' 2013-03-29 23:46:24 +08:00
Keyur Govande 1185d10a40 Merge branch 'master' of https://git.php.net/push/php-src
* 'master' of https://git.php.net/push/php-src:
  fix BELL constant declaration
  merging conflict left over
  fix typo
  add definition for 5.5
  fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs
  - fix x64 issues on windows with the various time types (overflow, signed and unsigned bits ops, etc.) causing crashes on start, error or log, must be done in win32/time.c for some of these functions too
  - fix regression (imagerotate_overflow.phpt), fix for all cases
  - fix regression bug24155.phpt and bug39366.phpt
  - fix regression (imagerotate_overflow.phpt)
  fix memory leak
  - ws
  - add gd changes
  - update the comment to match the code/features
  setting plausible default value for struct members
  Fixed test after nick previous fix
2013-03-29 14:47:11 +00:00
Keyur Govande 415d077e08 Merge branch 'PHP-5.5'
* PHP-5.5: (276 commits)
  Patch for Bug #64544. The process title change module keeps track of the locally allocated environ, so it doesn't need to worry about when environ changes underneath it, for example by putenv()/setenv()
  Fix "passing NULL to non-pointer argument" warnings in intl
  Remove support for cloning generators
  Removed deprecated check
  Fix whitespace issue in the SOAP test
  Fix SOAP test
  Forgot to fix the test on 5.4
  Exclude Travis build for 5.3 and 5.4
  Fix tests after addition of ^ (xor) operator to ini
  Fix Bug #64545:	PHP Error in ef93a93ee2
  Attempt to fix SKIP
  This will PHP 5.3.25
  Typo fix (greater then => greater than)
  don't optimize script if it's not going to be cached
  Reimplemented OPcache restart trigger. Now, if memory or hash are full the restart is scheduled only in case the amount of wasted memory is above opcache.max_wasted_percentage. Otherwise OPcahce continue serving the following requests using already cached files, but doesn't try to add new files (the cache is full anyway).
  With pkgconfig < 0.28 output is a single space With pkgconfig = 0.28 output is an empty string, This breaks the test on the 2 vars
  Fixed issue #78 (incorrect file path validation)
  Fix test on Mac (\D shows up)
  Add test for #64529
  will be 5.4.15
  ...
2013-03-29 14:44:35 +00:00
Nikita Popov c3c4ff98ac Merge branch 'PHP-5.5' 2013-03-29 13:01:08 +01:00
Nikita Popov 2f4c3ff330 Merge branch 'PHP-5.5' 2013-03-29 11:43:19 +01:00
Dmitry Stogov 606c9bb658 Merge branch 'PHP-5.5'
* PHP-5.5:
  Removed deprecated check
2013-03-29 03:18:51 +04:00
Pierre Joye 95f830bc81 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix BELL constant declaration
2013-03-28 22:14:50 +01:00
Nikita Popov f2a2b418ec Merge branch 'PHP-5.5' 2013-03-28 19:11:21 +01:00
Nikita Popov 7f40866248 Merge branch 'PHP-5.5' 2013-03-28 19:06:13 +01:00
Nikita Popov 19f93e9c6d Merge branch 'PHP-5.5' 2013-03-28 18:43:20 +01:00
Nikita Popov b472d0733a Merge branch 'PHP-5.5' 2013-03-28 18:36:06 +01:00
Nikita Popov f5e5878701 Merge branch 'PHP-5.5' 2013-03-28 18:24:27 +01:00
Xinchen Hui 5678ada68e Merge branch 'PHP-5.5' 2013-03-28 23:24:17 +08:00
Johannes Schlüter c5b8004973 Merge branch 'PHP-5.5' 2013-03-28 15:09:28 +01:00
Xinchen Hui c7f1279903 Merge branch 'PHP-5.5' 2013-03-28 19:14:25 +08:00
Dmitry Stogov 0b817624a7 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  With pkgconfig < 0.28 output is a single space With pkgconfig = 0.28 output is an empty string, This breaks the test on the 2 vars
2013-03-28 13:48:00 +04:00
Dmitry Stogov 07a6f3c677 Merge branch 'PHP-5.5'
* PHP-5.5:
  don't optimize script if it's not going to be cached
  Reimplemented OPcache restart trigger. Now, if memory or hash are full the restart is scheduled only in case the amount of wasted memory is above opcache.max_wasted_percentage. Otherwise OPcahce continue serving the following requests using already cached files, but doesn't try to add new files (the cache is full anyway).
2013-03-28 13:47:38 +04:00
Remi Collet 18063dc2ac Merge branch 'PHP-5.5'
* PHP-5.5:
  With pkgconfig < 0.28 output is a single space With pkgconfig = 0.28 output is an empty string, This breaks the test on the 2 vars
2013-03-28 10:25:53 +01:00
Dmitry Stogov c4657614be Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed issue #78 (incorrect file path validation)
2013-03-28 12:31:33 +04:00
Xinchen Hui feefd2a8fd Merge branch 'PHP-5.5' 2013-03-28 14:35:57 +08:00
Xinchen Hui d133cffa00 Merge branch 'PHP-5.5' 2013-03-28 13:55:06 +08:00
Stanislav Malyshev 07a8ca5707 Merge branch 'PHP-5.5'
* PHP-5.5:
  will be 5.4.15
  fix NEWS
2013-03-27 14:02:45 -07:00
Lars Strojny 218bcee202 Merge branch 'PHP-5.5'
Conflicts:
	Zend/zend_ini_scanner.c
2013-03-27 21:37:42 +01:00
Dmitry Stogov 9a80cec0ce Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #64529 (Ran out of opcode space)

Conflicts:
	Zend/zend_language_scanner.c
2013-03-28 00:10:13 +04:00
Dmitry Stogov f55ff56f24 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Remove unused variable
  NEWS Section for beta 3
  News for beta 2
2013-03-27 23:15:21 +04:00
Dmitry Stogov 4ee7bbdd08 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed issue #74 (Allowed per request OPcache disabling)
2013-03-27 23:14:59 +04:00
David Soria Parra 4263a23a79 Merge branch 'PHP-5.5'
* PHP-5.5:
  Remove unused variable
2013-03-27 20:01:05 +01:00
David Soria Parra dca8002519 Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS Section for beta 3
  News for beta 2
2013-03-27 19:58:10 +01:00
Dmitry Stogov 36861bf91d Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed issue #76 (actually we don't need zend_shared_memory_block_header at all)
2013-03-27 22:17:50 +04:00
Dmitry Stogov 34ac5c9d0d Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  add WebP support in phpinfo
2013-03-27 21:09:31 +04:00
Dmitry Stogov e67e6a1f36 Merge branch 'PHP-5.5'
* PHP-5.5:
  Added opcache.enable_cli=0
2013-03-27 21:08:58 +04:00
Dmitry Stogov d40174c6bb Merge branch 'PHP-5.5'
* PHP-5.5:
  Added description for opcache.enable_cli
2013-03-27 21:04:04 +04:00
Pierre Joye 33e834aab8 Merge branch 'PHP-5.5'
* PHP-5.5:
  add WebP support in phpinfo
2013-03-27 17:39:05 +01:00
Pierre Joye b03810761e Merge branch 'PHP-5.5'
* PHP-5.5:
  add windows 8 and windows server 2012
2013-03-27 07:29:56 +01:00
Pierre Joye 5466035621 Merge branch 'PHP-5.5'
* PHP-5.5:
  versions no longer supported, no need to check
2013-03-27 07:15:30 +01:00
Pierre Joye 705ab20252 Merge branch 'PHP-5.5'
* PHP-5.5:
  FALSE on error
2013-03-27 05:13:42 +01:00
Pierre Joye 8a85da4a61 merging conflict left over 2013-03-26 17:46:29 +01:00
Pierre Joye 3b48dc0848 Merge branch 'master' of git.php.net:php-src 2013-03-26 11:24:30 +01:00
Pierre Joye 111123af4f conflict 2013-03-26 11:24:00 +01:00
Xinchen Hui c2afd2765b Merge branch 'PHP-5.5' 2013-03-26 12:03:37 +08:00
Xinchen Hui c356038c6e Merge branch 'PHP-5.5' 2013-03-25 23:49:23 +08:00
Pierre Joye b6fa581d2d Merge branch 'master' of git.php.net:php-src 2013-03-25 13:43:08 +01:00
Pierre Joye 317168bb1e Merge branch 'PHP-5.5'
* PHP-5.5:
  typo and WS
2013-03-25 13:42:42 +01:00
Dmitry Stogov 0ff3065474 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  add new functions and constants for GD
2013-03-25 15:49:18 +04:00
Dmitry Stogov a4c386f32c Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properly). (Jeff Welch)
2013-03-25 15:48:13 +04:00
Pierre Joye d836e654bb Merge branch 'master' of git.php.net:php-src 2013-03-25 12:20:21 +01:00
Pierre Joye 7da6272fe7 conflict 2013-03-25 12:20:01 +01:00
Dmitry Stogov d74a192bd4 Merge branch 'PHP-5.5'
* PHP-5.5:
  back to dev (7.0.2-dev)
2013-03-25 13:58:12 +04:00
Dmitry Stogov 57a0c655aa Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed copy/paste mistake
2013-03-25 13:31:19 +04:00
Dmitry Stogov dedd0f56b6 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #64482 (Opcodes for dynamic includes should not be cached)
  Separate "start_time" from "last_restart_time"
  Fixed PHP-5.2 ZTS compatibility
2013-03-25 13:06:10 +04:00
Dmitry Stogov 2c22ffc909 Merge branch 'PHP-5.5'
* PHP-5.5:
  7.0.1 release
2013-03-25 11:45:12 +04:00
Stanislav Malyshev 4003cc23b1 Merge branch 'PHP-5.5'
* PHP-5.5:
  make it int main
2013-03-24 23:58:50 -07:00
Stanislav Malyshev 981cd9c500 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix return value
2013-03-24 23:43:45 -07:00
Stanislav Malyshev 9e86fa301f Merge branch 'PHP-5.5'
* PHP-5.5:
  add code to check if we know flock definition on this system
2013-03-24 20:12:33 -07:00
Stanislav Malyshev f25c3283ae Merge branch 'PHP-5.5'
* PHP-5.5:
  fix typo
  add definition for 5.5
2013-03-24 20:04:28 -07:00
Stanislav Malyshev c1ac5a20a5 fix typo 2013-03-24 20:04:24 -07:00
Stanislav Malyshev bf457a0387 add definition for 5.5 2013-03-24 20:04:24 -07:00
Pierre Joye 52b4a251b7 Merge branch 'master' of git.php.net:php-src 2013-03-25 03:17:59 +01:00
Pierre Joye f21f37bb4c Merge branch 'PHP-5.5'
* PHP-5.5:
  remove comments
2013-03-25 03:14:40 +01:00
Stanislav Malyshev 1d59775c00 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs
2013-03-24 19:07:43 -07:00
Stanislav Malyshev be278293e4 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs
2013-03-24 19:04:43 -07:00
Stanislav Malyshev bd0b09c610 fix bug #64490 - add __FreeBSD_kernel__ to allowed FreeBSD defs 2013-03-24 19:03:04 -07:00
Nikita Popov 1e8423b041 Merge branch 'PHP-5.5' 2013-03-24 17:55:01 +01:00
Johannes Schlüter 32e0c24e7f Merge branch 'PHP-5.5' 2013-03-24 17:33:41 +01:00
Nikita Popov 095d552589 Merge branch 'PHP-5.5' 2013-03-24 17:07:36 +01:00
Pierre Joye 94c083ba64 fix conflict 2013-03-24 16:54:55 +01:00
Nikita Popov 453bcfecbf Merge branch 'PHP-5.5' 2013-03-24 16:09:59 +01:00
David Soria Parra 04c659a042 Merge branch 'PHP-5.5'
* PHP-5.5:
2013-03-24 14:06:25 +01:00
Nikita Popov fce19c5f57 Merge branch 'PHP-5.5' 2013-03-24 13:58:44 +01:00
Pierre Joye b3b42ccbf2 Merge branch 'PHP-5.5'
* PHP-5.5:
  - add reminder for checking return values
2013-03-24 13:29:30 +01:00
Anatol Belski 75ada593ca Merge branch 'PHP-5.5'
* PHP-5.5:
  - fix x64 issues on windows with the various time types (overflow, signed and unsigned bits ops, etc.) causing crashes on start, error or log, must be done in win32/time.c for some of these functions too
2013-03-23 22:44:10 +01:00
Nikita Popov 5c591acc4f Merge branch 'PHP-5.5' 2013-03-23 21:45:24 +01:00
Nikita Popov 03c55d6971 Merge branch 'PHP-5.5' 2013-03-23 21:09:37 +01:00
Anatol Belski 93c4ce4eed Merge branch 'PHP-5.5'
* PHP-5.5:
  Reworked the changes for bug #64452
2013-03-23 21:01:05 +01:00
Nikita Popov 37c5425543 Merge branch 'PHP-5.5' 2013-03-23 20:14:13 +01:00
Nikita Popov faf256a4e7 Merge branch 'PHP-5.5' 2013-03-23 18:26:45 +01:00
Nikita Popov 1713d9ad30 Merge branch 'PHP-5.5'
Conflicts:
	UPGRADING
	UPGRADING.INTERNALS
2013-03-23 18:09:05 +01:00
Anatol Belski 3e45aa0723 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed possible precision loss in microtime
2013-03-23 17:48:21 +01:00
Pierre Joye 8a256d8ffb Merge branch 'master' of git.php.net:php-src 2013-03-23 10:30:06 +01:00
Pierre Joye 84220f8a60 Merge branch 'PHP-5.5'
* PHP-5.5:
  - fix x64 issues on windows with the various time types (overflow, signed and unsigned bits ops, etc.) causing crashes on start, error or log, must be done in win32/time.c for some of these functions too
2013-03-23 10:26:26 +01:00
Pierre Joye 4a9eb328ee Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - fix x64 issues on windows with the various time types (overflow, signed and unsigned bits ops, etc.) causing crashes on start, error or log, must be done in win32/time.c for some of these functions too
2013-03-23 10:21:22 +01:00
Pierre Joye e6a9d1ca8d - fix x64 issues on windows with the various time types (overflow, signed and unsigned bits ops, etc.) causing crashes on start, error or log, must be done in win32/time.c for some of these functions too 2013-03-23 10:18:31 +01:00
David Soria Parra 6cae773dae Merge branch 'PHP-5.5'
* PHP-5.5:
  Note about bison version
  Add SplDoublyLinkedList::add to UPGRADING
  Tweaks an add OPcache info to UPGRADING

Conflicts:
	UPGRADING
2013-03-22 17:45:07 +01:00
Pierre Joye dd9e4b34d6 Merge branch 'PHP-5.5'
* PHP-5.5:
  - fix regression (imagerotate_overflow.phpt), fix for all cases
2013-03-22 09:30:32 +01:00
Pierre Joye f39a23696b - fix regression (imagerotate_overflow.phpt), fix for all cases 2013-03-22 09:30:23 +01:00
Pierre Joye 672f8525fb Merge branch 'PHP-5.5'
* PHP-5.5:
  - fix regression bug24155.phpt and bug39366.phpt
2013-03-22 09:21:23 +01:00
Pierre Joye f05972ddbf - fix regression bug24155.phpt and bug39366.phpt 2013-03-22 09:21:11 +01:00
Pierre Joye 6512c44d8e Merge branch 'master' of git.php.net:php-src 2013-03-22 08:31:11 +01:00
Pierre Joye 2a8a9c0007 Merge branch 'PHP-5.5'
* PHP-5.5:
  - fix regression (imagerotate_overflow.phpt)
2013-03-22 08:28:25 +01:00
Pierre Joye 4e6d54f5a7 - fix regression (imagerotate_overflow.phpt) 2013-03-22 08:28:11 +01:00
David Soria Parra 95c3b9ab39 Merge branch 'PHP-5.5'
* PHP-5.5:
  Add OPCache ini settings to php.ini
2013-03-21 15:52:12 +01:00
Xinchen Hui 9d2897a9d1 Merge branch 'PHP-5.5' 2013-03-21 21:32:57 +08:00
Xinchen Hui 0bf7549772 Merge branch 'PHP-5.5' 2013-03-21 21:11:42 +08:00
Xinchen Hui bfbf334aff Merge branch 'PHP-5.5' 2013-03-21 15:58:25 +08:00
Xinchen Hui b9185a4544 Merge branch 'PHP-5.5' 2013-03-21 11:15:05 +08:00
Xinchen Hui d99c14b1a6 fix memory leak
the value shouldn't be ref, use z_add_ref is enough
2013-03-21 10:56:30 +08:00
Stanislav Malyshev 45b1d014f2 Merge branch 'PHP-5.5'
* PHP-5.5:
  add array_column()
2013-03-20 14:16:08 -07:00
David Soria Parra 78acb84b6e Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS section for beta 2
  NEWS for beta 1
  Allow local override of PHPROOT in makedist
2013-03-20 15:24:00 +01:00
David Soria Parra ec26c93eff Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS for array_column
  array_column: Fix compile-time warnings
  array_column: Removed array_pluck() alias
  array_column: Set array_pluck as an alias for array_column
  array_column: Implement ability to specify an index column
  Cleaning up a memory leak.
  array_column: Adding test for IS_OBJECT and converting object to string
  array_column: Using add_next_index_zval() at nikic's recommendation.
  array_column: Improved tests
  array_column: Cleaning up, as recommended in pull request #56 comments
  Fixing typo in test for array_column()
  Simplify the code and use zend_hash_next_index_insert()
  Adding test for columns not present in all rows for array_column().
  Adding tests for the negative results of array_column()
  Implement new array function array_column()
2013-03-20 13:14:33 +01:00
Pierre Joye fa161e9a67 Merge branch 'PHP-5.5'
* PHP-5.5:
  - ws

Conflicts:
	UPGRADING
2013-03-20 12:38:22 +01:00
Pierre Joye 15ecea7602 - ws 2013-03-20 12:37:13 +01:00
Pierre Joye 09854f1fb9 Merge branch 'PHP-5.5'
* PHP-5.5:
  - add gd changes

Conflicts:
	UPGRADING
2013-03-20 12:34:51 +01:00
Pierre Joye ff7d7bb290 - add gd changes 2013-03-20 12:34:01 +01:00
Pierre Joye 83e81c40ae Merge branch 'PHP-5.5'
* PHP-5.5:
  - update the comment to match the code/features
2013-03-20 12:29:56 +01:00
Pierre Joye f0078897c7 - update the comment to match the code/features 2013-03-20 12:29:47 +01:00
Pierre Joye 2799534296 Merge branch 'master' of git.php.net:php-src 2013-03-20 12:20:32 +01:00
Pierre Joye bc7b287a61 Merge branch 'PHP-5.5'
* PHP-5.5:
  - add imageaffinematrixget and imagematrixconcat
  - add affine matrix helper for translate, scale, rotate and shear
  - fix unix build
  - add new files for interpolation
  - config.m4 sync with .w32
  - add new interpolation method   . imagescale   . imageaffine   . replace imagerotate with new generic and optimized new implementations   . imagesetinterpolationmethod, to set the default interpolation to be     used with the new functions   . add imagepalettetotruecolor
2013-03-20 12:19:46 +01:00
Anatol Belski 7daabc42a2 Merge branch 'PHP-5.5'
* PHP-5.5:
  updated NEWS
  updated NEWS
  Fixed bug #64452 Zip PHPTs crash intermittently
2013-03-20 09:15:46 +01:00
Stanislav Malyshev b5a7675836 Merge branch 'PHP-5.5'
* PHP-5.5:
  clarify NEWS
2013-03-19 23:26:42 -07:00
Anatol Belski 1cdf2c49ba Merge branch 'PHP-5.5'
* PHP-5.5:
  Backported fix for bug #62852
2013-03-19 21:23:08 +01:00
David Soria Parra d9f5056dba Merge branch 'PHP-5.5'
* PHP-5.5:
  Refer to Zend Optimizer as Zend Opcache from now on
2013-03-19 16:21:14 +01:00
David Soria Parra 12877372ac Merge branch 'PHP-5.5'
* PHP-5.5:
  ZO+ NEWS
2013-03-19 15:55:36 +01:00
Anatol Belski da1aa323fe Merge branch 'master' of git.php.net:php-src 2013-03-19 15:16:16 +01:00
Anatol Belski 5cea998c5d Merge branch 'PHP-5.5'
* PHP-5.5:
  fix C89 compat
2013-03-19 15:14:03 +01:00
David Soria Parra d90a85c3bd Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix typos
2013-03-19 15:11:56 +01:00
Anatol Belski 11567299d5 Merge branch 'master' of git.php.net:php-src 2013-03-19 14:49:41 +01:00
David Soria Parra 7b876167cf Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix #48358 add() method for SplDoublyLinkedLis
2013-03-19 14:48:05 +01:00
Anatol Belski 3b922794ab Merge branch 'PHP-5.5'
* PHP-5.5:
  fix C90 compat
2013-03-19 14:45:57 +01:00
Dmitry Stogov b8ab827e4f Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #63976 (Parent class incorrectly using child constant in class property)
2013-03-19 17:05:36 +04:00
Dmitry Stogov e72d059a0c Merge branch 'PHP-5.5'
* PHP-5.5:
  Partial fix for bug #64239
2013-03-19 15:48:22 +04:00
Dmitry Stogov baa5b3ef74 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #62343 (Show class_alias In get_declared_classes())
2013-03-19 15:01:05 +04:00
Dmitry Stogov b360d26294 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #64417 (ArrayAccess::&offsetGet() in a trait causes fatal error)
2013-03-19 13:08:14 +04:00
Dmitry Stogov 48e82b2988 Merge branch 'PHP-5.5'
* PHP-5.5:
  strlen() returns size_t
2013-03-19 10:45:57 +04:00
Dmitry Stogov 48632d0fc4 Merge branch 'PHP-5.5'
* PHP-5.5:
  Renamed Zend Optimizer+ into Zend OPcache
2013-03-19 10:32:50 +04:00
Dmitry Stogov d5174afb89 Merge branch 'PHP-5.5'
* PHP-5.5:
  Add stats to phpinfo
2013-03-19 10:19:01 +04:00
Dmitry Stogov 33ea10141d Merge branch 'PHP-5.5'
* PHP-5.5:
  Avoid trailing line break
2013-03-18 13:36:52 +04:00
Dmitry Stogov 0522e2cd66 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  fix NEWS
  fix NEWS
2013-03-18 13:17:26 +04:00
Dmitry Stogov 4e4bc3a21b Merge branch 'PHP-5.5'
* PHP-5.5:
  Add oom, wasted, hash and manual restart counters to help identify potential configuration problems
  Add optional flag to opcache_get_status()
2013-03-18 13:16:32 +04:00
Stanislav Malyshev 06a67b3375 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix NEWS
  fix NEWS
2013-03-18 00:52:53 -07:00
Boris Lytochkin 92198fa2a5 Merge branch 'PHP-5.5'
* PHP-5.5:
  merge with 5.4
  more test coverage: missing square bracket error message
  Fixed bug #61981
2013-03-17 20:53:19 +04:00
Boris Lytochkin 719264d1af Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix bug #61981
2013-03-17 20:18:17 +04:00
Dmitry Stogov ada89863c3 Merge branch 'PHP-5.5'
* PHP-5.5:
  Load "black list" only if O+ is enabled
2013-03-17 12:17:39 +04:00
Dmitry Stogov 513c6e7021 Merge branch 'PHP-5.5'
* PHP-5.5:
  Made opcache_get_status() return statistics during O+ restart
2013-03-17 11:57:08 +04:00
Dmitry Stogov 0def1ca59a Merge branch 'PHP-5.5'
* PHP-5.5:
  Added ability to load zend_extensions without absolute path names
2013-03-17 11:43:45 +04:00
Dmitry Stogov 8635900e8e Merge branch 'PHP-5.5'
* PHP-5.5:
  Enabled O+ build by default (it may be disabled before 5.0.0 release)
2013-03-17 10:59:23 +04:00
Dmitry Stogov 2db4e43436 Merge branch 'PHP-5.5'
* PHP-5.5:
  Removed files that are neccessary only for standalone pecl branch
  setting plausible default value for struct members
2013-03-17 10:42:41 +04:00
Anatol Belski 23bf72f7b1 Merge branch 'master' of git.php.net:php-src 2013-03-16 18:27:21 +01:00
Etienne Kneuss 79d2657873 Merge branch 'PHP-5.5'
* PHP-5.5:
  Remove spurious int cast in between two longs
2013-03-16 18:20:24 +01:00
Anatol Belski a8e72b61a6 Merge branch 'PHP-5.5'
* PHP-5.5:
  setting plausible default value for struct members
2013-03-16 18:09:30 +01:00
Anatol Belski add5420d89 setting plausible default value for struct members
especially for unsigned members so they don't casted to max unsigned
2013-03-16 18:07:21 +01:00
Xinchen Hui 1ee20ab72a Merge branch 'PHP-5.5' 2013-03-16 23:16:56 +08:00
Xinchen Hui 67618a8f88 Fixed test after nick previous fix 2013-03-16 22:58:47 +08:00
Dmitry Stogov c4c61e395b Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed memory leaks
2013-03-16 17:25:48 +04:00
Dmitry Stogov 1b72240226 Merge branch 'PHP-5.5'
* PHP-5.5:
  Made test compatible with O+
2013-03-16 16:11:41 +04:00
Dmitry Stogov b7fd7c79e9 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed compatibility with ext/phar
2013-03-16 16:08:51 +04:00
Dmitry Stogov e6fc7c1e76 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed O+ testes
2013-03-16 12:08:25 +04:00
Dmitry Stogov b3ed38c704 Merge branch 'master' of git.php.net:php-src 2013-03-16 00:46:00 +04:00
Dmitry Stogov 29a9e13d60 Merge branch 'PHP-5.5'
* PHP-5.5: (101 commits)
  Renamed ZendOptimizerPlus.so into opcache.so
  "ZendOptimizerPlus" is renamed to "opcache" to de merged into PHP-5.5 under ext/opcache (the product name is still "Zend Optimizer+")
  More accurate restart scheduling
  Autogolobal $GLOBALS has to be pinged even if auto_globals_jit=0
  Allow only shared O+ build
  Fixed typos
  add tests into package
  Add test script for #57 (segfaults in drupal7)
  fixed memory leaks
  Fixed Issue #57 (segfaults in drupal7)
  Fixed issue #58 (PHP-5.2 compatibility)
  Allows exclusion of large files from being cached
  Add maintainers inot package.xml
  fix ANSI C90 compat
  Fixed test
  Fixed uninitialized variable
  Fixed bug #64353 (Built-in classes can be unavailable with dynamic includes and Optimizer+)
  Save a stat() call by calling sapi_module.get_stat()
  Fixed #54 (PECL install adds extension= instead of zend_extension= to php.ini)
  release 7.0.0
  ...
2013-03-16 00:43:40 +04:00
Anatol Belski be8282b927 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #62852 Unserialize Invalid Date crash
2013-03-15 21:30:18 +01:00
Anatol Belski a3bb8ff4e4 Merge branch 'PHP-5.5'
* PHP-5.5:
  updated NEWS
2013-03-15 19:12:51 +01:00
Anatol Belski 7d84cf6a75 Merge branch 'PHP-5.5'
* PHP-5.5:
  Backported patch for #64370
2013-03-15 19:09:36 +01:00
Anatol Belski 65a1c314b3 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #53437 Crash with unserialized DatePeriod instance
2013-03-15 17:01:16 +01:00
Nikita Popov 279285598d Merge branch 'PHP-5.5' 2013-03-15 13:49:14 +01:00
Ferenc Kovacs 2b1c2e3c3f Merge branch 'PHP-5.5'
* PHP-5.5:
  explain the step updating the git submodule reference in web/php.git
2013-03-15 09:42:37 +01:00
Anatol Belski 657135c16a Merge branch 'PHP-5.5'
* PHP-5.5:
  fix zts check
2013-03-14 14:40:03 +01:00
Dmitry Stogov 22b0f5d829 Merge branch 'PHP-5.5'
* PHP-5.5:
  Removed redundand code
2013-03-14 14:22:51 +04:00
Andrey Hristov 37664354e5 Merge branch 'PHP-5.5' 2013-03-13 15:57:08 +01:00
Andrey Hristov f4279f0d5e Merge branch 'PHP-5.5'
Conflicts:
	NEWS
2013-03-13 15:57:04 +01:00
Nikita Popov 5f136b5e04 Merge branch 'PHP-5.5' 2013-03-12 17:39:40 +01:00
Nikita Popov 81623d3a60 Merge branch 'PHP-5.5'
Conflicts:
	UPGRADING
	UPGRADING.INTERNALS
2013-03-12 17:29:54 +01:00
Anatol Belski 8eed855b84 Merge branch 'PHP-5.5'
* PHP-5.5:
  fixed headers order
2013-03-12 08:35:49 +01:00
Derick Rethans d0ddcf70e4 Merge branch 'PHP-5.5' 2013-03-11 21:36:42 +00:00
Anatol Belski 64dba85575 Merge branch 'PHP-5.5'
* PHP-5.5:
  fixed the test
2013-03-11 16:15:01 +01:00
Anatol Belski 20e4d86984 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #64370 (microtime(true) less than $_SERVER['REQUEST_TIME_FLOAT'])
2013-03-11 16:05:07 +01:00
Xinchen Hui 01e1ba8873 Merge branch 'PHP-5.5'
Conflicts:
	UPGRADING
2013-03-11 15:19:59 +08:00
Nikita Popov 3670085d7d Merge branch 'PHP-5.5' 2013-03-09 20:22:29 +01:00
Xinchen Hui 12413b1393 Merge branch 'PHP-5.5' 2013-03-09 23:12:25 +08:00
Xinchen Hui 76fda41bb3 Merge branch 'PHP-5.5' 2013-03-09 11:38:58 +08:00
Xinchen Hui 79a96d2af0 Merge branch 'PHP-5.5'
Conflicts:
	NEWS-5.5
2013-03-08 10:36:13 +08:00
Keyur Govande 15c3d3ac71 Merge branch 'PHP-5.5'
* PHP-5.5:
  Support for CLI process title (https://wiki.php.net/rfc/cli_process_title)
2013-03-07 23:59:11 +00:00
David Soria Parra ced5f41a9a Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix for https://bugs.php.net/bug.php?id=62649
2013-03-07 23:20:35 +01:00
David Soria Parra 3adb1aa89e Merge branch 'PHP-5.5'
* PHP-5.5:
  Typo fix: recieved to received
2013-03-07 23:05:14 +01:00
David Soria Parra 19915917b9 Merge branch 'PHP-5.5'
* PHP-5.5:
  News for next beta
  Do another Alpha instead of Beta because of ZO+ RFC being voted on
2013-03-07 12:16:31 +01:00
David Soria Parra 76c6061aa0 Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS for the next beta
  NEWS for PHP 5.5.0 Beta 1
2013-03-07 00:27:48 +01:00
Anatol Belski 7fb0142fee Merge branch 'PHP-5.5'
* PHP-5.5:
  simplified the previous fix for #64359
2013-03-06 16:49:33 +01:00
Anatol Belski cb80655024 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #64359 strftime crash with VS2012
2013-03-06 12:39:01 +01:00
Stanislav Malyshev 9ccf470b5f Merge branch 'PHP-5.5'
* PHP-5.5:
  fix NEWS
2013-03-06 00:45:54 -08:00
Xinchen Hui 0fbe0a1495 Merge branch 'PHP-5.5' 2013-03-05 17:18:41 +08:00
Xinchen Hui 09e9c294b8 Merge branch 'PHP-5.5' 2013-03-05 16:57:37 +08:00
Xinchen Hui ac2376fbf1 Merge branch 'PHP-5.5' 2013-03-05 14:03:47 +08:00
Pierre Joye 177a25fef2 Merge branch 'PHP-5.5'
* PHP-5.5:
  - fix path
2013-03-04 14:14:36 +01:00
Pierre Joye 33a8e387f5 - damned conflicts 2013-03-04 12:11:20 +01:00
Pierre Joye a29ae8c8f7 Merge branch 'PHP-5.5'
* PHP-5.5:
  - add noisy php logo for autocrop with threshold test
2013-03-04 12:06:11 +01:00
Pierre Joye 5357d55634 Merge branch 'master' of git.php.net:php-src 2013-03-04 12:05:13 +01:00
Pierre Joye 3e0e64f208 Merge branch 'PHP-5.5'
* PHP-5.5:
  - add test for imagecropauto
  - (s)rgb distance works way better for now, re enable threshold
  - disable threshold for now, will enable it again using CIEDE2000
  - add todo for threshold
  - clean and enable threshold
  - add image crop support

Conflicts:
	UPGRADING
2013-03-04 12:03:01 +01:00
Anatol Belski defb654efd Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed PCRE locale crash in Windows/TS
2013-03-04 09:15:34 +01:00
Xinchen Hui d207f23475 Merge branch 'typofix' of https://github.com/carsonmcdonald/php-src 2013-03-04 10:47:30 +08:00
Stanislav Malyshev d93d8acca7 Merge branch 'PHP-5.5'
* PHP-5.5:
  rename NEWS back
  updated NEWS
2013-03-03 13:24:31 -08:00
Anatol Belski 3f48adbd64 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
  Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
  Rename to create a NEWS file per version to fix the annoying merging issue with NEWS files.
2013-03-03 19:23:26 +01:00
Anatol Belski 5e57bebbb7 Merge branch 'PHP-5.5'
* PHP-5.5:
  updated NEWS
  updated NEWS
  This commit was manufactured by cvs2svn to create tag 'NEWS'.
2013-03-03 19:17:14 +01:00
Anatol Belski 8dd1e0bf6c Merge branch 'PHP-5.5'
* PHP-5.5:
  merged PCRE 8.32
2013-03-03 19:11:25 +01:00
Derick Rethans ef99886bcb Merge branch 'PHP-5.5' 2013-03-03 13:10:41 -05:00
Derick Rethans b267ad3902 Merge branch 'PHP-5.5'
Conflicts:
	NEWS
2013-03-03 13:00:42 -05:00
Carson McDonald 58f3c74e13 Fix a couple typos 2013-03-03 10:44:46 -05:00
Xinchen Hui b572f07b6f Merge branch 'PHP-5.5' 2013-03-03 11:25:49 +08:00
Xinchen Hui a3c0942cb0 Merge branch 'PHP-5.5' 2013-03-03 11:14:34 +08:00
Xinchen Hui 0cdd4e83bd Merge branch 'PHP-5.5' 2013-03-03 11:00:36 +08:00
Xinchen Hui b5e8597e5a Merge branch 'PHP-5.5' 2013-03-03 10:53:52 +08:00
Stanislav Malyshev 6eff31e1fd Merge branch 'PHP-5.5'
* PHP-5.5:
  5.4.24-dev
  5.3.23RC1
2013-02-28 21:31:15 -08:00
Pierre Joye 02a15898b2 Merge branch 'PHP-5.5'
* PHP-5.5:
  - typo
2013-02-27 21:03:09 +01:00
Pierre Joye c9a67b17db Merge branch 'PHP-5.5'
* PHP-5.5:
  - fix name for imageflip constants, consistent witht the other
  - add test
  - add constants for imageflip
2013-02-27 20:23:38 +01:00
Pierre Joye 6192dbaa7e Merge branch 'PHP-5.5'
* PHP-5.5:
  - add only once
  - add new file for m4 as well
2013-02-27 16:03:27 +01:00
Pierre Joye 6ab9f906da - fix conflict on merge 2013-02-27 16:00:11 +01:00
Stanislav Malyshev c4ef791958 Merge branch 'PHP-5.5'
* PHP-5.5:
  5.4.13 branched, now it's 5.4.14
2013-02-26 22:26:55 -08:00
Stanislav Malyshev e7b6251708 Merge branch 'PHP-5.5'
* PHP-5.5:
  add news for SOAP fixes
2013-02-26 22:20:56 -08:00
Stanislav Malyshev 15d90c24a2 Merge branch 'PHP-5.5'
* PHP-5.5:
  Bug #52861: unset fails with ArrayObject and deep arrays
2013-02-26 22:13:31 -08:00
Remi Collet 3718d0c404 Merge branch 'PHP-5.5'
* PHP-5.5:
  add support for ppc64p7 arch (Power7 optimized)
2013-02-26 14:36:04 +01:00
Xinchen Hui 26252f4667 Merge branch 'PHP-5.5' 2013-02-24 13:00:01 +08:00
Gustavo Lopes c30d5a8ce3 Merge branch 'PHP-5.5'
* PHP-5.5:
  sendrecvmsg_shutdown function moved to mshutdown
2013-02-24 03:51:11 +01:00
Gustavo Lopes 0112b2bc7f Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix ext/sockets build with phpize
  Fix ext/intl build with phpize
2013-02-24 00:49:41 +01:00
Gustavo Lopes 46adc1603c Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS for 8718755
  Remove trailing whitespace; break long lines
  Fix rounding of zend_dval_to_lval
  Fix zend_dval_to_lval outside 64bit integers range
2013-02-23 18:07:22 +01:00
Andrey Hristov 3ad32ef12a Merge branch 'PHP-5.5' 2013-02-22 13:50:13 +01:00
Andrey Hristov 402296d46c Merge branch 'PHP-5.5' 2013-02-22 13:18:07 +01:00
Johannes Schlüter 08a52b7087 Merge branch 'PHP-5.5' 2013-02-21 16:51:37 +01:00
Johannes Schlüter 4642d0e0d6 Merge branch 'PHP-5.5' 2013-02-21 15:11:09 +01:00
Dmitry Stogov d0b549e9a7 Merge branch 'PHP-5.5'
* PHP-5.5:
  PHAR should modify entry timestamp when it's modified
2013-02-21 16:23:36 +04:00
Sara Golemon f54a87e3ab Merge branch 'PHP-5.5'
* PHP-5.5:
  http-stream test requires network connectivity
2013-02-21 03:22:31 -08:00
Xinchen Hui 6a05c6be41 Merge branch 'PHP-5.5' 2013-02-21 18:21:19 +08:00
Anatol Belski 43c2a897fa Merge branch 'PHP-5.5'
* PHP-5.5:
  added back the older vc9 favours
2013-02-21 11:00:54 +01:00
Anatol Belski d879ad3d1c Merge branch 'PHP-5.5'
* PHP-5.5:
  updated lib versions
  updated lib versions
  updated lib versions
2013-02-21 10:34:40 +01:00
Stanislav Malyshev 4c293bfe91 Merge branch 'PHP-5.5'
* PHP-5.5:
  news for bug #49348
  fix tests
  fix bug #49348 - issue notice on get_property_ptr_ptr when used for read
2013-02-21 00:57:52 -08:00
Dmitry Stogov b7f89bc701 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed external entity loading
2013-02-20 22:31:52 +04:00
Karsten Schmidt 3fd5a40556 Dont reset other counters when incrementing slow_rq 2013-02-20 18:53:17 +01:00
Johannes Schlüter 39fb14acb7 Merge branch 'PHP-5.5' 2013-02-20 11:58:29 +01:00
David Soria Parra 5a987919d8 Merge branch 'PHP-5.5'
* PHP-5.5:
  Start new NEWS section for beta1
  News for PHP 5.5.0 Alpha 5
2013-02-19 19:43:18 +01:00
David Soria Parra 915c00d42f Merge branch 'PHP-5.5'
* PHP-5.5:
  News for PHP 5.5.0 Alpha 5
2013-02-19 19:41:02 +01:00
David Soria Parra c3931bdfb3 News for PHP 5.5.0 Alpha 5 2013-02-19 19:27:37 +01:00
Anatol Belski 15a182a2d0 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix the test for curl 7.29.0+
2013-02-19 09:05:45 +01:00
Dmitry Stogov d7cbc01188 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #64070 (Inheritance with Traits failed with error)
2013-02-18 16:36:25 +04:00
Gustavo Lopes 427de31aa6 Merge branch 'PHP-5.5'
* PHP-5.5:
  Cleanup some multicast code; fix for mac os x?
2013-02-17 22:43:28 +01:00
Stanislav Malyshev c389d33f0c Merge branch 'PHP-5.5'
* PHP-5.5:
  fix protos
2013-02-17 13:34:07 -08:00
Stanislav Malyshev 1307c6c197 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix bug #61930: openssl corrupts ssl key resource when using openssl_get_publickey()
2013-02-17 13:30:04 -08:00
Anatol Belski 9a85dca7a5 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix free vs. curl_free
2013-02-17 20:29:58 +01:00
Stanislav Malyshev 8be9a974da Merge branch 'PHP-5.5'
* PHP-5.5:
  update NEWS
2013-02-17 02:38:41 -08:00
Stanislav Malyshev 5077cde952 Merge branch 'PHP-5.5'
* PHP-5.5:
  Added HTTP codes as of RFC 6585
2013-02-17 01:20:36 -08:00
Xinchen Hui a1b5796c5c Merge branch 'PHP-5.5' 2013-02-17 11:07:07 +08:00
Xinchen Hui c520280381 Merge branch 'PHP-5.5' 2013-02-16 22:30:14 +08:00
Xinchen Hui 92046b7ef1 Merge branch 'PHP-5.5' 2013-02-16 22:25:37 +08:00
Dmitry Stogov dd304c8e19 Merge branch 'PHP-5.5'
* PHP-5.5:
  Proper bit reset code
2013-02-13 22:08:13 +04:00
Ard Biesheuvel 0fcde51c35 Merge branch 'PHP-5.5' 2013-02-13 13:52:30 +01:00
Ard Biesheuvel a439309453 Merge branch 'PHP-5.5' 2013-02-11 17:54:54 +01:00
Ard Biesheuvel b1c2322d9c Merge branch 'PHP-5.5' 2013-02-11 16:01:03 +01:00
Ard Biesheuvel 7c1e19ed76 Merge branch 'PHP-5.5' 2013-02-11 14:45:17 +01:00
Andrey Hristov c98b52d7ea Merge branch 'master' of ssh://git.php.net/php-src 2013-02-11 12:28:55 +01:00
Andrey Hristov faa79150f6 Merge branch 'PHP-5.5'
Conflicts:
	NEWS
2013-02-11 12:07:55 +01:00
Remi Collet 5f0e374da7 Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS
  Fixed bug #64142 (dval to lval different behavior on ppc64)
2013-02-11 09:14:06 +01:00
Stanislav Malyshev aac90ee333 Merge branch 'PHP-5.5'
* PHP-5.5:
  update NEWS
  mb_split() can now handle empty matches like preg_split() does.
  mb_split() can now handle empty matches like preg_split() does.
2013-02-09 23:05:58 -08:00
Andrey Hristov 1d5d63131d Merge branch 'PHP-5.5'
Conflicts:
	NEWS
2013-02-08 18:34:35 +01:00
Andrey Hristov a9daf26dcf Merge branch 'PHP-5.5' 2013-02-08 18:28:34 +01:00
Andrey Hristov 5a2b3a0a34 Merge branch 'PHP-5.5' 2013-02-08 18:10:08 +01:00
Andrey Hristov 77cae97ac8 Merge branch 'PHP-5.5' 2013-02-08 17:06:05 +01:00
Andrey Hristov 2de2c1cf5b Merge branch 'PHP-5.5' 2013-02-08 16:36:52 +01:00
Andrey Hristov 12d6c22afb Merge branch 'PHP-5.5'
Conflicts:
	NEWS
2013-02-08 11:13:45 +01:00
Andrey Hristov e0664cc602 Merge branch 'master' of ssh://git.php.net/php-src 2013-02-07 20:35:16 +01:00
Andrey Hristov c292792198 Merge branch 'PHP-5.5' 2013-02-07 18:46:36 +01:00
Boris Lytochkin 175219c9a3 Merge branch 'master' of https://git.php.net/push/php-src 2013-02-07 21:36:09 +04:00
Andrey Hristov a0e975c7bc Merge branch 'PHP-5.5' 2013-02-07 18:30:32 +01:00
Xinchen Hui 5fcae352ed Merge branch 'PHP-5.5' 2013-02-07 23:50:35 +08:00
Xinchen Hui 7fb07acf98 Merge branch 'PHP-5.5' 2013-02-07 23:46:15 +08:00
Andrey Hristov 67ccb99f2c Merge branch 'PHP-5.5' 2013-02-07 16:24:44 +01:00
Andrey Hristov 2c07219d24 Merge branch 'PHP-5.5' 2013-02-07 16:06:50 +01:00
Dmitry Stogov a80b0ee967 Merge branch 'PHP-5.5'
* PHP-5.5:
  Disabled external entities loading
2013-02-07 16:10:20 +04:00
Boris Lytochkin 6d614d5105 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix bug #64124 (IPv6 malformed)
2013-02-07 14:50:41 +04:00
Dmitry Stogov a443dad71a Merge branch 'PHP-5.5'
* PHP-5.5:
  Check if soap.wsdl_cache_dir confirms to open_basedir
2013-02-07 13:13:50 +04:00
Anatoliy Belsky 2249881c0d Merge branch 'PHP-5.5'
* PHP-5.5:
  make libvpx optional
2013-02-06 16:23:16 +01:00
Remi Collet 9f7b121da3 Merge branch 'PHP-5.5'
* PHP-5.5:
  revert
  revert
2013-02-05 12:29:34 +01:00
Ard Biesheuvel d0e0a51c4c Add ARM optimized versions of safe_address()
The function safe_address() uses inline assembler to detect
overflow in size/offset calculations, as detecting this in
plain C is a lot more work.
2013-02-05 12:14:55 +01:00
Ard Biesheuvel 72a728872b Update config.guess to latest GPLv2 upstream version
This adds the ability to configure/build *on* 64-bit ARMv8,
which uses the host triplet 'aarch64-linux-gnu'.

Source:
  http://git.savannah.gnu.org/gitweb/?p=config.git;h=306afce
2013-02-05 10:27:30 +01:00
Remi Collet c2a2f5e3ff Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS
  Fixed bug #64142 (dval to lval different behavior on ppc64)
2013-02-04 15:27:54 +01:00
Andrey Hristov 9e65d4ec85 Merge branch 'PHP-5.5' 2013-02-04 14:34:38 +01:00
Andrey Hristov 309bdfba42 Merge branch 'master' of ssh://git.php.net/php-src 2013-02-04 14:15:19 +01:00
Andrey Hristov 2a2975cb97 Merge branch 'PHP-5.5' 2013-02-04 13:50:23 +01:00
Xinchen Hui 34381de5f3 Merge branch 'PHP-5.5' 2013-02-04 14:22:17 +08:00
Felipe Pena 112e428752 Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fixed ZTS build
  News about FR #49180.
2013-02-03 11:00:58 -02:00
Martin Jansen 80be1432c0 Merge branch 'PHP-5.5'
* PHP-5.5:
  Add option to specific the expected separator character.
  There is no need to use memchr() for comparisons in these places.
  ext/filter support for validating MAC addresses.
2013-02-03 13:24:04 +01:00
Gustavo Lopes 2b2a34689c Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix test on Windows.
  NEWS/UPGRADING for changes in sockets, intl
2013-02-03 02:07:08 +01:00
Gustavo Lopes 4138a8146e Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix bug and hopefully build on WinSDK 6.1
2013-02-03 01:45:14 +01:00
Gustavo Lopes da0012dc26 Merge branch 'PHP-5.5'
* PHP-5.5: (40 commits)
  php_strerror in ext/sockets renamed in 5.5
  Move macro back to .c file
  Fix multicast.c not defining errno on Windows
  Fix non-Windows build
  send/recvmsg() support for Windows
  Remove some pre-vista code
  Revert "Payload of HOPLIMIT/TCLASS are 8-bit"
  Ensure memory is initialized
  Payload of HOPLIMIT/TCLASS are 8-bit
  Fix buf in string -> int conv.
  Build fixes; accept names for if_index
  Refactoring: move stuff to new conversions.c
  Support sticky IPV6_PKTINFO
  Rename some functions for consistency
  Destroy ancillary registry on shutdown
  Move some multicast stuff to multicast.c
  Fix mcast_ipv6_send test
  Check return of fstat()
  Fix build on Mac OS X
  Register extra MSG_* constants
  ...
2013-02-02 18:42:01 +01:00
Nikita Popov 86ee2c60c4 Merge branch 'PHP-5.5' 2013-02-01 19:53:23 +01:00
Remi Collet 2080a13348 Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS
  Fixed bug #64128 buit-in web server is broken on ppc64.
2013-02-01 19:27:22 +01:00
Nikita Popov 5c3c31127e Merge branch 'PHP-5.5' 2013-02-01 18:36:10 +01:00
Anatoliy Belsky deddec4a15 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix enchant compilation under vc11
2013-02-01 12:44:00 +01:00
Johannes Schlüter 8460e0971f Merge branch 'PHP-5.5' 2013-02-01 12:32:30 +01:00
Remi Collet b12a574ee2 Merge branch 'PHP-5.5'
* PHP-5.5:
  Mark this test as requiring internet connecion.
2013-01-31 14:39:54 +01:00
Remi Collet 9175da5036 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix failed test: sys_errlist[116] have changed on recent glibc (Fedora 18) old: Stale NFS file handle new: Stale file handle
2013-01-31 14:26:10 +01:00
Johannes Schlüter 4891d3ffe6 Merge branch 'PHP-5.5' 2013-01-31 00:59:27 +01:00
Lars Strojny 06b1e6a4d3 Merge branch 'PHP-5.5' 2013-01-31 00:35:35 +01:00
Nikita Popov ea56a894e8 Merge branch 'PHP-5.5' 2013-01-30 23:55:59 +01:00
Nikita Popov 9a25dd382c Merge branch 'PHP-5.5' 2013-01-30 20:42:30 +01:00
Nikita Popov 6a70c97dc4 Merge branch 'PHP-5.5'
Conflicts:
	configure.in
	main/php_version.h
2013-01-30 20:38:04 +01:00
Nikita Popov 30270af777 Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
	configure.in
	main/php_version.h
2013-01-30 20:34:01 +01:00
Jelle Zijlstra 09e73fd80e Fix build problem in C++11 2013-01-30 19:08:45 +01:00
Ferenc Kovacs 57438e5f77 Merge branch 'PHP-5.5'
* PHP-5.5:
  having xz makes it three. thanks Mike Ford for spotting it
2013-01-30 17:40:57 +01:00
Kalle Sommer Nielsen ee149cdd2b Test commit (simple WS change) 2013-01-30 16:16:43 +01:00
Ferenc Kovacs c16d8c521e Merge branch 'PHP-5.5'
* PHP-5.5:
  now we have also an xz archive
2013-01-30 14:13:31 +01:00
Stanislav Malyshev 7ae80c585f Merge branch 'PHP-5.5'
* PHP-5.5:
  forgot this file :(
2013-01-29 15:03:19 -08:00
Stanislav Malyshev ffbd93bdca Merge branch 'PHP-5.5'
* PHP-5.5:
  branched 5.4.12
  update NEWS
2013-01-29 12:35:08 -08:00
Stanislav Malyshev 861c16d656 Merge branch 'PHP-5.5'
* PHP-5.5:
  complete zts fix
2013-01-29 12:12:58 -08:00
Johannes Schlüter ac8fcecd5c Merge branch 'PHP-5.5' 2013-01-29 19:50:44 +01:00
Johannes Schlüter 40dd32788c Merge branch 'master' of git.php.net:/php-src 2013-01-29 19:50:25 +01:00
Gustavo Lopes 5198a860c7 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed paramter count
  Make converter work on VS
2013-01-29 19:20:15 +01:00
Gustavo Lopes ae0c9d547d Merge branch 'PHP-5.5'
* PHP-5.5:
  intl/converter in line w/ intl error handling
  Fix zpp() call in intl/converter
  Write local err on intlcal_get_time_zone() failure
  Improve ERROR.CONVENTIONS
  Fix arginfo of BreakIterator::getLocale
  intl: doc explaining error conventions
  Add UConverter class (ICU's UConverter API)
2013-01-29 19:12:14 +01:00
Felipe Pena 9307126fe5 Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fixed ZTS build
2013-01-29 09:27:09 -02:00
Stanislav Malyshev 0ad8940814 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix bug #62524, only follow redirects in file streams for 3xx HTTP statuses
2013-01-29 00:29:11 -08:00
Stanislav Malyshev 992bba6aef Merge branch 'PHP-5.5'
* PHP-5.5:
  Add news for bug #60524
  Implemented Feature #60524 (sys_temp_dir)

Conflicts:
	UPGRADING
2013-01-28 22:56:51 -08:00
Stanislav Malyshev 383e317269 oops, unintended addition 2013-01-28 22:28:55 -08:00
Stanislav Malyshev 24447dca5d post-5.5 changes for bug #46439 as described in the RFC 2013-01-28 22:26:59 -08:00
Stanislav Malyshev 1ca429e1d6 Merge branch 'PHP-5.5'
* PHP-5.5:
  Implement fix for bug #46439 - add CURLFile class for safer uploads

Conflicts:
	UPGRADING
2013-01-28 22:24:56 -08:00
Stanislav Malyshev ba7544beb2 Merge branch 'PHP-5.5'
* PHP-5.5:
  add new features

Conflicts:
	UPGRADING
2013-01-28 12:14:56 -08:00
Anatoliy Belsky 4af8ceb3b2 Merge branch 'PHP-5.5'
* PHP-5.5:
  allow for libpng 1.5.x
2013-01-28 13:24:39 +01:00
Stanislav Malyshev 59cc4d7679 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix bug #60833 - self, parent, static behave inconsistently case-sensitive

Conflicts:
	UPGRADING
2013-01-27 18:07:42 -08:00
Stanislav Malyshev ebc80d62ec Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix missing parameter
2013-01-27 17:11:53 -08:00
Ferenc Kovacs 016c130f21 now we have also an xz archive 2013-01-24 12:56:55 +01:00
Stanislav Malyshev c493173f8e Merge branch 'PHP-5.5'
* PHP-5.5:
  fix tests
  fix tests
2013-01-23 10:45:12 -08:00
Gustavo Lopes ddc98aa814 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix bug #64023 (__toString() & SplFileInfo)
2013-01-23 13:26:15 +01:00
Andrey Hristov 40d9075677 Merge branch 'PHP-5.5' 2013-01-22 16:49:13 +01:00
Xinchen Hui 34928ee9c8 Merge branch 'PHP-5.5' 2013-01-22 17:00:15 +08:00
Stanislav Malyshev c8e4c4c569 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix tests
2013-01-22 00:37:26 -08:00
Xinchen Hui 679f6e3f56 Merge branch 'PHP-5.5' 2013-01-21 11:49:01 +08:00
Xinchen Hui a7cb5724c3 Merge branch 'PHP-5.5' 2013-01-19 17:03:53 +08:00
Felipe Pena 6c8f9c3451 Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fixed ZTS build
2013-01-18 22:15:22 -02:00
Lars Strojny b1ddfcbee3 Merge branch 'PHP-5.5' 2013-01-19 01:01:39 +01:00
Stanislav Malyshev f02373fc5a Merge branch 'PHP-5.5'
* PHP-5.5:
  fix bug #63462 (Magic methods called twice for unset protected properties)
2013-01-18 13:45:40 -08:00
Gustavo Lopes 5da05e5f0a Merge branch 'PHP-5.5'
* PHP-5.5:
  NEWS for bug #64011. See 77ee200
  Fix bug #64011 (get_html_translation_table())
  Fix News
2013-01-18 12:12:55 +01:00
Ard Biesheuvel 35154c7ebc Update config.sub to latest GPLv2 upstream version
This adds the ability to configure/build for 64-bit ARMv8,
which uses the host triplet 'aarch64-linux-gnu'.

Source:
  http://git.savannah.gnu.org/gitweb/?p=config.git;h=306afce
2013-01-18 10:31:05 +01:00
Xinchen Hui a499a655ee Merge branch 'PHP-5.5' 2013-01-18 15:51:32 +08:00
Xinchen Hui 87d5701065 Fix skipif section 2013-01-18 15:12:51 +08:00
Ard Biesheuvel ffc8850d44 Merge branch 'feature/linaro-arm-performance'
* feature/linaro-arm-performance:
  Added ARM accelerated implementations for ZEND_SIGNED_MULTIPLY_LONG()
  Added test cases for ZEND_SIGNED_MULTIPLY_LONG()
2013-01-17 18:07:10 +01:00
Ard Biesheuvel 0b8ec19629 Added ARM accelerated implementations for ZEND_SIGNED_MULTIPLY_LONG()
Added inline assembler implementations:
- for 32-bit ARM, as the existing C implementation uses 64-bit
integer arithmetic, which relies on software emulation by libgcc;
- for 64-bit ARM, as the existing C implementation uses long doubles
to check for overflow before using the integer result.

Also updated my email address and fixed some whitespace
2013-01-17 18:04:05 +01:00
Ard Biesheuvel abb12f5d7b Added test cases for ZEND_SIGNED_MULTIPLY_LONG()
Before making changes to the implementation of
ZEND_SIGNED_MULTIPLY_LONG(), add some test cases
to make sure the various implementations remain
equivalent.
2013-01-17 17:41:58 +01:00
Gustavo Lopes 979ca53734 Merge branch 'PHP-5.5'
* PHP-5.5:
  Update README.PARAMETER_PARSING_API
  Export zend_parse_parameter()
  Expose zend_parse_arg() as zend_parse_parameter()
  zend_parse_parameters: allow ! for non pointers
2013-01-16 23:37:42 +01:00
Johannes Schlüter 7276769c4a Merge branch 'PHP-5.5' 2013-01-16 17:39:09 +01:00
Adam Harvey 6f23a2d70a Merge branch 'PHP-5.5'
* PHP-5.5:
  Update the arguments in the prototype of fpm_socket_unix_test_connect().
2013-01-16 10:21:51 +08:00
Felipe Pena 5d0cd72394 Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fixed ZTS build
2013-01-15 19:59:30 -02:00
Felipe Pena 3efdfb54f3 Merge branch 'master' of git.php.net:php-src 2013-01-15 19:45:43 -02:00
Felipe Pena 7629c8db40 - Fixed ZTS build 2013-01-15 19:45:09 -02:00
Anatoliy Belsky 41433a52d6 Merge branch 'PHP-5.5'
* PHP-5.5:
  fixed build
  NEWS for bug #63893
2013-01-15 22:40:31 +01:00
Lars Strojny 85a949d9d4 Merge branch 'PHP-5.5' 2013-01-15 22:12:09 +01:00
Gustavo Lopes 5466fd1866 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed inconsequential bug in strtr()
  UPGRADING.INTERNALS: document zend_qsort_r
  Add zend_qsort_r & use it in strtr
  NEWS for bug #63893
  Remove _GNU_SOURCE, add local heap sort
  The compiler can figure this out
  Remove unused block
  strtr() with 2nd param array - optimization
  Refactoring, bugs & leaks
  Optimize strtr w/ 2nd arg array
2013-01-15 21:47:33 +01:00
Andrey Hristov 9be02af4ef Merge branch 'PHP-5.5' 2013-01-15 12:21:22 +01:00
Andrey Hristov 31f3f2d37d Merge branch 'PHP-5.5' 2013-01-15 12:20:24 +01:00
Andrey Hristov 69f010c99d Merge branch 'PHP-5.5' 2013-01-15 11:33:07 +01:00
Andrey Hristov 0b0f87e822 Merge branch 'master' of ssh://git.php.net/php-src 2013-01-15 11:07:58 +01:00
Andrey Hristov a7fc90703f Merge branch 'PHP-5.5' 2013-01-15 11:07:08 +01:00
Adam Harvey 40c1122dcc Revert "Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa."
This reverts commit 0510701474.
2013-01-15 17:40:23 +08:00
Adam Harvey 232cf4a640 Revert "Update fputcsv() to escape all characters equally."
On second thoughts, while the behaviour _is_ broken, this isn't the right fix.

This reverts commit 9b5cb0e805.
2013-01-15 17:40:23 +08:00
Andrey Hristov c77fe090ea Merge branch 'master' of ssh://git.php.net/php-src
Conflicts:
	NEWS
2013-01-15 10:40:15 +01:00
Andrey Hristov c4fe37bd8c Merge branch 'PHP-5.5'
Conflicts:
	NEWS
2013-01-15 10:12:54 +01:00
Lars Strojny 9d88c8d904 Merge branch 'PHP-5.5' 2013-01-15 09:35:47 +01:00
Stanislav Malyshev c3a63f580c Merge branch 'PHP-5.5'
* PHP-5.5:
  fix NEWS
2013-01-15 00:08:44 -08:00
Stanislav Malyshev 71330a771d Merge branch 'PHP-5.5'
* PHP-5.5:
  fix NEWS
2013-01-15 00:07:22 -08:00
Adam Harvey 587ea700cd Merge branch 'PHP-5.5'
* PHP-5.5:
  Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa.
2013-01-15 15:52:12 +08:00
Xinchen Hui 0b5e833db8 Merge branch 'PHP-5.5' 2013-01-15 15:34:10 +08:00
Adam Harvey 1794ef4736 Merge branch 'PHP-5.5'
* PHP-5.5:
  Update fputcsv() to escape all characters equally.
2013-01-15 15:26:50 +08:00
Xinchen Hui a744390c50 Merge branch 'PHP-5.5' 2013-01-15 10:41:07 +08:00
Lars Strojny 212f9f05f0 Merge branch 'PHP-5.5' 2013-01-14 21:43:07 +01:00
Derick Rethans 3f20a2dec3 Merge branch 'PHP-5.5' 2013-01-14 20:39:06 +00:00
Derick Rethans cca1a6e344 Merge branch 'PHP-5.5' 2013-01-14 20:35:13 +00:00
Lars Strojny fd72588979 Merge branch 'PHP-5.5' 2013-01-14 21:25:01 +01:00
Lars Strojny ef6ae113f1 Merge branch 'PHP-5.5' 2013-01-14 20:43:55 +01:00
Lars Strojny 02d04c244f Merge branch 'PHP-5.5' 2013-01-14 18:54:08 +01:00
Lars Strojny df8a9e1ecb Merge branch 'PHP-5.5' 2013-01-14 18:16:48 +01:00
Lars Strojny 0c153aeb3b Merge branch 'PHP-5.5' 2013-01-14 17:44:03 +01:00
Xinchen Hui 7a31692253 Merge branch 'PHP-5.5' 2013-01-14 17:09:05 +08:00
Xinchen Hui f6260b36dd Merge branch 'PHP-5.5' 2013-01-14 16:24:26 +08:00
Adam Harvey 5c7ae74f10 Merge branch 'PHP-5.5'
* PHP-5.5:
  Tinker with UPGRADING's wording for the format string changes for clarity.
2013-01-14 13:56:22 +08:00
Stanislav Malyshev 308d817fb6 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix bug #63982: isset() inconsistently produces a fatal error on protected property
  different OSes have different messages, and that's not what the test is about anyway
2013-01-13 17:29:06 -08:00
Arnaud Le Blanc bbf1c9c4a7 Merge branch 'PHP-5.5' 2013-01-13 15:47:33 +01:00
Dmitry Stogov 30588d8c50 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed uninitialized zval.type (Yoram)
2013-01-10 18:54:56 +04:00
ULF WENDEL 9202225f29 Merge branch 'PHP-5.5'
* PHP-5.5:
  MySQL 5.6 EXPIRE PASSWORD flag tests
2013-01-10 14:54:01 +01:00
Remi Collet 79dc69b75f Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix test after fix for bug #63943 (Bad warning text from strpos() on empty needle) See commit c05ee74e7f
2013-01-10 11:18:59 +01:00
Andrey Hristov 1b25386175 Merge branch 'PHP-5.5' 2013-01-09 19:15:57 +01:00
Andrey Hristov c328520e07 Merge branch 'PHP-5.5' 2013-01-09 19:04:05 +01:00
Andrey Hristov cd45e54006 Merge branch 'PHP-5.5' 2013-01-09 18:41:06 +01:00
Andrey Hristov 96ff156f06 Merge branch 'PHP-5.5' 2013-01-09 18:31:15 +01:00
Andrey Hristov 34d0562a4f Merge branch 'PHP-5.5' 2013-01-09 15:33:32 +01:00
Andrey Hristov 8494671de4 Merge branch 'master' of ssh://git.php.net/php-src 2013-01-09 15:07:36 +01:00
Dmitry Stogov 0132cb694d Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed compilator bug that might cause jump depended on unitialized value
2013-01-09 17:53:05 +04:00
Andrey Hristov 3f248fef05 Merge branch 'PHP-5.5' 2013-01-09 14:51:02 +01:00
Dmitry Stogov 149cc8d69d Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #63882 (zend_std_compare_objects crash on recursion)
2013-01-09 11:33:44 +04:00
Xinchen Hui f584b9ac50 Merge branch 'PHP-5.5' 2013-01-09 10:58:27 +08:00
Joey Smith c3acefd9ea Fix a typo in the ZipArchive error messages 2013-01-08 14:18:31 -07:00
Pierre Joye c41291feb9 Merge branch 'master' of git.php.net:php-src 2013-01-08 15:21:41 +01:00
Pierre Joye f566b4d321 Merge branch 'PHP-5.5'
* PHP-5.5:
  - fix bug #47358, glob returns error, should be empty array()
  - NEWS entry for #50524
2013-01-08 15:16:35 +01:00
Pierre Joye 10a2c0d574 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - fix bug #47358, glob returns error, should be empty array()
  - NEWS entry for #50524
2013-01-08 15:13:40 +01:00
Pierre Joye 2fb7cd30c5 - fix bug #47358, glob returns error, should be empty array() 2013-01-08 15:06:58 +01:00
Pierre Joye 50ceeb9f75 - fix bug #47358, glob returns error, should be empty array() 2013-01-08 15:02:04 +01:00
Adam Harvey 56dd1e30f5 Merge branch 'PHP-5.5'
* PHP-5.5:
  Add NEWS for the previously cherry picked commit.
  sapi/litespeed/lsapi_main.c: Fix bug #63228
2013-01-08 11:45:49 +08:00
Andrey Hristov 4a68c46594 Merge branch 'PHP-5.5'
Conflicts:
	NEWS
2013-01-07 16:46:16 +01:00
Pierre Joye bcb3ad043a - NEWS entry for #50524 2013-01-07 13:09:20 +01:00
Pierre Joye 7a13ce61e0 Merge branch 'PHP-5.5'
* PHP-5.5:
  - fix the fix for bug #50524
2013-01-07 13:04:40 +01:00
Anatoliy Belsky ae0c512ffd Merge branch 'PHP-5.5'
* PHP-5.5:
  fix windows build
  News entry for bug #52126

Conflicts:
	NEWS
2013-01-06 18:42:06 +01:00
Derick Rethans 8bca904f96 Merge branch 'master' of git.php.net:/php-src 2013-01-06 15:10:36 +00:00
Derick Rethans 65bae39770 Merge branch 'PHP-5.5' 2013-01-06 15:07:34 +00:00
Lars Strojny 878780c6bb Merge branch 'PHP-5.5' 2013-01-06 15:12:07 +01:00
Lars Strojny 925da6b14d Merge branch 'PHP-5.5' 2013-01-06 14:55:05 +01:00
Lars Strojny 44f564e3e6 Merge branch 'PHP-5.5' 2013-01-06 14:12:19 +01:00
Xinchen Hui 786d34f13b Merge branch 'PHP-5.5' 2013-01-06 10:25:04 +08:00
Lars Strojny 9fae5b68c8 Merge branch 'PHP-5.5' 2013-01-06 03:23:36 +01:00
Lars Strojny ce76ec56d9 Merge branch 'PHP-5.5' 2013-01-06 02:11:34 +01:00
Pierrick Charron 4084a02ff9 Merge branch 'PHP-5.5'
* PHP-5.5:
  Improve resource management for curl handle
2013-01-05 11:12:00 -05:00
Colin Viebrock 98a3d5acc0 update Zend Engine logo as per Zeev, and tweak PHP logos ... :) 2013-01-04 12:05:27 -06:00
Xinchen Hui 8a2208a33c Merge branch 'PHP-5.5' 2013-01-04 11:06:26 +08:00
Stanislav Malyshev 782f4ac23a Merge branch 'PHP-5.5'
* PHP-5.5:
  5.4.12-dev
2013-01-03 17:34:21 -08:00
Johannes Schlüter 0c6ce227dc Merge branch 'PHP-5.5' 2013-01-03 23:00:30 +01:00
Remi Collet a3b7d24e8e Merge branch 'PHP-5.5'
* PHP-5.5:
  remove set but not used variables
2013-01-02 16:57:44 +01:00
Stanislav Malyshev 5a27e9760b Merge branch 'PHP-5.5'
* PHP-5.5:
  add bug #63762
2013-01-01 22:10:22 -08:00
Stanislav Malyshev de816469ef Merge branch 'PHP-5.5'
* PHP-5.5:
  add fix #43177
2013-01-01 21:24:43 -08:00
Stanislav Malyshev 6da86acfae Merge branch 'PHP-5.5'
* PHP-5.5:
  Bug #43177: If an eval() has a parse error, the overall exit status and return code should not be affected.
  fix NEWS
2013-01-01 21:21:42 -08:00
Pierrick Charron a63a725301 Merge branch 'PHP-5.5'
* PHP-5.5:
  Remove passwd handler from struct when not needed
2013-01-01 21:18:08 -05:00
Xinchen Hui 642721b38a Merge branch 'PHP-5.5' 2013-01-01 16:39:03 +08:00
Pierrick Charron ae5d86270f Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #63874 (Segfaul if php_strip_whitespace has heredoc)
2012-12-29 23:16:53 -05:00
Lars Strojny 3b022e57ed Merge branch 'PHP-5.5' 2012-12-29 03:38:23 +01:00
Pierrick Charron 90cbe2a01f Merge branch 'PHP-5.5'
* PHP-5.5:
  Add new curl options
2012-12-28 00:53:03 -05:00
Pierrick Charron f3ff33a2b5 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed #63859 Memory leak when reusing curl-handle
2012-12-27 13:39:58 -05:00
Pierrick Charron c9a080d09f Merge branch 'PHP-5.5'
* PHP-5.5:
  Revert "Remove a useless memory write in zend_llist_del_element"
2012-12-26 10:19:04 -05:00
Pierrick Charron 407f851732 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix ext/curl tests to work on every libcurl versions
2012-12-26 00:44:25 -05:00
Pierrick Charron d87ad19683 Merge branch 'PHP-5.5'
* PHP-5.5:
  Remove a useless memory write in zend_llist_del_element
2012-12-25 20:59:38 -05:00
Dmitry Stogov ba6317b05e Merge branch 'PHP-5.5'
* PHP-5.5:
  spelling
2012-12-25 16:24:09 +04:00
Dmitry Stogov 245dbb043e Merge branch 'PHP-5.5'
* PHP-5.5:
  spelling
2012-12-25 16:22:22 +04:00
Dmitry Stogov 8728ca65c6 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed ZTS build
2012-12-25 13:39:13 +04:00
Dmitry Stogov f3ea497377 Merge branch 'PHP-5.5'
* PHP-5.5:
  Removed deprecated fields
2012-12-25 10:50:35 +04:00
Dmitry Stogov 3b17a09017 Merge branch 'PHP-5.5'
* PHP-5.5:
  Traits refactoring
2012-12-25 10:34:07 +04:00
Nikita Popov fd25d48494 Merge branch 'PHP-5.5' 2012-12-24 00:30:26 +01:00
Pierrick Charron c5cfe37def Merge branch 'PHP-5.5'
* PHP-5.5:
  Update NEWS
  New curl_pause() function
  Support for curl_strerror and curl_multi_strerror
  Add curl_multi_setopt and clean curl_share_setopt
  Remove duplicated function definition
2012-12-23 17:51:43 -05:00
Pierrick Charron 6ec81361fe Merge branch 'PHP-5.5'
* PHP-5.5:
  Update NEWS file
  Fixed segfault due to libcurl connection caching
2012-12-22 19:12:27 -05:00
Pierrick Charron 657d3f18f2 Merge branch 'PHP-5.5'
* PHP-5.5:
  Update NEWS file
  Fixed bug #63352 (Can't enable hostname validation when using curl stream wrappers)
  CURL >= 7.28.0 no longer support value 1 for CURLOPT_SSL_VERIFYHOST)
2012-12-21 19:29:14 -05:00
Pierrick Charron 9cf98be846 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix test to work on every libcurl version
  - Fixed typo on "SKIPIF" (causing make test to abort on some systems)
2012-12-21 12:26:03 -05:00
Pierrick Charron a6a4323426 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix test
2012-12-21 11:50:50 -05:00
Nikita Popov 1f4c71b760 Merge branch 'PHP-5.5' 2012-12-21 17:34:14 +01:00
Nikita Popov 4509016309 Merge branch 'PHP-5.5' 2012-12-21 01:58:29 +01:00
Nikita Popov 68730388ae Merge branch 'PHP-5.5' 2012-12-20 20:36:06 +01:00
Rasmus Lerdorf d417a054e1 Merge branch 'PHP-5.5' 2012-12-19 23:01:00 -05:00
Pierrick Charron e33e143296 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #55438 (Curlwapper is not sending http header randomly)
2012-12-19 19:47:34 -05:00
Johannes Schlüter 129580a81c Merge branch 'PHP-5.5' 2012-12-19 17:02:12 +01:00
Andrey Hristov 456e37da12 Merge branch 'PHP-5.5' 2012-12-19 16:58:47 +01:00
Andrey Hristov 87f80928ba Merge branch 'master' of ssh://git.php.net/php-src 2012-12-19 16:20:31 +01:00
Andrey Hristov d57e474267 Merge branch 'PHP-5.4' 2012-12-19 16:20:19 +01:00
Nikita Popov 0e781e2309 Merge branch 'PHP-5.5' 2012-12-19 15:23:52 +01:00
Andrey Hristov 0a8777a515 Merge branch 'master' of ssh://git.php.net/php-src 2012-12-19 15:07:03 +01:00
Andrey Hristov c780ddbb50 Merge branch 'PHP-5.4'
Conflicts:
	ext/mysqlnd/mysqlnd_alloc.c
2012-12-19 15:05:47 +01:00
Remi Collet f98a03b144 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix failing test on Linux build
2012-12-19 10:25:16 +01:00
Nikita Popov 5f7c478d53 Merge branch 'PHP-5.5' 2012-12-18 21:41:55 +01:00
David Soria Parra 2041e0dc18 Merge branch 'PHP-5.5'
* PHP-5.5:
  News for PHP 5.5.0 Alphas
2012-12-18 17:28:22 +01:00
Xinchen Hui 210d428f99 ixed bug that exception won't be catched
Related failed test Zend/tests/bug35437.phpt (after he latest
execute_data improvement, run with non CALL vm kind)
2012-12-18 15:34:47 +08:00
Xinchen Hui d3ec9ceb25 Revert "Fixed bug that exception won't be catched"
This reverts commit 28db07a0e3.

Unexpected vm kind change
2012-12-18 15:27:54 +08:00
Xinchen Hui 28db07a0e3 Fixed bug that exception won't be catched
related failed test Zend/tests/bug35437.phpt (after he latest
execute_data improvement, run with non CALL vm kind)
2012-12-18 15:20:58 +08:00
Xinchen Hui 73c9889663 Merge branch 'PHP-5.5' 2012-12-17 14:30:41 +08:00
Xinchen Hui 6f452126ac Merge branch 'PHP-5.5' 2012-12-17 12:58:38 +08:00
Sebastian Bergmann 8e22b0408a Merge branch 'PHP-5.5' 2012-12-16 09:08:01 +01:00
Remi Collet 4ef9f00c46 Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17 2012-12-16 08:52:02 +01:00
Lars Strojny eb0693a975 Merge branch 'PHP-5.5' 2012-12-14 14:57:04 +01:00
Lars Strojny 765d5200d6 Merge branch 'master' of git://github.com/php/php-src 2012-12-14 14:56:58 +01:00
Xinchen Hui 72f7543668 Merge branch 'PHP-5.5' 2012-12-14 17:27:21 +08:00
Xinchen Hui 3acc729707 Merge branch 'PHP-5.5' 2012-12-14 17:23:07 +08:00
Xinchen Hui 1062052a0d Merge branch 'PHP-5.5' 2012-12-14 16:53:27 +08:00
Xinchen Hui a4678099a1 Add test for bug #63741 2012-12-14 16:51:34 +08:00
Dmitry Stogov ec4ff07415 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed uninitialized EX(call)->called_scope
2012-12-14 12:11:23 +04:00
Rasmus Lerdorf 42f3344d85 Merge branch 'PHP-5.5' 2012-12-13 16:54:51 -08:00
Rasmus Lerdorf c701aeba0b Merge branch 'PHP-5.5' 2012-12-13 16:43:04 -08:00
Rasmus Lerdorf 8fbeb6e342 Merge branch 'PHP-5.4' 2012-12-13 16:16:45 -08:00
Arpad Ray c66e54d72e Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix #63379 - Don't reset mod_user_is_open in destroy
2012-12-14 00:03:08 +00:00
Johannes Schlüter f8a2407655 Merge branch 'PHP-5.5' 2012-12-13 22:50:55 +01:00
Anatoliy Belsky 54a04d2553 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed mysqlnd compilation in debug mode on windows
2012-12-13 15:06:15 +01:00
Dmitry Stogov 432902a875 Merge branch 'PHP-5.5'
* PHP-5.5:
  Removed unreachable code
2012-12-13 17:51:41 +04:00
Dmitry Stogov 7dd16bcff4 Merge branch 'PHP-5.5'
* PHP-5.5:
  Removed unnecessary checks
2012-12-13 17:30:39 +04:00
Dmitry Stogov cc118f78d7 Merge branch 'PHP-5.5'
* PHP-5.5:
  Removed redundand checks from release build
2012-12-13 14:47:23 +04:00
Dmitry Stogov 20113b5640 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #63757 (getenv() produces memory leak with CGI SAPI)
2012-12-13 13:41:04 +04:00
Xinchen Hui 7ed8593576 Merge branch 'PHP-5.5' 2012-12-13 10:45:50 +08:00
Xinchen Hui 3516b9857f Merge branch 'license_fix' of https://github.com/leight/php-src 2012-12-13 10:38:20 +08:00
Dmitry Stogov 0450cb7487 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Really fix test pdo_mysql_class_constants.phpt
2012-12-13 02:53:06 +04:00
Dmitry Stogov 7b84d129d7 Merge branch 'PHP-5.5'
* PHP-5.5:
  An exception thrown in try or catch block is disacarded by return statement in finally block.
2012-12-13 02:52:23 +04:00
Remi Collet 1f73ce3ed6 Merge branch 'PHP-5.5'
* PHP-5.5:
  Really fix test pdo_mysql_class_constants.phpt
2012-12-12 16:58:51 +01:00
Dmitry Stogov e7364e14da Merge branch 'PHP-5.5'
* PHP-5.5:
  Restored proper generators behaviour in conjunction with "finally". (Nikita)
2012-12-12 17:50:01 +04:00
Leigh 349baa3da4 Fixed license
Looks like a find and replace gone wrong.
2012-12-12 12:14:52 +00:00
Remi Collet 261995e02a Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed Bug #63738 unpack: back result with Z format
2012-12-11 16:34:51 +01:00
Dmitry Stogov 2025021ed5 Merge branch 'PHP-5.5'
* PHP-5.5:
  - generators API exported for extensions - improved RETURN sequence to avoid redundant check if op_array is a generator
2012-12-11 17:28:09 +04:00
Adam Harvey b10460dc4b Merge branch 'PHP-5.5' 2012-12-11 19:58:04 +08:00
Adam Harvey ac0fb01a21 Merge branch 'PHP-5.5'
* PHP-5.5:
  Deprecate ext/mysql.
2012-12-10 22:26:17 +08:00
Johannes Schlüter ef7ab813d8 Merge branch 'PHP-5.5' 2012-12-10 13:36:20 +01:00
Johannes Schlüter ab2bfb6000 Merge branch 'PHP-5.5' 2012-12-10 13:34:45 +01:00
Xinchen Hui 80e585027e Merge branch 'PHP-5.5' 2012-12-10 20:31:01 +08:00
Xinchen Hui 107093e4a3 Merge branch 'PHP-5.5' 2012-12-10 18:35:44 +08:00
Dmitry Stogov 3067f54b27 Merge branch 'PHP-5.5'
* PHP-5.5:
  Generatirs are going to be used less than regular functions
2012-12-06 13:20:49 +04:00
Sebastian Bergmann 4f4262e9be Merge branch 'PHP-5.5' 2012-12-06 09:44:20 +01:00
Sebastian Bergmann 6fc2ecaaf2 Merge branch 'PHP-5.5' 2012-12-06 09:30:47 +01:00
Sara Golemon 5ac35770f4 Add UConverter class (ICU's UConverter API)
RFC at http://wiki.php.net/rfc/uconverter
2012-12-05 15:07:36 -08:00
Johannes Schlüter c058ed51e3 Merge branch 'PHP-5.5' 2012-12-05 19:03:15 +01:00
Dmitry Stogov 5ae182e349 Merge branch 'PHP-5.5'
* PHP-5.5:
  Use get_gc instead of hacks of get_properties
2012-12-05 18:00:00 +04:00
Dmitry Stogov 73601e21e1 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #63680 (Memleak in splfixedarray with cycle reference)
2012-12-05 17:56:10 +04:00
Dmitry Stogov 55e1a9786a Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed comments
2012-12-05 16:03:37 +04:00
Dmitry Stogov 4facafddbb Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Two tests deactivated until #63688 was fixed
2012-12-05 13:36:55 +04:00
Dmitry Stogov 77a9b9ac22 Merge branch 'PHP-5.5'
* PHP-5.5:
  Slight performance improvement
2012-12-05 13:36:28 +04:00
Anatoliy Belsky 9e50c54eec Merge branch 'PHP-5.5'
* PHP-5.5:
  Two tests deactivated until #63688 was fixed
2012-12-05 09:58:25 +01:00
Stanislav Malyshev fdd339677b Merge branch 'PHP-5.5'
* PHP-5.5:
  5.4.11-dev
2012-12-04 21:33:44 -08:00
Stanislav Malyshev 7883c07297 Merge branch 'PHP-5.5'
* PHP-5.5:
  update NEWS
2012-12-04 21:28:12 -08:00
Stanislav Malyshev 8277f0f3f0 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix bug #63666 - Poor date() performance
2012-12-04 21:03:14 -08:00
David Soria Parra 981bc6fd96 Merge branch 'PHP-5.5'
* PHP-5.5:
  News for enabling systemtap support on linux
2012-12-05 00:54:45 +01:00
David Soria Parra 808afd6db3 Merge branch 'PHP-5.5'
* PHP-5.5:
  Pass zend_execute_data instead of zend_op_array
2012-12-05 00:46:30 +01:00
David Soria Parra e4c1aa33ab Merge branch 'PHP-5.5'
* PHP-5.5:
  Overwrite execute_ex instead of execute in dtrace_execute
  Enable dtrace probes on linux as they are compatible with systemtap
2012-12-04 21:02:23 +01:00
Colin Viebrock 6eb0aa9794 fix for scrolling, other minor tweaks 2012-12-04 09:37:10 -06:00
Dmitry Stogov 4d5859558a Merge branch 'PHP-5.5'
* PHP-5.5:
  Increased version numbers
2012-12-04 10:48:49 +04:00
Dmitry Stogov f4263c2d0f Merge branch 'PHP-5.5'
* PHP-5.5:
  Moved zend_create_execute_data_from_op_array() implementation from zend_vm_execute.skl to zend_execute.c
2012-12-04 10:43:59 +04:00
Dmitry Stogov 3f47131fc6 Merge branch 'PHP-5.5'
* PHP-5.5:
  Optimized access to temporary and compiled VM variables
2012-12-04 10:35:52 +04:00
Remi Collet 65973c240e Merge branch 'PHP-5.5'
* PHP-5.5:
  Reduce case where this test will fails: - no connection AND no mysqli extension
2012-12-03 15:35:15 +01:00
Anatoliy Belsky 5619122fd2 Merge branch 'PHP-5.5'
* PHP-5.5:
  Revert the previous test fix
2012-12-03 15:16:54 +01:00
Remi Collet f78a68ff95 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix inifile.c:419:6: warning: variable 'ret' set but not used [-Wunused-but-set-variable] Please check this minor change.
  use php_stream_copy_to_stream_ex instead of deprecated php_stream_copy_to_stream
2012-12-03 13:39:58 +01:00
Anatoliy Belsky 243da297c3 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix test with a slightly different warning in TS
  Adding tests for private and protected properties
  Fixing test according to @jpauli's suggestions
  Adding regression test for behavior of magic methods with unset public properties

Conflicts:
	NEWS
2012-12-03 10:53:14 +01:00
Lars Strojny 87b8ee755a Merge branch 'PHP-5.5' 2012-12-02 19:52:16 +01:00
Lars Strojny d1b8c6df76 Merge branch 'PHP-5.4' 2012-12-02 19:41:55 +01:00
Remi Collet d77dab19eb Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed Bug #63435 Datetime::format('u') sometimes wrong by 1 microsecond
2012-12-01 10:26:55 +01:00
Felipe Pena 80004db65d Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fixed ZTS build
2012-11-30 09:07:47 -02:00
Dmitry Stogov 8cbe4f7e17 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #63066 (Calling an undefined method in a generator results in a seg fault) (fixed with previous commit).
2012-11-30 14:16:38 +04:00
Dmitry Stogov 3985f06115 Merge branch 'PHP-5.5'
* PHP-5.5:
  . The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 14:03:23 +04:00
Xinchen Hui db74b9c76e Merge branch 'PHP-5.5' 2012-11-30 14:50:35 +08:00
Xinchen Hui 79331f7533 Merge branch 'PHP-5.5' 2012-11-30 14:34:10 +08:00
Xinchen Hui d173909e88 Merge branch 'PHP-5.5' 2012-11-30 14:31:19 +08:00
Dmitry Stogov 2d458b2348 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #63271 (SOAP wsdl cache is not enabled after initial requests)
2012-11-29 16:45:22 +04:00
Dmitry Stogov 2cfe91f684 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #61557 (Crasher in tt-rss backend.php)
2012-11-29 14:43:46 +04:00
Dmitry Stogov 8b7df4bbd8 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #63635 (Segfault in gc_collect_cycles)
2012-11-29 13:48:44 +04:00
Remi Collet 351e80e753 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed Bug #63581 Possible buffer overflow
  Fixed Bug #63581 Possible null dereference
2012-11-28 10:39:23 +01:00
Remi Collet e4eb026834 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  BFN #61272
  fix bug #61272 ob_start callback get passed empty string
2012-11-28 10:32:23 +01:00
Michael Wallner 178e9919b2 Merge branch 'PHP-5.4' 2012-11-28 10:24:42 +01:00
Remi Collet 6c7c11c2cc Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  updated NEWS
  Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows
  This test isn't supposed to pass on windows
  Fixed Bug #63614 (Fatal error on Reflection)
2012-11-28 10:23:50 +01:00
Anatoliy Belsky df3e1fd484 Merge branch 'PHP-5.5'
* PHP-5.5:
  updated NEWS
  Fixed bug #63590 Fileinfo delivers ifferent results in TS and NTS under Windows

Conflicts:
	NEWS
2012-11-27 17:05:48 +01:00
Anatoliy Belsky 1e8b6536ab Merge branch 'PHP-5.5'
* PHP-5.5:
  This test isn't supposed to pass on windows
2012-11-27 16:14:00 +01:00
Xinchen Hui 344f228798 Merge branch 'PHP-5.5' 2012-11-27 13:38:38 +08:00
Remi Collet 23e1996a0e Merge branch 'PHP-5.5'
* PHP-5.5:
  Related bug #63588 fix length computation + optimize for speed
2012-11-26 13:06:00 +01:00
Remi Collet a45aad9f1f Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  count($test_files) already be checked above : if ($test_cnt)
2012-11-26 13:04:34 +01:00
Xinchen Hui 0fa937e106 Merge branch 'PHP-5.5' 2012-11-25 16:20:30 +08:00
Remi Collet 128cc30d85 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #63588 Duplicate implementation of php_next_utf8_char
2012-11-25 08:21:35 +01:00
Remi Collet 1550fd880e Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed Bug #63361 Header not installed
  NEWS entries
2012-11-25 07:49:27 +01:00
Xinchen Hui 62c3ef9c32 Merge branch 'PHP-5.5' 2012-11-25 12:05:09 +08:00
Xinchen Hui 20d7ef43f7 XFAIL test should not be considered as failed 2012-11-25 11:46:35 +08:00
Xinchen Hui f03a91226e let make test report the run-test result
(patch by reeze.xia@gmail.com)
2012-11-25 11:45:36 +08:00
Xinchen Hui f50f703571 Merge branch 'php.ini_text_fix' of https://github.com/BryanH/php-src 2012-11-25 11:24:32 +08:00
Stanislav Malyshev f3f4556cc6 Merge branch 'PHP-5.5'
* PHP-5.5:
  fix NEWS
  5.4.10-dev
2012-11-24 16:30:23 -08:00
Nikita Popov 6e1b84a646 Merge branch 'PHP-5.5' 2012-11-24 19:24:40 +01:00
Remi Collet 239416dd5d Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed Bug #63149 Feature missing with system SQLite
2012-11-24 17:57:08 +01:00
Remi Collet 5d0e82222e Merge branch 'PHP-5.5'
* PHP-5.5:
  add unit test for bug 63126
2012-11-24 17:35:30 +01:00
Remi Collet 122e2657e0 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed Bug #63126 DISABLE_AUTHENTICATOR ignores array
2012-11-24 15:04:22 +01:00
Anatoliy Belsky 35c0928334 Merge branch 'PHP-5.5'
* PHP-5.5:
  Backported the fix for bug #63248 from 5.4+
2012-11-23 14:02:11 +01:00
Anatoliy Belsky 3a83926ec1 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed test for bug #63297
2012-11-22 19:06:19 +01:00
Dmitry Stogov ffc1f5b2cd Merge branch 'PHP-5.5'
* PHP-5.5:
  Improved "finally" im[plementation
2012-11-22 15:39:48 +04:00
Johannes Schlüter 015ee80606 Merge branch 'PHP-5.5' 2012-11-21 21:11:44 +01:00
David Soria Parra fe17de54a2 Merge branch 'PHP-5.5'
* PHP-5.5:
  Add myself to QA
2012-11-21 18:42:18 +01:00
Xinchen Hui 458b71e3ee Merge branch 'PHP-5.5' 2012-11-21 12:31:16 +08:00
Xinchen Hui e27314e9fa Merge branch 'PHP-5.5'
Conflicts:
	UPGRADING
2012-11-21 12:20:21 +08:00
Adam Harvey 74d9254ecc Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Fixed bug #63468 (wrong called method as callback with inheritance)
  Add actual branch version number to UPGRADING
  Remove PHP 5.5 changes from master UPGRADING
  Put the new php.ini directives together.
  Move the deprecated functions up to the Deprecated Functionality section so they're more visible.
  Regenerate Zend ini scanner
  Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value
  Fixed ext/intl/tests/timezone_createDefault_basic.phpt
  Skip test if directory does not exist
2012-11-21 09:22:03 +08:00
Dmitry Stogov 51abbe5dea Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #63468 (wrong called method as callback with inheritance)
  Add actual branch version number to UPGRADING
  Put the new php.ini directives together.
  Move the deprecated functions up to the Deprecated Functionality section so they're more visible.

Conflicts:
	UPGRADING
2012-11-20 13:17:21 +04:00
Christopher Jones ca418b233c Remove PHP 5.5 changes from master UPGRADING 2012-11-18 14:28:26 -08:00
Christopher Jones faa7b32ba4 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Regenerate Zend ini scanner
  Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value
2012-11-18 14:21:01 -08:00
Pierrick Charron 82183b7f62 Merge branch 'PHP-5.5'
* PHP-5.5:
  Regenerate Zend ini scanner
2012-11-16 18:29:59 -05:00
Pierrick Charron a4c52f0678 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value
2012-11-16 18:09:51 -05:00
Christopher Jones 05317c5986 Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
  Fixed ext/intl/tests/timezone_createDefault_basic.phpt
  Skip test if directory does not exist
  Fixed ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
  Leftover: Bump version to 5.6.0
  Fixed test sapi/cli/tests/006.phpt
  Fixed compiler reenterability
  Fixed compiler reenterability
  Updated NEWS
  UPdated NEWS
  Updated NEWS
2012-11-15 19:29:56 -08:00
Anatoliy Belsky 6311a864d2 Merge branch 'PHP-5.5' 2012-11-15 14:36:55 +01:00
Johannes Schlüter 358e8e18ab Merge branch 'PHP-5.5' 2012-11-15 12:30:10 +01:00
Adam Harvey f55019f1f7 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src: (24 commits)
  Fixed ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
  Leftover: Bump version to 5.6.0
  Fixed test sapi/cli/tests/006.phpt
  Fixed compiler reenterability
  Fixed compiler reenterability
  Updated NEWS
  UPdated NEWS
  Updated NEWS
  Bump API versions
  Bump version to 5.6.0
  Enabled apache 2.4 handler build option
  Bump version to 5.5.99 and reset NEWS
  Build .xz archive during makedist
  NEWS: remove dots at the end of the NEWS file
  PHP-5.5 is open
  Add missing parts from UPGRADING to NEWS
  Fixed sockets ext build on win
  - Updated to version 2012.10 (2012j)
  List ext/intl changes also in NEWS
  Update arginfo for preg_match_all() to reflect reality.
  ...
2012-11-15 09:31:45 +08:00
Anatoliy Belsky 8b6e0c4808 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt
2012-11-14 21:31:53 +01:00
Sebastian Bergmann 79726be67d Leftover: Bump version to 5.6.0 2012-11-14 16:50:33 +01:00
Anatoliy Belsky b27ef7a4f5 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed test sapi/cli/tests/006.phpt
2012-11-14 16:25:29 +01:00
Dmitry Stogov a6ab007435 Merge branch 'PHP-5.5'
* PHP-5.5:
  Fixed compiler reenterability
  Fixed compiler reenterability
2012-11-14 18:42:12 +04:00
Anatoliy Belsky 45b9ae5f83 Merge branch 'PHP-5.5'
* PHP-5.5:
  Updated NEWS
  UPdated NEWS
  Updated NEWS
2012-11-14 10:17:15 +01:00
David Soria Parra 2e6a4a286e Merge branch 'PHP-5.5'
* PHP-5.5:
  Bump API versions
2012-11-13 20:58:51 +01:00
David Soria Parra d71577d2df Bump version to 5.6.0 2012-11-13 20:43:08 +01:00
Anatoliy Belsky 4259f89b12 Merge branch 'PHP-5.5'
* PHP-5.5:
  Enabled apache 2.4 handler build option
2012-11-13 19:49:10 +01:00
David Soria Parra 012519839a Bump version to 5.5.99 and reset NEWS 2012-11-13 17:42:01 +01:00
David Soria Parra ac0c20e4f8 Merge branch 'PHP-5.5'
* PHP-5.5:
  Build .xz archive during makedist
  NEWS: remove dots at the end of the NEWS file
  PHP-5.5 is open
  Add missing parts from UPGRADING to NEWS
2012-11-13 17:35:45 +01:00
Bryan Hanks, PMP e7f8f7c01c Corrected spelling of 'shortcut' 2012-11-12 13:12:13 -06:00
Bryan Hanks, PMP d0727b58da Corrected grammar/spelling of text in php.ini files
There are no actual code changes here; I corrected grammar and spelling
errors in the php.ini-production and php.ini-development files. I also
rewrote some sentences to make them less cumbersome.
2012-11-12 13:04:32 -06:00
Adam Harvey 9b433e356f Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  make failed tests fail the test target
  fix invalid read when trimming empty string
  - Fixed bug #63451 (config.guess file does not have AIX 7 defined, shared objects are not created)
2012-11-12 09:10:47 +08:00
Colin Viebrock 65411432bc Bump up table width a bit more and make columns consistent 2012-11-09 10:04:50 -06:00
Adam Harvey 509f3fe221 Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  This will be PHP 5.3.20
  fix NEWS
  Fixed bug #63447 (max_input_vars doesn't filter variables when mbstring.encoding_translation = On)
  News entry for png memleak fix
  News entry for png memleak fix
  These need to be volatile in order to prevent leaking after the longjmp in the error handler
  These need to be volatile in order to prevent leaking after the longjmp in the error handler
2012-11-09 17:27:05 +08:00
Colin Viebrock ff93287fff Bringing CSS up to this decade's standards.
Here are some tweaks to the phpinfo() styling, since this really hasn't
been touched in almost a decade:
- color codes are shortened
- table width is bigger and handled via CSS
- fix so that long INI entries don't make the layout super wide
- bgcolor for "Additional Modules" wasn't set
- fix my email address

Signed-off-by: Colin Viebrock <colin@viebrock.ca>
2012-11-08 12:08:45 -06:00
1975 changed files with 156838 additions and 105863 deletions

No files matched your search

+2 -2
View File
@@ -106,7 +106,7 @@ define dump_bt
printf "%ld", $zvalue->value.lval
end
if $type == 2
printf "%lf", $zvalue->value.dval
printf "%f", $zvalue->value.dval
end
if $type == 3
if $zvalue->value.lval
@@ -185,7 +185,7 @@ define ____printzv_contents
printf "long: %ld", $zvalue->value.lval
end
if $type == 2
printf "double: %lf", $zvalue->value.dval
printf "double: %f", $zvalue->value.dval
end
if $type == 3
printf "bool: "
+2
View File
@@ -246,6 +246,8 @@ sapi/fpm/php-fpm.1
sapi/fpm/init.d.php-fpm
sapi/fpm/php-fpm.conf
sapi/fpm/fpm/php-cgi
sapi/phpdbg/phpdbg_parser.c
sapi/phpdbg/phpdbg_parser.h
sapi/phpdbg/phpdbg
scripts/php-config
scripts/phpize
+5 -1
View File
@@ -25,6 +25,8 @@ env:
- ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1
before_install:
- sudo apt-get update -qq
- sudo apt-get install -y libenchant-dev libaspell-dev libpspell-dev librecode-dev
- sudo cp ./travis/de /var/lib/locales/supported.d/de
- sudo dpkg-reconfigure locales
@@ -39,4 +41,6 @@ before_script:
- . ./travis/ext/pdo_pgsql/setup.sh
# Run PHPs run-tests.php
script: ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --show-diff --set-timeout 120
script:
- ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --show-diff --set-timeout 120
- ./sapi/cli/php sapi/phpdbg/tests/run-tests.php -diff2stdout --phpdbg sapi/phpdbg/phpdbg
+4 -1
View File
@@ -279,7 +279,10 @@ The file labelled 'EXPERIMENTAL' should include the following
information::
Any authoring information (known bugs, future directions of the module).
Ongoing status notes which may not be appropriate for SVN comments.
Ongoing status notes which may not be appropriate for Git comments.
In general new features should go to PECL or experimental branches until
there are specific reasons for directly adding it to the core distribution.
Aliases & Legacy Documentation
-----------------------------------
+1 -1
View File
@@ -120,7 +120,7 @@ clean:
distclean: clean
rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c stamp-h sapi/apache/libphp$(PHP_MAJOR_VERSION).module sapi/apache_hooks/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h
rm -f php5.spec main/build-defs.h scripts/phpize
rm -f ext/date/lib/timelib_config.h ext/mbstring/oniguruma/config.h ext/mbstring/libmbfl/config.h ext/mysqlnd/php_mysqlnd_config.h
rm -f ext/date/lib/timelib_config.h ext/mbstring/oniguruma/config.h ext/mbstring/libmbfl/config.h ext/oci8/oci8_dtrace_gen.h ext/oci8/oci8_dtrace_gen.h.bak
rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 ext/phar/phar.1 ext/phar/phar.phar.1
rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html
rm -f ext/iconv/php_have_bsd_iconv.h ext/iconv/php_have_glibc_iconv.h ext/iconv/php_have_ibm_iconv.h ext/iconv/php_have_iconv.h ext/iconv/php_have_libiconv.h ext/iconv/php_iconv_aliased_libiconv.h ext/iconv/php_iconv_supports_errno.h ext/iconv/php_php_iconv_h_path.h ext/iconv/php_php_iconv_impl.h
+11 -9214
View File
File diff suppressed because it is too large. Load diff
-47
View File
@@ -1,47 +0,0 @@
This file describes extension module API details. Refer to
README.EXT_SKEL to create extension skeleton files. Refer to
Hacker's Guide for PHP internals.
http://www.php.net/manual/en/internals2.php
Between PHP 4.0.6 and 4.1.0, the Zend module struct changed in a way
that broke both source and binary compatibility. If you are
maintaining a third party extension, here's how to update it:
If this was your old module entry:
zend_module_entry foo_module_entry = {
"foo", /* extension name */
foo_functions, /* extension function list */
NULL, /* extension-wide startup function */
NULL, /* extension-wide shutdown function */
PHP_RINIT(foo), /* per-request startup function */
PHP_RSHUTDOWN(foo), /* per-request shutdown function */
PHP_MINFO(foo), /* information function */
STANDARD_MODULE_PROPERTIES
};
Here's how it should look if you want your code to build with PHP
4.1.0 and up:
zend_module_entry foo_module_entry = {
#if ZEND_MODULE_API_NO >= 20010901
STANDARD_MODULE_HEADER,
#endif
"foo", /* extension name */
foo_functions, /* extension function list */
NULL, /* extension-wide startup function */
NULL, /* extension-wide shutdown function */
PHP_RINIT(foo), /* per-request startup function */
PHP_RSHUTDOWN(foo), /* per-request shutdown function */
PHP_MINFO(foo), /* information function */
#if ZEND_MODULE_API_NO >= 20010901
PHP_FOO_VERSION, /* extension version number (string) */
#endif
STANDARD_MODULE_PROPERTIES
};
If you don't care about source compatibility with earlier PHP releases
than 4.1.0, you can drop the #if/#endif lines.
+35 -31
View File
@@ -58,13 +58,14 @@ Type specifiers
zend_fcall_info and zend_fcall_info_cache)
h - array (returned as HashTable*)
H - array or HASH_OF(object) (returned as HashTable*)
l - long (long)
L - long, limits out-of-range numbers to LONG_MAX/LONG_MIN (long)
i - php_int_t (zend_int_t), platform dependent
I - php_int_t, limits out-of-range numbers to ZEND_INT_MAX/ZEND_INT_MIN (zend_int_t),
platform dependent
o - object of any type (zval*)
O - object of specific type given by class entry (zval*, zend_class_entry)
p - valid path (string without null bytes in the middle) and its length (char*, int)
P - valid path (string without null bytes in the middle) and its length (char*, php_size_t)
r - resource (zval*)
s - string (with possible null bytes) and its length (char*, int)
S - string (with possible null bytes) and its length (char*, php_size_t)
z - the actual zval (zval*)
Z - the actual zval (zval**)
* - variable arguments list (0 or more)
@@ -79,30 +80,33 @@ Type specifiers
! - the parameter it follows can be of specified type or NULL. If NULL is
passed and the output for such type is a pointer, then the output
pointer is set to a native NULL pointer.
For 'b', 'l' and 'd', an extra argument of type zend_bool* must be
passed after the corresponding bool*, long* or double* arguments,
For 'b', 'i' and 'd', an extra argument of type zend_bool* must be
passed after the corresponding bool*, php_int_t* or double* arguments,
respectively. A non-zero value will be written to the zend_bool iif a
PHP NULL is passed.
Note on 64bit compatibility
---------------------------
Please do not forget that int and long are two different things on 64bit
OSes (int is 4 bytes and long is 8 bytes), so make sure you pass longs to "l"
and ints to strings length (i.e. for "s" you need to pass char * and int),
not the other way round!
Remember: "l" is the only case when you need to pass long (and that's why
it's "l", not "i" btw).
Please do not forget that php_int_t and php_size_t are platform dependent,
you can consult Zend/zend_int.h for which type exactly these are mapped to.
In previous versions, long was used for integers and int for string
sizes. Now make sure you pass php_int_t to "i" and php_size_t to strings length
(i.e. for "S" you need to pass char * and php_size_t), not the other way round!
Remember: "i" is the only case when you need to pass platform depnedent integer
(and that's why it's "i", not "l" anymore). The old formats 'l' and 's' aren't
supported anymore. Passing int instead of php_size_t, or long instead of
php_int_t is wrong.
Both mistakes cause memory corruptions and segfaults on 64bit OSes:
1)
char *str;
long str_len; /* XXX THIS IS WRONG!! Use int instead. */
zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &str_len)
int str_len; /* XXX THIS IS WRONG!! Use php_size_t instead. */
zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &str, &str_len)
2)
int num; /* XXX THIS IS WRONG!! Use long instead. */
zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &num)
long num; /* XXX THIS IS WRONG!! Use php_int_t instead. */
zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "i", &num)
If you're in doubt, use check_parameters.php script to the parameters
and their types (it can be found in ./scripts/dev/ directory of PHP sources):
@@ -112,12 +116,12 @@ and their types (it can be found in ./scripts/dev/ directory of PHP sources):
Examples
--------
/* Gets a long, a string and its length, and a zval */
long l;
/* Gets a php_int_t, a string and its length, and a zval */
php_int_t i;
char *s;
int s_len;
php_size_t s_len;
zval *param;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lsz",
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "iSz",
&l, &s, &s_len, &param) == FAILURE) {
return;
}
@@ -150,8 +154,8 @@ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/!",
return;
}
/* Get either a set of 3 longs or a string. */
long l1, l2, l3;
/* Get either a set of 3 php_int_t vars or a string. */
php_int_t i1, i2, i3;
char *s;
/*
* The function expects a pointer to a integer in this case, not a long
@@ -160,13 +164,13 @@ char *s;
* properly, leading to random crashes on platforms like
* Tru64 or Linux/Alpha.
*/
int length;
php_size_t length;
if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC,
"lll", &l1, &l2, &l3) == SUCCESS) {
/* manipulate longs */
"iii", &i1, &i2, &i3) == SUCCESS) {
/* manipulate php_int_t */
} else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC,
"s", &s, &length) == SUCCESS) {
"S", &s, &length) == SUCCESS) {
/* manipulate string */
} else {
/* output error */
@@ -197,11 +201,11 @@ if (varargs) {
/* Function that accepts a string, followed by varargs (1 or more) */
char *str;
int str_len;
php_size_t str_len;
int i, num_varargs;
zval ***varargs = NULL;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s+", &str, &str_len, &varargs, &num_varargs) == FAILURE) {
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S+", &str, &str_len, &varargs, &num_varargs) == FAILURE) {
return;
}
@@ -214,13 +218,13 @@ if (varargs) {
}
/* Function that takes an array, followed by varargs, and ending with a long */
long num;
/* Function that takes an array, followed by varargs, and ending with a php_int_t */
php_int_t num;
zval *array;
int i, num_varargs;
zval ***varargs = NULL;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a*l", &array, &varargs, &num_varargs, &num) == FAILURE) {
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a*i", &array, &varargs, &num_varargs, &num) == FAILURE) {
return;
}
-155
View File
@@ -1,155 +0,0 @@
1. strrpos() and strripos() now use the entire string as a needle. Be aware
that the existing scripts may no longer work as you expect.
EX :
<?php
var_dump(strrpos("ABCDEF","DEF"));
var_dump(strrpos("ABCDEF","DAF"));
?>
Will give you different results. The former returns 3 while the latter
returns false rather than the position of the last occurrence of 'D'.
The same applies to strripos().
2. Illegal use of string offsets causes E_ERROR instead of E_WARNING.
EX :
<?php
$a = "foo";
unset($a[0][1][2]);
?>
Fatal error: Cannot use string offset as an array in ... on line 1
3. array_merge() was changed to accept only arrays. If a non-array variable is
passed, a E_WARNING will be thrown for every such parameter. Be careful
because your code may start emitting E_WARNING out of the blue.
4. Be careful when porting from ext/mysql to ext/mysqli. The following
functions return NULL when no more data is available in the result set
(ext/mysql's functions return FALSE).
- mysqli_fetch_row()
- mysqli_fetch_array()
- mysqli_fetch_assoc()
5. PATH_TRANSLATED server variable is no longer set implicitly under
Apache2 SAPI in contrast to the situation in PHP 4, where it is set to the
same value as the SCRIPT_FILENAME server variable when it is not populated
by Apache. This change was made to comply with the CGI specification.
Please refer to bug #23610 for further information.
6. Starting PHP 5.0.0 the T_ML_CONSTANT constant is no longer defined by the
ext/tokenizer extension. If error_reporting is set to E_ALL notices will
be produced. Instead of T_ML_CONSTANT for /* */ the T_COMMENT constant
is used, thus both // and /* */ are resolved as the T_COMMENT constant.
However the PHPDoc style comments /** */ ,which starting PHP 5 are parsed
by PHP, are recongnized as T_DOC_COMMENT.
7. $_SERVER should be populated with argc and argv if variables_order
includes "S". If you have specifically configured your system to not
create $_SERVER, then of course it shouldn't be there. The change was to
always make argc and argv available in the CLI version regardless of the
variables_order setting. As in, the CLI version will now always populate
the global $argc and $argv variables.
8. In some cases classes must be declared before used. It only happens only
if some of the new features of PHP 5 are used. Otherwise the behaviour is
the old.
Example 1 (works with no errors):
<?php
$a = new a();
class a {
}
?>
Example 2 (throws an error):
<?php
$a = new a();
interface b{
}
class a implements b {
}
?>
Output (example 2) :
Fatal error: Class 'a' not found in /tmp/cl.php on line 2
9. get_class() starting PHP 5 returns the name of the class as it was
declared which may lead to problems in older scripts that rely on
the previous behaviour - the class name is lowercased. Expect the
same behaviour from get_parent_class() when applicable.
Example :
<?php
class FooBar {
}
class ExtFooBar extends FooBar{}
$a = new FooBar();
var_dump(get_class($a), get_parent_class($a));
?>
Output (PHP 4):
string(6) "foobar"
string(9) "extfoobar"
Output (PHP 5):
string(6) "FooBar"
string(9) "ExtFooBar"
----------------------------------------------------------------------
Example code that will break :
//....
function someMethod($p) {
if (get_class($p) != 'helpingclass') {
return FALSE;
}
//...
}
//...
Possible solution is to search for get_class() and get_parent_class() in
all your scripts and use strtolower().
10. get_class_methods() returns the names of the methods of a class as they
declared. In PHP4 the names are all lowercased.
Example code :
<?php
class Foo{
function doFoo(){}
function hasFoo(){}
}
var_dump(get_class_methods("Foo"));
?>
Output (PHP4):
array(2) {
[0]=>
string(5) "dofoo"
[1]=>
string(6) "hasfoo"
}
Output (PHP5):
array(2) {
[0]=>
string(5) "doFoo"
[1]=>
string(6) "hasFoo"
}
11. Assignment $this is impossible. Starting PHP 5.0.0 $this has special
meaning in class methods and is recognized by the PHP parser. The latter
will generate a parse error when assignment to $this is found
Example code :
<?php
class Foo {
function assignNew($obj) {
$this = $obj;
}
}
$a = new Foo();
$b = new Foo();
$a->assignNew($b);
echo "I was executed\n";
?>
Output (PHP 4):
I was executed
Output (PHP 5):
PHP Fatal error: Cannot re-assign $this in /tmp/this_ex.php on line 4
+1 -1
View File
@@ -46,7 +46,7 @@ Opening Streams
===============
In most cases, you should use this API:
PHPAPI php_stream *php_stream_open_wrapper(char *path, char *mode,
PHPAPI php_stream *php_stream_open_wrapper(const char *path, const char *mode,
int options, char **opened_path TSRMLS_DC);
Where:
+14 -14
View File
@@ -5,7 +5,7 @@ This document describes how to submit an enhancement or patch for PHP.
It's easy!
You don't need any login accounts or special access to download,
build, debug and begin submitting PHP, PECL or PEAR code, tests or
build, debug and begin submitting PHP or PECL code, tests or
documentation. Once you've followed this README and had several
patches accepted, commit privileges are often quickly granted.
@@ -16,8 +16,8 @@ http://phpadvent.org/2008/less-whining-more-coding-by-elizabeth-smith
Online Forums
-------------
There are several IRC channels where PHP developers are often
available to discuss questions. They include #php.pecl, #php.doc and
#pear on the EFNet network and #php-dev-win on FreeNode.
available to discuss questions. They include #php.pecl and #php.doc
on the EFNet network and #php-dev-win on FreeNode.
PHP Patches
@@ -89,7 +89,7 @@ of type 'text/*' are accepted.
PECL Extension Patches: http://pecl.php.net/
--------------------------------------------
If you are fixing broken functionality in a PECL extension then create
a bug or identify an existing bug at http://pecl.php.net/bugs/. A bug
a bug or identify an existing bug at http://bugs.php.net/. A bug
can be used to track the patch progress and prevent your changes
getting lost in the PHP mail archives.
@@ -125,15 +125,15 @@ http://pear.php.net/manual/en/guide-developers.php
How to create your PHP, PHP Documentation or PECL patch
-------------------------------------------------------
PHP and PECL use Subversion (SVN) for revision control. Read
http://www.php.net/svn.php for help on using SVN to get and build PHP
source code. We recommend using a Sparse Directory checkout described
in http://wiki.php.net/vcs/svnfaq. If you are new to SVN, read
http://svnbook.red-bean.com.
PHP and most PECL packages use Git for revision control. Some PECL
packages use Subversion (SVN) Read http://www.php.net/git.php for help
on using Git to get and build PHP source code. We recommend to look
at our workflow on https://wiki.php.net/vcs/gitworkflow and our FAQ
https://wiki.php.net/vcs/gitfaq.
Generally we ask that bug fix patches work on the current stable PHP
development branches and on "trunk". New PHP features only need to
work on "trunk".
development branches and on "master". New PHP features only need to
work on "master".
Read CODING_STANDARDS before you start working.
@@ -145,7 +145,7 @@ comprehensive.
After testing is finished, create a patch file using the command:
svn diff > your_patch.txt
git diff > your_patch.txt
For ease of review and later troubleshooting, submit individual
patches for each bug or feature.
@@ -153,7 +153,7 @@ patches for each bug or feature.
Checklist for submitting your PHP or PECL code patch
----------------------------------------------------
- Update SVN source just before running your final 'diff' and
- Update git source just before running your final 'diff' and
before testing.
- Add in-line comments and/or have external documentation ready.
Use only "/* */" style comments, not "//".
@@ -186,7 +186,7 @@ about these questions:
What happens when your PHP or PECL patch is applied
---------------------------------------------------
Your name will likely be included in the SVN commit log. If your
Your name will likely be included in the Git commit log. If your
patch affects end users, a brief description and your name might be
added to the NEWS file.
+1 -1
View File
@@ -1,6 +1,6 @@
## process this file with automake to produce Makefile.am
AUTOMAKE_OPTIONS=foreign
noinst_LTLIBRARIES=libtsrm.la
libtsrm_la_SOURCES = TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c
libtsrm_la_SOURCES = TSRM.c tsrm_strtok_r.c
depend:
-8
View File
@@ -143,10 +143,6 @@ SOURCE=.\tsrm_strtok_r.c
# End Source File
# Begin Source File
SOURCE=.\tsrm_virtual_cwd.c
# End Source File
# Begin Source File
SOURCE=.\tsrm_win32.c
# End Source File
# End Group
@@ -175,10 +171,6 @@ SOURCE=.\tsrm_strtok_r.h
# End Source File
# Begin Source File
SOURCE=.\tsrm_virtual_cwd.h
# End Source File
# Begin Source File
SOURCE=.\tsrm_win32.h
# End Source File
# End Group
+1 -1
View File
@@ -64,7 +64,7 @@ typedef int ts_rsrc_id;
/* Define THREAD_T and MUTEX_T */
#ifdef TSRM_WIN32
# define THREAD_T DWORD
# define THREAD_T UINT_PTR
# define MUTEX_T CRITICAL_SECTION *
#elif defined(GNUPTH)
# define THREAD_T pth_t
+1 -1
View File
@@ -1,5 +1,5 @@
// vim:ft=javascript
// $Id$
ADD_SOURCES("TSRM", "TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c tsrm_win32.c");
ADD_SOURCES("TSRM", "TSRM.c tsrm_strtok_r.c tsrm_win32.c");
+1 -1
View File
@@ -32,7 +32,7 @@
#ifdef TSRM_WIN32
#include <Sddl.h>
#include "tsrm_win32.h"
#include "tsrm_virtual_cwd.h"
#include "zend_virtual_cwd.h"
#ifdef ZTS
static ts_rsrc_id win32_globals_id;
+28 -482
View File
@@ -1,20 +1,18 @@
$Id$
PHP 5.5 UPGRADE NOTES
PHP X.Y UPGRADE NOTES
1. Backward Incompatible Changes
2. New Features
2. Changes in SAPI modules
3. Deprecated Functionality
4. Changed Functions
a. unserialize() change
5. New Functions
6. New Classes and Interfaces
7. Removed Extensions
8. Other Changes to Extensions
9. New Global Constants
10. Changes to INI File Handling
11. Windows Support
1. Backward Incompatible Changes
2. New Features
3. Changes in SAPI modules
4. Deprecated Functionality
5. Changed Functions
6. New Functions
7. New Classes and Interfaces
8. Removed Extensions
9. Other Changes to Extensions
10. New Global Constants
11. Changes to INI File Handling
12. Other Changes
@@ -22,517 +20,65 @@ PHP 5.5 UPGRADE NOTES
1. Backward Incompatible Changes
========================================
- Dropped Windows XP and 2003 support. (Pierre)
- All internal case insensitivity handling for class, function and constant
names is done according to ASCII rules. Current locale settings are ignored.
- self, parent & static keywords now are always case-insensitive (see bug
#60833).
- Removed Logo GUIDs: php_logo_guid(), php_egg_logo_guid(),
php_real_logo_guid() and zend_logo_guid()
- DBA
. dba_delete() now returns false if the key was not found for the inifile
handler, too.
========================================
2. New Features
========================================
- Support list in foreach. (Laruence)
(http://php.net/foreach#control-structures.foreach.list,
http://wiki.php.net/rfc/foreachlist)
- Support "finally" keyword. (Laruence)
(http://php.net/exceptions, http://wiki.php.net/rfc/finally)
- Support constant array/string dereferencing. (Laruence)
(http://php.net/manual/en/language.types.array.php,
https://wiki.php.net/rfc/constdereference)
- Add support for using empty() on the result of function calls and
other expressions. Thus it is now possible to write empty(getArray()),
for example. (http://php.net/manual/en/function.empty.php,
https://wiki.php.net/rfc/empty_isset_exprs)
- Added generators.
(http://php.net/generators, https://wiki.php.net/rfc/generators)
- ClassName::class syntax returning full class name for a class as a
string constant. (http://php.net/oop5.basic,
https://wiki.php.net/rfc/class_name_scalars)
- Added support for non-scalar Iterator keys in foreach.
(http://php.net/manual/en/control-structures.foreach.php,
https://wiki.php.net/rfc/foreach-non-scalar-keys).
- Bundled Zend OPcache extension to improve performance
(http://php.net/manual/en/book.opcache.php,
https://wiki.php.net/rfc/optimizerplus)
- Added a simplified password hashing API
(http://php.net/password, https://wiki.php.net/rfc/password_hash)
========================================
2. Changes in SAPI modules
3. Changes in SAPI modules
========================================
- Support for changing the process's title in CLI/CLI-Server
SAPIs. (Keyur)
(http://php.net/manual/en/function.cli-set-process-title.php,
http://php.net/manual/en/function.cli-get-process-title.php,
https://wiki.php.net/rfc/cli_process_title)
- Support for systemd in php-fpm: Add --with-fpm-systemd option to
report health to systemd, and add systemd_interval option to
configure this. The service can now use Type=notify in the systemd
unit file. (Remi)
- Support for several XML MIME types in the built-in CLI server. For static
files with extensions .xml, .xsl, .xsd the Content-Type header
application/xml is now sent automatically.
========================================
3. Deprecated Functionality
4. Deprecated Functionality
========================================
- The original MySQL extension is now deprecated and will generate
deprecation warnings when connecting to a database through
mysql_connect(), mysql_pconnect() or by establishing an implicit
connection. Use MySQLi or PDO instead.
- The preg_replace /e modifier is now deprecated. Use
preg_replace_callback instead.
(https://wiki.php.net/rfc/remove_preg_replace_eval_modifier)
- IntlDateFormatter::setTimeZoneID() and datefmt_set_timezone_id() are
deprecated. Use IntlDateFormatter::setTimeZone() or
datefmt_set_timezone() instead.
- mcrypt_ecb(), mcrypt_cbc(), mcrypt_cfb() and mcrypt_ofb() now throw
E_DEPRECATED. Their use was already previously discouraged in the
documentation, but that predated the existence of E_DEPRECATED.
========================================
4. Changed Functions
5. Changed Functions
========================================
- pack()/unpack() had the following changes, which bring it more in
line with Perl's behavior: - Implemented format character "Z": NULL
padded string, with trailing NULL bytes removed. - Changed format
character "a": this no longer removes trailing NULL bytes. -
Changed format character "A": all trailing ASCII whitespace is now
removed (defined as spaces, tabs, \r, \n and NULL).
- MessageFormatter::format() and related functions now accepted named
arguments and mixed numeric/named arguments in ICU 4.8+.
- MessageFormatter::format() and related functions now don't error out
when an insufficient argument count is provided. Instead, the
placeholders will remain unsubstituted.
- MessageFormatter::parse() and MessageFormat::format() (and their
static equivalents) now don't throw away better than second
precision in the arguments.
- IntlDateFormatter::__construct and datefmt_create() now accept for
the $timezone argument time zone identifiers, IntlTimeZone objects,
DateTimeZone objects and NULL. It used to accept only time zone
identifiers and NULL. Invalid time zone identifiers are no longer
accepted. Empty strings are no longer accepted.
- The default time zone used in IntlDateFormatter::__construct and
datefmt_create() (when the corresponding argument is not passed or
NULL is passed) is now the one given by date_default_timezone_get(),
not the default ICU time zone.
- The time zone passed to the IntlDateFormatter is ignored if it is
NULL and if the calendar passed is an IntlCalendar object -- in this
case, the IntlCalendar's time zone will be used instead. Otherwise,
the time zone specified in the $timezone argument is used
instead. This does not affect old code, as IntlCalendar was
introduced in this version.
- IntlDateFormatter::__construct and datefmt_create() now accept for
the $calendar argument also IntlCalendar objects.
- IntlDateFormatter::getCalendar() and datefmt_get_calendar() return
false if the IntlDateFormatter was set up with an IntlCalendar
instead of the constants
IntlDateFormatter::GREGORIAN/TRADITIONAL. IntlCalendar did not exist
before this version.
- IntlDateFormatter::setCalendar() and datefmt_set_calendar() now also
accept an IntlCalendar object, in which case its time zone is
taken. Passing a constant is still allowed, and still keeps the time
zone.
- IntlDateFormatter::format() and datefmt_format() now also accept an
IntlCalendar object for formatting.
- set_error_handler(NULL) can now be used to reset the error handler.
Furthermore both set_error_handler(NULL) and
set_exception_handler(NULL) will now return the previously defined
error/exception handler. Previously bool(true) was returned.
- setcookie(), setrawcookie() and ext/session now send Max-Age headers
alongside Expires headers. (see
https://wiki.php.net/rfc/cookie_max-age)
- curl_setopt now accepts new option CURLOPT_SAFE_UPLOAD and CURLFile
object for safer file uploads (see
https://wiki.php.net/rfc/curl-file-upload)
- Functions in the socket extension now do not emit warnings when the
errno is EAGAIN, EWOULDBLOCK or EINPROGRESS.
- Since 5.5.2, spl_autoload_functions() returns different names for
different lambda functions registered via spl_autoload_register().
- Since 5.5.3, DOMDocument::schemaValidateSource() and
DOMDocument::schemaValidate() accept flag parameter. Only flag
available now is LIBXML_SCHEMA_CREATE. Default is 0.
- Since 5.5.4, fputcsv() has fifth parameter escape_char, allowing to
specify escape char.
4a. unserialize() change
------------------------
- Starting PHP 5.5.13, the bug fix for bug #67072 introduces a change to
unserialize() function, detailed below:
If the string looking like 'O:..:"ClassName":...' is unserialized, and
the class named is an internal class that declares custom unserializer
function, or extends such class, unserialize would fail.
Using O: for user classes not extending internal classes (including
those implementing Serializable) is still supported in 5.4, though
it is deprecated and may not be supported in 5.6 for classes that do not
originally serialize to O:. Same for using O: for internal classes
implementing Serializable (like ArrayObject) and classes that extend
them.
The reason for that is that O: format is meant to be used with classes
that do not define custom handlers, and was never intended for the use
with classes that do. When used with the class that relies on custom
unserializer, it can leave the object of such internal class in an
inconsistent state which has been observed to result in crashes and may
also lead to memory corruption and ultimately even arbitrary code
execution. This was never the intended use of unserializer, and mere
possibility of doing this constitutes a bug, since the data passed to
unserialize() is not a valid serialization of any object. Since there
are many applications applying unserialize() to untrusted data, this
presents a potential security vulnerability. Thus, keeping such bug in
the code base was considered too dangerous.
We are aware that some applications use O: format as a way to
instantiate classes. This was never the intended usage of serializer,
and ReflectionClass methods such as newInstance or
newInstanceWithoutConstructor can be used for that. We're working on
providing more comprehensive solution for such use cases in PHP 5.6 and
welcome the ideas in this area.
We note also that using unserialize() on any data that is not the result
of serialize() call continues to be an unsupported scenario and should
not be relied on to produce any specific result.
========================================
5. New Functions
6. New Functions
========================================
- Core:
- array_column()
- boolval()
- password_get_info()
- password_hash()
- password_needs_rehash()
- password_verify()
- cURL:
- curl_file_create
- GD
- imageflip
- imagecrop
- imagecropauto
- imagesetinterpolation
- imageaffine
- imageaffinematrixget
- imageaffinematrixconcat
- imagescale
- Hash:
- hash_pbkdf2()
- Intl:
- datefmt_format_object()
- datefmt_get_calendar_object()
- datefmt_get_timezone()
- datefmt_set_timezone()
- datefmt_get_calendar_object()
- intlcal_create_instance()
- intlcal_get_keyword_values_for_locale()
- intlcal_get_now()
- intlcal_get_available_locales()
- intlcal_get()
- intlcal_get_time()
- intlcal_set_time()
- intlcal_add()
- intlcal_set_time_zone()
- intlcal_after()
- intlcal_before()
- intlcal_set()
- intlcal_roll()
- intlcal_clear()
- intlcal_field_difference()
- intlcal_get_actual_maximum()
- intlcal_get_actual_minimum()
- intlcal_get_day_of_week_type()
- intlcal_get_first_day_of_week()
- intlcal_get_greatest_minimum()
- intlcal_get_least_maximum()
- intlcal_get_locale()
- intlcal_get_maximum()
- intlcal_get_minimal_days_in_first_week()
- intlcal_get_minimum()
- intlcal_get_time_zone()
- intlcal_get_type()
- intlcal_get_weekend_transition()
- intlcal_in_daylight_time()
- intlcal_is_equivalent_to()
- intlcal_is_lenient()
- intlcal_is_set()
- intlcal_is_weekend()
- intlcal_set_first_day_of_week()
- intlcal_set_lenient()
- intlcal_equals()
- intlcal_get_repeated_wall_time_option()
- intlcal_get_skipped_wall_time_option()
- intlcal_set_repeated_wall_time_option()
- intlcal_set_skipped_wall_time_option()
- intlcal_from_date_time()
- intlcal_to_date_time()
- intlcal_get_error_code()
- intlcal_get_error_message()
- intlgregcal_create_instance()
- intlgregcal_set_gregorian_change()
- intlgregcal_get_gregorian_change()
- intlgregcal_is_leap_year()
- intltz_create_time_zone()
- intltz_create_default()
- intltz_get_id()
- intltz_get_gmt()
- intltz_get_unknown()
- intltz_create_enumeration()
- intltz_count_equivalent_ids()
- intltz_create_time_zone_id_enumeration()
- intltz_get_canonical_id()
- intltz_get_region()
- intltz_get_tz_data_version()
- intltz_get_equivalent_id()
- intltz_use_daylight_time()
- intltz_get_offset()
- intltz_get_raw_offset()
- intltz_has_same_rules()
- intltz_get_display_name()
- intltz_get_dst_savings()
- intltz_from_date_time_zone()
- intltz_to_date_time_zone()
- intltz_get_error_code()
- intltz_get_error_message()
- IntlDateFormatter::formatObject()
- IntlDateFormatter::getCalendarObject()
- IntlDateFormatter::getTimeZone()
- IntlDateFormatter::setTimeZone()
- LDAP:
- ldap_modify_batch() (5.5.10)
- SOAP:
- SoapClient::__getCookies() (5.5.14)
- Sockets:
- socket_sendmsg()
- socket_recvmsg()
- socket_cmsg_space()
- SPL:
- SplFixedArray::__wakeup()
- SplDoublyLinkedList::add()
- RecursiveTreeIterator::getPostfix() (5.5.2)
- RecursiveTreeIterator::setPostfix() (5.5.2)
- Zend OPcache:
- opcache_get_configuration()
- opcache_get_status()
- opcache_reset()
========================================
6. New Classes and Interfaces
7. New Classes and Interfaces
========================================
- Intl:
- IntlCalendar
- IntlGregorianCalendar
- IntlTimeZone
- IntlBreakIterator
- IntlRuleBasedBreakIterator
- IntlCodePointBreakIterator
- UConverter
- cURL:
- CURLFile
========================================
7. Removed Extensions
8. Removed Extensions
========================================
None
========================================
8. Other Changes to Extensions
9. Other Changes to Extensions
========================================
- Intl:
- This extension now requires ICU 4.0+.
- Phar:
- Added ability of resolving alias created by Phar::map
========================================
9. New Global Constants
10. New Global Constants
========================================
- mysqli:
- Added MYSQLI_SERVER_PUBLIC_KEY constant to be used with mysqli_options()
- cURL:
- Added CURLOPT_SAFE_UPLOAD to be used with curl_setopt().
- Added CURL_WRAPPERS_ENABLED to reflect --with-curlwrappers.
- GD
- Added constants for imageflip:
. IMG_FLIP_HORIZONTAL
. IMG_FLIP_VERTICAL
. IMG_FLIP_BOTH
- Added constants for imagecrop
. IMG_CROP_DEFAULT
. IMG_CROP_TRANSPARENT
. IMG_CROP_BLACK
. IMG_CROP_WHITE
. IMG_CROP_SIDES
. IMG_CROP_THRESHOLD
- Added constants for imagesetinterpolation, used by imagescale
imagerotate and imageaffine:
. IMG_BELL
. IMG_BESSEL
. IMG_BILINEAR_FIXED
. IMG_BICUBIC
. IMG_BICUBIC_FIXED
. IMG_BLACKMAN
. IMG_BOX
. IMG_BSPLINE
. IMG_CATMULLROM
. IMG_GAUSSIAN
. IMG_GENERALIZED_CUBIC
. IMG_HERMITE
. IMG_HAMMING
. IMG_HANNING
. IMG_MITCHELL
. IMG_POWER
. IMG_QUADRATIC
. IMG_SINC
. IMG_NEAREST_NEIGHBOUR
. IMG_WEIGHTED4
. IMG_TRIANGLE
- Added constants for imageaffinematrixget
. IMG_AFFINE_TRANSLATE
. IMG_AFFINE_SCALE
. IMG_AFFINE_ROTATE
. IMG_AFFINE_SHEAR_HORIZONTAL
. IMG_AFFINE_SHEAR_VERTICAL
- Core
, PHP_INT_MIN added.
========================================
10. Changes to INI File Handling
11. Changes to INI File Handling
========================================
- Core:
- Added sys_temp_dir INI directive, for specifying temporary
directory.
- Intl:
- Added intl.use_exceptions INI directive, which controls what
happens when global errors are set together with intl.error_level.
- MSSQL:
- mssql.compatability_mode renamed to mssql.compatibility_mode in 5.5.2,
old directive still supported for BC reasons.
- mysqlnd:
- Added mysqlnd.sha256_server_public_key INI PERDIR setting that
affects all APIs which use(are built) for mysqlnd. This allows
ext/mysqli to be used with the new auth protocol, although at
coarser level.
- Sessions:
- Added session.use_strict_mode in 5.5.3, which prevents session
fixation attacks and session collisions.
See also https://wiki.php.net/rfc/strict_sessions
- Zend OPcache (See http://php.net/manual/en/book.opcache.php)
- Added the following directives:
- opcache.enable (default "1")
- opcache.memory_consumption (default "64")
- opcache.interned_strings_buffer (default "4")
- opcache.max_accelerated_files (default "2000")
- opcache.max_wasted_percentage (default "5")
- opcache.use_cwd (default "1")
- opcache.validate_timestamps (default "1")
- opcache.revalidate_freq (default "2")
- opcache.revalidate_path (default "0")
- opcache.save_comments (default "1")
- opcache.load_comments (default "1")
- opcache.fast_shutdown (default "0")
- opcache.enable_file_override (default "0")
- opcache.optimization_level (default "0xffffffff")
- opcache.inherited_hack (default "1")
- opcache.blacklist_filename (default "")
- opcache.max_file_size (default "0")
- opcache.consistency_checks (default "0")
- opcache.force_restart_timeout (default "180")
- opcache.error_log (default "" which means stderr)
- opcache.log_verbosity_level (default "1")
- opcache.preferred_memory_model (default "")
- opcache.protect_memory (default "0")
- opcache.mmap_base (Windows-only)
========================================
11. Windows Support
========================================
- The Apache 2.4 handler is supported as of PHP 5.5.0
- OPcache: Errors like 'unable to reattach to base address' could
happen in many common setups. It is due to some technical and
design restriction in the engine and could not be fixed easily
before 5.5.0 was released.
A possible fix is to tweak the opcache.mmap_base INI setting by
forcing the first address to be tried.
For x86 version, the following addreses can be tried:
. 0x20000000, 0x21000000, 0x30000000, 0x31000000, 0x50000000
and for x64 (still experimental):
. 0x0000100000000000, 0x0000200000000000, 0x0000300000000000, 0x0000700000000000
========================================
12. Other Changes
========================================
- If the APC or WinCache user cache APIs were used before, consider
these alternatives for PHP 5.5:
- APCu
- all supported OSes: http://pecl.php.net/package/APCu
- Windows: http://windows.php.net/downloads/pecl/releases/apcu/
- WinCache, Windows only: http://pecl.php.net/package/WinCache
- Standard
. call_user_method() and call_user_method_array() no longer exists.
+5 -114
View File
@@ -3,12 +3,10 @@ $Id$
UPGRADE NOTES - PHP X.Y
1. Internal API changes
a. Executor changes
b. Streams pooling API
c. Lowercasing and locales
d. zend_qsort_r
e. get_current_key
f. unserialization of manipulated object strings
a. Addition of do_operation and compare object handlers
b. return_value_ptr now always available, RETVAL_ZVAL_FAST macros
c. POST data handling
d. Arginfo changes
2. Build system changes
a. Unix build system changes
@@ -19,118 +17,11 @@ UPGRADE NOTES - PHP X.Y
1. Internal API changes
========================
a. Executor changes
a. zend_set_memory_limit() now takes the TSRMLS_CC macro as its last argument
* extensions can't override zend_execute() any more, they should override
zend_execute_ex() instead. The EG(current_execute_data) is already
initialized in zend_execute_ex(), so for compatibility extensions
may need to use EG(current_execute_data)->prev_execute_data instead.
* removed EG(arg_types_stack), EX(fbc), EX(called_scope), EX(current_object)
* added op_array->nested_calls. It's calculated at compile time.
* added EX(call_slots). It is an array to store information about syntaticaly
nested calls (e.g. foo(bar())). It's preallocated together with execute_data.
* added EX(call) - pointer to a current calling function. Actually an
element of EX(call_slots)
* opcodes INIT_METHOD_CALL, ZEND_INIT_STATIC_METHOD_CALL,
ZEND_INIT_FCALL_BY_NAME, ZEND_INIT_NS_FCALL_BY_NAME use result.num as
an index in EX(call_slots)
* opcode ZEND_NEW uses extended_vallue as an index in EX(call_slots)
* opcoes ZEND_DO_FCALL and ZEND_DO_FCALL_BY_NAME use op2.num as
an index in EX(call_slots)
* added op_array->used_stack. It's calculated at compile time and the
corresponding stack space is preallocated together with execute_data.
ZEND_SEND* and ZEND_DO_FCALL* don't need to check for stack overflow
anymore.
* Removed execute_data->Ts field. The VM temporary variables always allocated
immediately before execute_data structure. Now they are accessed by offset
from the execute_data base pointer (instead of execute_data->Ts). Compiler
stores new offsets in op_array->opcodes[*].op?.num. You can use macros
EX_TMP_VAR() and EX_TMP_VAR_NUM() to access temp_variable by offset or
number. You can convert number to offset using EX_TMP_VAR_NUM(0, num) or
offset to number (EX_TMP_VAR_NUM(0,0)-EX_TMP_VAR(0,offset)).
* Removed execute_data->CVs field. The VM compiled variables always allocated
immediately after execute_data structure. Now they are accessed by offset
from the execute_data base pointer (instead of execute_data->CVs). You can
use macros EX_CV_NUM() to access compiled variables by number.
b. Streams pooling API
The streams pooling API has been removed. The following functions no longer
exist:
PHPAPI int php_stream_context_get_link(php_stream_context *context,
const char *hostent, php_stream **stream);
PHPAPI int php_stream_context_set_link(php_stream_context *context,
const char *hostent, php_stream *stream);
PHPAPI int php_stream_context_del_link(php_stream_context *context,
php_stream *stream);
c. Lowercasing and locales
The lowercasing functions in zend_operators.c were split into those that do
lowercasing according to locale rules and those that do ASCII lowercasing.
ASCII:
zend_str_tolower_copy
zend_str_tolower_dup
zend_str_tolower
zend_binary_strcasecmp
zend_binary_strncasecmp
Locale-based:
zend_binary_strncasecmp_l
zend_binary_strcasecmp_l
zend_binary_zval_strcasecmp
zend_binary_zval_strncasecmp
string_compare_function_ex
string_case_compare_function
Internal engine lowercasing will be using ASCII-only rules. User-facing functions,
such as strcasecmp, will be using locale rules.
Two new functions - zend_binary_strncasecmp_l and zend_binary_strcasecmp_l - added as
locale-based counterparts to zend_binary_strcasecmp and zend_binary_strncasecmp.
d. zend_qsort_r
Added the function zend_qsort_r():
typedef int (*compare_r_func_t)(const void *, const void * TSRMLS_DC, void *);
void zend_qsort_r(void *base, size_t nmemb, size_t siz, compare_r_func_t compare, void *arg TSRMLS_DC);
The extra argument it has (relatively to zend_qsort()) is passed to the
comparison function.
e. get_current_key
The signature of the get_current_key iteration handler has been changed to:
void (*get_current_key)(zend_object_iterator *iter, zval *key TSRMLS_DC);
The key should be written into the zval* using the ZVAL_* macros.
f. unserialization of manipulated object strings
Strings requiring unserialization of objects are now explicitly checked
whether the object they contain implements the Serializable interface.
This solves the situation where manipulated strings could be passed for
objects using Serializable to disallow serialization. An object
implementing Serializable will always start with "C:" in the serialized
string, all other objects are represented with starting "O:". Objects
implementing Serializable to disable serialization using
zend_class_unserialize_deny and zend_class_serialize_deny, when
instantiated from the serializer with a manipulated "O:" string at the
start, will most likely be defectively initialized. This is now
fixed at the appropriate place by checking for the presence of the
serialize callback in the class entry.
========================
2. Build system changes
========================
a. Unix build system changes
-
b. Windows build system changes
- Drop Windows XP and 2003 support.
+1 -1
View File
@@ -18,7 +18,7 @@ libZend_la_SOURCES=\
zend_default_classes.c \
zend_iterators.c zend_interfaces.c zend_exceptions.c \
zend_strtod.c zend_closures.c zend_float.c zend_string.c zend_signal.c \
zend_generators.c
zend_generators.c zend_virtual_cwd.c zend_ast.c
libZend_la_LDFLAGS =
libZend_la_LIBADD = @ZEND_EXTRA_LIBS@
+3 -3
View File
@@ -9,11 +9,11 @@ Modified: 2001-09-17
1. Background/Need
==================
Many internal function of PHP will reject parameters because of their
Many internal functions of PHP will reject parameters because of their
type (the array and variable function come to mind). For userland
this is not an easy task as there is no uniform way to do it. An
addition to the engine for requiring loose types would allow
delevopers to know that the data passed to their functions is of the
developers to know that the data passed to their functions are of the
correct type and reduce the need for duplicating the same code in
every function to check for the type of data.
@@ -57,7 +57,7 @@ function foo (array $var){
===========
Mis-matches in type should be reported as fatal errors and should halt
the execution of a script as that function can not be run and code
the execution of a script as that function cannot be run and code
following could not reliably run.
+12
View File
@@ -119,6 +119,10 @@ SOURCE=.\zend_API.c
# End Source File
# Begin Source File
SOURCE=.\zend_ast.c
# End Source File
# Begin Source File
SOURCE=.\zend_builtin_functions.c
# End Source File
# Begin Source File
@@ -265,6 +269,10 @@ SOURCE=.\zend_variables.c
SOURCE=.\zend_vm_opcodes.c
# End Source File
# Begin Source File
SOURCE=.\zend_virtual_cwd.c
# End Source File
# End Group
# Begin Group "Header Files"
@@ -367,6 +375,10 @@ SOURCE=.\zend_istdiostream.h
# End Source File
# Begin Source File
SOURCE=.\zend_int.h
# End Source File
# Begin Source File
SOURCE=".\zend_language_parser.h"
# End Source File
# Begin Source File
+1 -1
View File
@@ -130,7 +130,7 @@ int main()
exit(1);
}
], [
AC_DEFINE([ZEND_DVAL_TO_LVAL_CAST_OK], 1, [Define if double cast to long preserves least significant bits])
AC_DEFINE([ZEND_DVAL_TO_IVAL_CAST_OK], 1, [Define if double cast to long preserves least significant bits])
AC_MSG_RESULT(yes)
], [
AC_MSG_RESULT(no)
+8
View File
@@ -140,6 +140,10 @@ SOURCE=.\zend_alloc.c
# End Source File
# Begin Source File
SOURCE=.\zend_ast.c
# End Source File
# Begin Source File
SOURCE=.\zend_API.c
# End Source File
# Begin Source File
@@ -401,6 +405,10 @@ SOURCE=.\zend_iterators.h
# End Source File
# Begin Source File
SOURCE=.\zend_int.h
# End Source File
# Begin Source File
SOURCE=".\zend_language_parser.h"
# End Source File
# Begin Source File
+18 -9
View File
@@ -3,8 +3,13 @@ dnl
dnl This file contains local autoconf functions.
AC_DEFUN([LIBZEND_BISON_CHECK],[
# we only support certain bison versions
bison_version_list="2.4 2.4.1 2.4.2 2.4.3 2.5 2.5.1 2.6 2.6.1 2.6.2 2.6.3 2.6.4 2.6.5 2.7"
# we only support certain bison versions;
# min: 2.4 (i.e. 204, major * 100 + minor for easier comparison)
bison_version_min="204"
# non-working versions, e.g. "3.0 3.2";
# remove "none" when introducing the first incompatible bison version an
# separate any following additions by spaces
bison_version_exclude="3.0"
# for standalone build of Zend Engine
test -z "$SED" && SED=sed
@@ -17,18 +22,22 @@ AC_DEFUN([LIBZEND_BISON_CHECK],[
if test -n "$bison_version_vars"; then
set $bison_version_vars
bison_version="${1}.${2}"
for bison_check_version in $bison_version_list; do
if test "$bison_version" = "$bison_check_version"; then
php_cv_bison_version="$bison_check_version (ok)"
break
fi
done
bison_version_num="`expr ${1} \* 100 + ${2}`"
if test $bison_version_num -ge $bison_version_min; then
php_cv_bison_version="$bison_version (ok)"
for bison_check_version in $bison_version_exclude; do
if test "$bison_version" = "$bison_check_version"; then
php_cv_bison_version=invalid
break
fi
done
fi
fi
])
fi
case $php_cv_bison_version in
""|invalid[)]
bison_msg="bison versions supported for regeneration of the Zend/PHP parsers: $bison_version_list (found: $bison_version)."
bison_msg="This bison version is not supported for regeneration of the Zend/PHP parsers (found: $bison_version, min: $bison_version_min, excluded: $bison_version_exclude)."
AC_MSG_WARN([$bison_msg])
YACC="exit 0;"
;;
+11
View File
@@ -0,0 +1,11 @@
--TEST--
Bug #67468 (Segfault in highlight_file()/highlight_string())
--SKIPIF--
<?php if(!function_exists("leak")) print "skip only for debug builds"; ?>
--FILE--
<?php
highlight_string("<?php __CLASS__;", true);
echo "done";
?>
--EXPECT--
done
+110
View File
@@ -0,0 +1,110 @@
--TEST--
Basic argument unpacking
--FILE--
<?php
function test(...$args) {
var_dump($args);
}
function test2($arg1, $arg2, $arg3 = null) {
var_dump($arg1, $arg2, $arg3);
}
function getArray($array) {
return $array;
}
function arrayGen($array) {
foreach ($array as $element) {
yield $element;
}
}
$array = [1, 2, 3];
test(...[]);
test(...[1, 2, 3]);
test(...$array);
test(...getArray([1, 2, 3]));
test(...arrayGen([]));
test(...arrayGen([1, 2, 3]));
test(1, ...[2, 3], ...[4, 5]);
test(1, ...getArray([2, 3]), ...arrayGen([4, 5]));
test2(...[1, 2]);
test2(...[1, 2, 3]);
test2(...[1], ...[], ...[], ...[2, 3], ...[4, 5]);
?>
--EXPECT--
array(0) {
}
array(3) {
[0]=>
int(1)
[1]=>
int(2)
[2]=>
int(3)
}
array(3) {
[0]=>
int(1)
[1]=>
int(2)
[2]=>
int(3)
}
array(3) {
[0]=>
int(1)
[1]=>
int(2)
[2]=>
int(3)
}
array(0) {
}
array(3) {
[0]=>
int(1)
[1]=>
int(2)
[2]=>
int(3)
}
array(5) {
[0]=>
int(1)
[1]=>
int(2)
[2]=>
int(3)
[3]=>
int(4)
[4]=>
int(5)
}
array(5) {
[0]=>
int(1)
[1]=>
int(2)
[2]=>
int(3)
[3]=>
int(4)
[4]=>
int(5)
}
int(1)
int(2)
NULL
int(1)
int(2)
int(3)
int(1)
int(2)
int(3)
+145
View File
@@ -0,0 +1,145 @@
--TEST--
Argument unpacking with by-ref arguments
--FILE--
<?php
error_reporting(E_ALL);
function test1(&...$args) {
foreach ($args as &$arg) {
$arg++;
}
}
test1(...[1, 2, 3]);
$array = [1, 2, 3];
test1(...$array);
var_dump($array);
$array1 = [1, 2]; $array2 = [3, 4];
test1(...$array1, ...$array2);
var_dump($array1, $array2);
function test2($val1, &$ref1, $val2, &$ref2) {
$ref1++;
$ref2++;
}
$array = [0, 0, 0, 0];
test2(...$array);
var_dump($array);
$array1 = [1, 2]; $array2 = [4, 5];
test1(...$array1, ...$array2);
var_dump($array1, $array2);
$a = $b = $c = $d = 0;
$array = [0, 0, 0, 0];
test2($a, ...$array);
var_dump($a, $array);
test2($a, $b, ...$array);
var_dump($a, $b, $array);
test2($a, $b, $c, ...$array);
var_dump($a, $b, $c, $array);
test2($a, $b, $c, $d, ...$array);
var_dump($a, $b, $c, $d, $array);
?>
--EXPECTF--
array(3) {
[0]=>
int(2)
[1]=>
int(3)
[2]=>
int(4)
}
array(2) {
[0]=>
int(2)
[1]=>
int(3)
}
array(2) {
[0]=>
int(4)
[1]=>
int(5)
}
array(4) {
[0]=>
int(0)
[1]=>
int(1)
[2]=>
int(0)
[3]=>
int(1)
}
array(2) {
[0]=>
int(2)
[1]=>
int(3)
}
array(2) {
[0]=>
int(5)
[1]=>
int(6)
}
int(0)
array(4) {
[0]=>
int(1)
[1]=>
int(0)
[2]=>
int(1)
[3]=>
int(0)
}
int(0)
int(1)
array(4) {
[0]=>
int(1)
[1]=>
int(1)
[2]=>
int(1)
[3]=>
int(0)
}
int(0)
int(2)
int(0)
array(4) {
[0]=>
int(2)
[1]=>
int(1)
[2]=>
int(1)
[3]=>
int(0)
}
int(0)
int(3)
int(0)
int(1)
array(4) {
[0]=>
int(2)
[1]=>
int(1)
[2]=>
int(1)
[3]=>
int(0)
}
+37
View File
@@ -0,0 +1,37 @@
--TEST--
Unpack arguments for dynamic call
--FILE--
<?php
$fn = function(...$args) {
var_dump($args);
};
$fn(...[]);
$fn(...[1, 2, 3]);
$fn(1, ...[2, 3], ...[], ...[4, 5]);
?>
--EXPECT--
array(0) {
}
array(3) {
[0]=>
int(1)
[1]=>
int(2)
[2]=>
int(3)
}
array(5) {
[0]=>
int(1)
[1]=>
int(2)
[2]=>
int(3)
[3]=>
int(4)
[4]=>
int(5)
}
+43
View File
@@ -0,0 +1,43 @@
--TEST--
Argument unpacking with internal functions
--FILE--
<?php
$arrays = [
[1, 2, 3],
[4, 5, 6],
[7, 8, 9],
];
var_dump(array_map(null, ...$arrays));
?>
--EXPECT--
array(3) {
[0]=>
array(3) {
[0]=>
int(1)
[1]=>
int(4)
[2]=>
int(7)
}
[1]=>
array(3) {
[0]=>
int(2)
[1]=>
int(5)
[2]=>
int(8)
}
[2]=>
array(3) {
[0]=>
int(3)
[1]=>
int(6)
[2]=>
int(9)
}
}
+59
View File
@@ -0,0 +1,59 @@
--TEST--
Only arrays and Traversables can be unpacked
--FILE--
<?php
function test(...$args) {
var_dump($args);
}
test(...null);
test(...42);
test(...new stdClass);
test(1, 2, 3, ..."foo", ...[4, 5]);
test(1, 2, 3, ...new StdClass, ...3.14, ...[4, 5]);
?>
--EXPECTF--
Warning: Only arrays and Traversables can be unpacked in %s on line %d
array(0) {
}
Warning: Only arrays and Traversables can be unpacked in %s on line %d
array(0) {
}
Warning: Only arrays and Traversables can be unpacked in %s on line %d
array(0) {
}
Warning: Only arrays and Traversables can be unpacked in %s on line %d
array(5) {
[0]=>
int(1)
[1]=>
int(2)
[2]=>
int(3)
[3]=>
int(4)
[4]=>
int(5)
}
Warning: Only arrays and Traversables can be unpacked in %s on line %d
Warning: Only arrays and Traversables can be unpacked in %s on line %d
array(5) {
[0]=>
int(1)
[1]=>
int(2)
[2]=>
int(3)
[3]=>
int(4)
[4]=>
int(5)
}
+15
View File
@@ -0,0 +1,15 @@
--TEST--
Argument unpacking with many arguments
--FILE--
<?php
function fn(...$args) {
var_dump(count($args));
}
$array = array_fill(0, 10000, 42);
fn(...$array, ...$array);
?>
--EXPECT--
int(20000)
+32
View File
@@ -0,0 +1,32 @@
--TEST--
Unpack arguments for method calls
--FILE--
<?php
class Foo {
public function test(...$args) {
var_dump($args);
}
public static function test2(...$args) {
var_dump($args);
}
}
$foo = new Foo;
Foo::test2(1, 2, ...[3, 4], ...[], ...[5]);
?>
--EXPECT--
array(5) {
[0]=>
int(1)
[1]=>
int(2)
[2]=>
int(3)
[3]=>
int(4)
[4]=>
int(5)
}
+35
View File
@@ -0,0 +1,35 @@
--TEST--
Unpack arguments for new expression
--FILE--
<?php
class Foo {
public function __construct(...$args) {
var_dump($args);
}
}
new Foo(...[]);
new Foo(...[1, 2, 3]);
new Foo(...[1], ...[], ...[2, 3]);
?>
--EXPECT--
array(0) {
}
array(3) {
[0]=>
int(1)
[1]=>
int(2)
[2]=>
int(3)
}
array(3) {
[0]=>
int(1)
[1]=>
int(2)
[2]=>
int(3)
}
@@ -0,0 +1,10 @@
--TEST--
Positional arguments cannot be used after argument unpacking
--FILE--
<?php
var_dump(...[1, 2, 3], 4);
?>
--EXPECTF--
Fatal error: Cannot use positional argument after argument unpacking in %s on line %d
+20
View File
@@ -0,0 +1,20 @@
--TEST--
Argument unpacking does not work with string keys (forward compatibility for named args)
--FILE--
<?php
set_error_handler(function($errno, $errstr) {
var_dump($errstr);
});
var_dump(...[1, 2, "foo" => 3, 4]);
var_dump(...new ArrayIterator([1, 2, "foo" => 3, 4]));
?>
--EXPECTF--
string(36) "Cannot unpack array with string keys"
int(1)
int(2)
string(42) "Cannot unpack Traversable with string keys"
int(1)
int(2)
@@ -0,0 +1,33 @@
--TEST--
Traversables that throw exceptions are properly handled during argument unpack
--FILE--
<?php
function test(...$args) {
var_dump($args);
}
class Foo implements IteratorAggregate {
public function getIterator() {
throw new Exception('getIterator');
}
}
function gen() {
yield 1;
yield 2;
throw new Exception('gen');
}
try {
test(1, 2, ...new Foo, ...[3, 4]);
} catch (Exception $e) { var_dump($e->getMessage()); }
try {
test(1, 2, ...gen(), ...[3, 4]);
} catch (Exception $e) { var_dump($e->getMessage()); }
?>
--EXPECT--
string(11) "getIterator"
string(3) "gen"
@@ -0,0 +1,31 @@
--TEST--
Traversables cannot be unpacked into by-reference parameters
--FILE--
<?php
function test($val1, $val2, $val3, &$ref) {
$ref = 42;
}
function gen($array) {
foreach ($array as $element) {
yield $element;
}
}
test(1, 2, 3, $b, ...gen([4, 5, 6]));
var_dump($b);
test(...gen([1, 2, 3, 4]));
test(1, 2, ...gen([3, 4]));
test(...gen([1, 2]), ...gen([3, 4]));
?>
--EXPECTF--
int(42)
Warning: Cannot pass by-reference argument 4 of test() by unpacking a Traversable, passing by-value instead in %s on line %d
Warning: Cannot pass by-reference argument 4 of test() by unpacking a Traversable, passing by-value instead in %s on line %d
Warning: Cannot pass by-reference argument 4 of test() by unpacking a Traversable, passing by-value instead in %s on line %d
+1
View File
@@ -2,6 +2,7 @@
Bug #30820 (static member conflict with $this->member silently ignored)
--INI--
error_reporting=4095
opcache.optimization_level=0
--FILE--
<?php
class Blah {
-2
View File
@@ -1,7 +1,5 @@
--TEST--
Fixed Bug #65784 (Segfault with finally)
--XFAIL--
This bug is not fixed in 5.5 due to ABI BC
--FILE--
<?php
function foo1() {
+30
View File
@@ -0,0 +1,30 @@
--TEST--
Bug #66015 (wrong array indexing in class's static property)
--FILE--
<?php
class Test
{
const FIRST = 1;
const SECOND = 2;
const THIRD = 3;
protected static $array = [
self::FIRST => 'first',
'second',
'third'
];
public function __construct()
{
var_export(self::$array);
}
}
$test = new Test();
?>
--EXPECTF--
array (
1 => 'first',
2 => 'second',
3 => 'third',
)
+14
View File
@@ -0,0 +1,14 @@
--TEST--
Bug #66252 (Problems in AST evaluation invalidating valid parent:: reference)
--FILE--
<?php
class A {
const HW = "this is A";
}
class B extends A {
const BHW = parent::HW . " extended by B";
}
const C = B::BHW;
echo C, "\n";
--EXPECT--
this is A extended by B
+13
View File
@@ -0,0 +1,13 @@
--TEST--
Bug #66660 (Composer.phar install/update fails)
--STDIN--
<?php __CLASS__ ?>
--FILE--
<?php
file_put_contents(__DIR__."/bug66660.tmp.php", "<?php __CLASS__ ?>");
echo php_strip_whitespace(__DIR__."/bug66660.tmp.php");
?>
--CLEAN--
<?php unlink(__DIR__."/bug66660.tmp.php"); ?>
--EXPECT--
<?php __CLASS__ ?>
+26
View File
@@ -0,0 +1,26 @@
--TEST--
Bug #67169: array_splice all elements, then []= gives wrong index
--FILE--
<?php
$array = array('a', 'b');
array_splice($array, 0, 2);
$array[] = 'c';
var_dump($array);
$array = array('a', 'b');
array_shift($array);
array_shift($array);
$array[] = 'c';
var_dump($array);
?>
--EXPECT--
array(1) {
[0]=>
string(1) "c"
}
array(1) {
[0]=>
string(1) "c"
}
+12
View File
@@ -0,0 +1,12 @@
--TEST--
Bug #67368 (Memory leak with immediately dereferenced array in class constant)
--INI--
report_memleaks=1
--FILE--
<?php
class FooBar {
const bar = ["bar" => 3]["bar"];
}
echo "okey";
--EXPECTF--
okey
+13
View File
@@ -0,0 +1,13 @@
--TEST--
Class Property Expressions
--FILE--
<?php
class Foo {
const BAR = 1 << 0;
const BAZ = 1 << 1;
public $bar = self::BAR | self::BAZ;
}
echo (new Foo)->bar;
?>
--EXPECTF--
3
+20
View File
@@ -0,0 +1,20 @@
--TEST--
Static Class Property Expressions
--FILE--
<?php
class Foo {
public $b1 = 1 + 1;
public $b2 = 1 << 2;
public $b3 = "foo " . " bar " . " baz";
}
$f = new Foo;
var_dump(
$f->b1,
$f->b2,
$f->b3
);
?>
--EXPECT--
int(2)
int(4)
string(13) "foo bar baz"
+4 -1
View File
@@ -21,8 +21,11 @@ var_dump($x = $test->test($y));
var_dump($y, $x);
?>
--EXPECT--
--EXPECTF--
Notice: Only variable references should be returned by reference in %sclosure_018.php on line 7
int(4)
Notice: Only variable references should be returned by reference in %sclosure_018.php on line 7
int(16)
int(16)
int(16)
+3
View File
@@ -20,7 +20,10 @@ test();
?>
--EXPECTF--
Notice: Only variable references should be returned by reference in %sclosure_019.php on line 4
int(9)
Notice: Only variable references should be returned by reference in %sclosure_019.php on line 4
int(81)
Fatal error: Cannot pass parameter 1 by reference in %s on line %d
+96
View File
@@ -0,0 +1,96 @@
--TEST--
Constant Expressions
--FILE--
<?php
const T_1 = 1 << 1;
const T_2 = 1 / 2;
const T_3 = 1.5 + 1.5;
const T_4 = "foo" . "bar";
const T_5 = (1.5 + 1.5) * 2;
const T_6 = "foo" . 2 . 3 . 4.0;
const T_7 = __LINE__;
const T_8 = <<<ENDOFSTRING
This is a test string
ENDOFSTRING;
const T_9 = ~-1;
const T_10 = (-1?:1) + (0?2:3);
const T_11 = 1 && 0;
const T_12 = 1 and 1;
const T_13 = 0 || 0;
const T_14 = 1 or 0;
const T_15 = 1 xor 1;
const T_16 = 1 xor 0;
const T_17 = 1 < 0;
const T_18 = 0 <= 0;
const T_19 = 1 > 0;
const T_20 = 1 >= 0;
const T_21 = 1 === 1;
const T_22 = 1 !== 1;
const T_23 = 0 != "0";
const T_24 = 1 == "1";
// Test order of operations
const T_25 = 1 + 2 * 3;
// Test for memory leaks
const T_26 = "1" + 2 + "3";
// Allow T_POW
const T_27 = 2 ** 3;
var_dump(T_1);
var_dump(T_2);
var_dump(T_3);
var_dump(T_4);
var_dump(T_5);
var_dump(T_6);
var_dump(T_7);
var_dump(T_8);
var_dump(T_9);
var_dump(T_10);
var_dump(T_11);
var_dump(T_12);
var_dump(T_13);
var_dump(T_14);
var_dump(T_15);
var_dump(T_16);
var_dump(T_17);
var_dump(T_18);
var_dump(T_19);
var_dump(T_20);
var_dump(T_21);
var_dump(T_22);
var_dump(T_23);
var_dump(T_24);
var_dump(T_25);
var_dump(T_26);
var_dump(T_27);
?>
--EXPECT--
int(2)
float(0.5)
float(3)
string(6) "foobar"
float(6)
string(6) "foo234"
int(8)
string(21) "This is a test string"
int(0)
int(2)
bool(false)
bool(true)
bool(false)
bool(true)
bool(false)
bool(true)
bool(false)
bool(true)
bool(true)
bool(true)
bool(true)
bool(false)
bool(false)
bool(true)
int(7)
int(6)
int(8)
@@ -0,0 +1,66 @@
--TEST--
Constant expressions with arrays
--FILE--
<?php
const a = [1,2,[3,[4]]];
const b = a[0];
const c = a[2][0];
const d = a[2];
const e = ["string" => [1]]["string"][0];
var_dump(b, c, e);
function test ($a = d[1][0]) {
var_dump($a);
}
test();
class foo {
const bar = [1][0];
}
var_dump(foo::bar);
var_dump(a, a[0], a[2], a[2][1], a[3]);
?>
--EXPECTF--
int(1)
int(3)
int(1)
int(4)
int(1)
Notice: Undefined offset: 3 in %s on line %d
array(3) {
[0]=>
int(1)
[1]=>
int(2)
[2]=>
array(2) {
[0]=>
int(3)
[1]=>
array(1) {
[0]=>
int(4)
}
}
}
int(1)
array(2) {
[0]=>
int(3)
[1]=>
array(1) {
[0]=>
int(4)
}
}
array(1) {
[0]=>
int(4)
}
NULL
@@ -0,0 +1,43 @@
--TEST--
Constant scalar expressions with autoloading and classes
--INI--
opcache.enable=1
opcache.enable_cli=1
opcache.optimization_level=-1
--SKIPIF--
<?php if (!extension_loaded('Zend OPcache') || php_sapi_name() != "cli") die("skip CLI only"); ?>
--FILE--
<?php
# This test validates that autoloading works for common const expression (AST) use cases
$classlist = [
'A'=> 'class A { const HW = "this is A"; }',
'B'=> 'class B extends A { const HW = parent::HW." extended by B"; }',
'space1\C' => 'namespace space1; class C { const HW = "this is space1\C"; }',
'D' => 'class D { const HW = \space1\C::HW." extented by D"; }',
'trE' => 'trait trE { public static function getHW() { return parent::HW; } }',
'E' => 'class E extends B { use trE; }',
'F' => 'class F { const XX = "this is F"; }',
'G' => 'class G extends F { const XX = parent::XX." extended by G"; public static function get_me($x = "got ".self::XX) { return $x; } }',
];
spl_autoload_register(function ($class) use ($classlist) {
if (isset($classlist[$class])) {
eval($classlist[$class]);
} else {
die("Cannot autoload $class\n");
}
});
printf("B::HW = %s\n", B::HW);
printf("D::HW = %s\n", D::HW);
printf("E::getHW() = %s\n", E::getHW());
printf("G::get_me() = %s\n", G::get_me());
?>
--EXPECT--
B::HW = this is A extended by B
D::HW = this is space1\C extented by D
E::getHW() = this is A extended by B
G::get_me() = got this is F extended by G
@@ -0,0 +1,11 @@
--TEST--
Dynamic Constant Expressions
--FILE--
<?php
const FOO = 1;
const BAR = FOO | 2;
echo BAR;
?>
--EXPECTF--
3
@@ -0,0 +1,13 @@
--TEST--
Self-referencing constant expression (part of a constant AST)
--FILE--
<?php
class A {
const FOO = [self::BAR];
const BAR = [self::FOO];
}
var_dump(A::FOO);
?>
--EXPECTF--
Fatal error: Cannot declare self-referencing constant 'self::FOO' in %s on line %d
+19
View File
@@ -0,0 +1,19 @@
--TEST--
Testing __debugInfo() magic method with bad returns ZERO (float)
--FILE--
<?php
class C {
public $val;
public function __debugInfo() {
return $this->val;
}
public function __construct($val) {
$this->val = $val;
}
}
$c = new C(0.0);
var_dump($c);
--EXPECTF--
Fatal error: __debuginfo() must return an array in %s%eZend%etests%edebug_info-error-0.0.php on line %d
+19
View File
@@ -0,0 +1,19 @@
--TEST--
Testing __debugInfo() magic method with bad returns ZERO
--FILE--
<?php
class C {
public $val;
public function __debugInfo() {
return $this->val;
}
public function __construct($val) {
$this->val = $val;
}
}
$c = new C(0);
var_dump($c);
--EXPECTF--
Fatal error: __debuginfo() must return an array in %s%eZend%etests%edebug_info-error-0.php on line %d
+19
View File
@@ -0,0 +1,19 @@
--TEST--
Testing __debugInfo() magic method with bad returns ONE (float)
--FILE--
<?php
class C {
public $val;
public function __debugInfo() {
return $this->val;
}
public function __construct($val) {
$this->val = $val;
}
}
$c = new C(1.0);
var_dump($c);
--EXPECTF--
Fatal error: __debuginfo() must return an array in %s%eZend%etests%edebug_info-error-1.0.php on line %d
+19
View File
@@ -0,0 +1,19 @@
--TEST--
Testing __debugInfo() magic method with bad returns ONE
--FILE--
<?php
class C {
public $val;
public function __debugInfo() {
return $this->val;
}
public function __construct($val) {
$this->val = $val;
}
}
$c = new C(1);
var_dump($c);
--EXPECTF--
Fatal error: __debuginfo() must return an array in %s%eZend%etests%edebug_info-error-1.php on line %d
@@ -0,0 +1,19 @@
--TEST--
Testing __debugInfo() magic method with bad returns EMPTY STRING
--FILE--
<?php
class C {
public $val;
public function __debugInfo() {
return $this->val;
}
public function __construct($val) {
$this->val = $val;
}
}
$c = new C("");
var_dump($c);
--EXPECTF--
Fatal error: __debuginfo() must return an array in %s%eZend%etests%edebug_info-error-empty_str.php on line %d
+19
View File
@@ -0,0 +1,19 @@
--TEST--
Testing __debugInfo() magic method with bad returns FALSE
--FILE--
<?php
class C {
public $val;
public function __debugInfo() {
return $this->val;
}
public function __construct($val) {
$this->val = $val;
}
}
$c = new C(false);
var_dump($c);
--EXPECTF--
Fatal error: __debuginfo() must return an array in %s%eZend%etests%edebug_info-error-false.php on line %d
+19
View File
@@ -0,0 +1,19 @@
--TEST--
Testing __debugInfo() magic method with bad returns OBJECT
--FILE--
<?php
class C {
public $val;
public function __debugInfo() {
return $this->val;
}
public function __construct($val) {
$this->val = $val;
}
}
$c = new C(new stdClass);
var_dump($c);
--EXPECTF--
Fatal error: __debuginfo() must return an array in %s%eZend%etests%edebug_info-error-object.php on line %d
+19
View File
@@ -0,0 +1,19 @@
--TEST--
Testing __debugInfo() magic method with bad returns RESOURCE
--FILE--
<?php
class C {
public $val;
public function __debugInfo() {
return $this->val;
}
public function __construct($val) {
$this->val = $val;
}
}
$c = new C(fopen("data:text/plain,Foo", 'r'));
var_dump($c);
--EXPECTF--
Fatal error: __debuginfo() must return an array in %s%eZend%etests%edebug_info-error-resource.php on line %d
+19
View File
@@ -0,0 +1,19 @@
--TEST--
Testing __debugInfo() magic method with bad returns STRING
--FILE--
<?php
class C {
public $val;
public function __debugInfo() {
return $this->val;
}
public function __construct($val) {
$this->val = $val;
}
}
$c = new C("foo");
var_dump($c);
--EXPECTF--
Fatal error: __debuginfo() must return an array in %s%eZend%etests%edebug_info-error-str.php on line %d
+19
View File
@@ -0,0 +1,19 @@
--TEST--
Testing __debugInfo() magic method with bad returns TRUE
--FILE--
<?php
class C {
public $val;
public function __debugInfo() {
return $this->val;
}
public function __construct($val) {
$this->val = $val;
}
}
$c = new C(true);
var_dump($c);
--EXPECTF--
Fatal error: __debuginfo() must return an array in %s%eZend%etests%edebug_info-error-true.php on line %d
+39
View File
@@ -0,0 +1,39 @@
--TEST--
Testing __debugInfo() magic method
--FILE--
<?php
class Foo {
public $d = 4;
protected $e = 5;
private $f = 6;
public function __debugInfo() {
return ['a'=>1, "\0*\0b"=>2, "\0Foo\0c"=>3];
}
}
class Bar {
public $val = 123;
public function __debugInfo() {
return null;
}
}
$f = new Foo;
var_dump($f);
$b = new Bar;
var_dump($b);
--EXPECTF--
object(Foo)#%d (3) {
["a"]=>
int(1)
["b":protected]=>
int(2)
["c":"Foo":private]=>
int(3)
}
object(Bar)#%d (0) {
}
+1 -1
View File
@@ -76,4 +76,4 @@ NULL
Notice: Undefined offset: 3 in %s on line %d
Fatal error: Call to a member function bar() on a non-object in %s on line %d
Fatal error: Call to a member function bar() on null in %s on line %d
+11 -1
View File
@@ -7,7 +7,17 @@ class test {
const TEST = array(1,2,3);
}
var_dump(test::TEST);
echo "Done\n";
?>
--EXPECTF--
Fatal error: Arrays are not allowed in class constants in %s on line %d
array(3) {
[0]=>
int(1)
[1]=>
int(2)
[2]=>
int(3)
}
Done
+14
View File
@@ -0,0 +1,14 @@
--TEST--
jmp into a finally block 01
--FILE--
<?php
function foo() {
goto test;
try {
} finally {
test:
}
}
?>
--EXPECTF--
Fatal error: jump into a finally block is disallowed in %sfinally_goto_001.php on line %d
+14
View File
@@ -0,0 +1,14 @@
--TEST--
jmp into a finally block 02
--FILE--
<?php
function foo() {
try {
goto test;
} finally {
test:
}
}
?>
--EXPECTF--
Fatal error: jump into a finally block is disallowed in %sfinally_goto_002.php on line %d
+15
View File
@@ -0,0 +1,15 @@
--TEST--
jmp into a finally block 03
--FILE--
<?php
function foo() {
try {
} finally {
goto test;
test:
}
}
echo "okey";
?>
--EXPECTF--
okey
+14
View File
@@ -0,0 +1,14 @@
--TEST--
jmp into a finally block 03
--FILE--
<?php
function foo() {
try {
} finally {
test:
}
goto test;
}
?>
--EXPECTF--
Fatal error: jump into a finally block is disallowed in %sfinally_goto_004.php on line %d
+17
View File
@@ -0,0 +1,17 @@
--TEST--
Function Argument Parsing #003
--FILE--
<?php
const a = 10;
function t1($a = 1 + 1, $b = 1 << 2, $c = "foo" . "bar", $d = a * 10) {
var_dump($a, $b, $c, $d);
}
t1();
?>
--EXPECT--
int(2)
int(4)
string(6) "foobar"
int(100)
+20
View File
@@ -0,0 +1,20 @@
--TEST--
Incompatible context call (non-internal function)
--INI--
error_reporting=E_ALL
--FILE--
<?php
class A {
function foo() { var_dump(get_class($this)); }
}
class B {
function bar() { A::foo(); }
}
$b = new B;
$b->bar();
?>
--EXPECTF--
Deprecated: Non-static method A::foo() should not be called statically, assuming $this from incompatible context in %s on line %d
string(1) "B"
+5 -2
View File
@@ -3,6 +3,9 @@
--FILE--
<?php
const C = array();
--EXPECTF--
Fatal error: Arrays are not allowed as constants in %sns_059.php on line 2
var_dump(C);
?>
--EXPECTF--
array(0) {
}
+29
View File
@@ -0,0 +1,29 @@
--TEST--
Static Variable Expressions
--FILE--
<?php
const bar = 2, baz = bar + 1;
function foo() {
static $a = 1 + 1;
static $b = [bar => 1 + 1, baz * 2 => 1 << 2];
static $c = [1 => bar, 3 => baz];
var_dump($a, $b, $c);
}
foo();
?>
--EXPECT--
int(2)
array(2) {
[2]=>
int(2)
[6]=>
int(4)
}
array(2) {
[1]=>
int(2)
[3]=>
int(3)
}
+26
View File
@@ -0,0 +1,26 @@
--TEST--
aliasing imported constants to resolve naming conflicts
--FILE--
<?php
namespace foo {
const baz = 42;
}
namespace bar {
const baz = 43;
}
namespace {
use const foo\baz as foo_baz,
bar\baz as bar_baz;
var_dump(foo_baz);
var_dump(bar_baz);
echo "Done\n";
}
?>
--EXPECT--
int(42)
int(43)
Done
+22
View File
@@ -0,0 +1,22 @@
--TEST--
import namespaced constant
--FILE--
<?php
namespace foo\bar {
const baz = 42;
const qux = 43;
}
namespace {
use const foo\bar\baz, foo\bar\qux;
var_dump(baz);
var_dump(qux);
echo "Done\n";
}
?>
--EXPECT--
int(42)
int(43)
Done
+12
View File
@@ -0,0 +1,12 @@
--TEST--
importing const with same name but different case
--FILE--
<?php
namespace {
use const foo\bar;
use const foo\BAR;
}
?>
--EXPECT--
+21
View File
@@ -0,0 +1,21 @@
--TEST--
use const statements with conflicting names
--FILE--
<?php
namespace foo {
const baz = 42;
}
namespace bar {
const baz = 42;
}
namespace {
use const foo\baz, bar\baz;
echo "Done\n";
}
?>
--EXPECTF--
Fatal error: Cannot use const bar\baz as baz because the name is already in use in %s on line %d
@@ -0,0 +1,18 @@
--TEST--
use and use const with the same alias
--FILE--
<?php
namespace {
const foo = 'foo';
}
namespace x {
use foo as bar;
use const foo as bar;
var_dump(bar);
}
?>
--EXPECT--
string(3) "foo"
+14
View File
@@ -0,0 +1,14 @@
--TEST--
defining const with same name as imported should fail
--FILE--
<?php
namespace {
use const foo\bar;
const bar = 42;
}
?>
--EXPECTF--
Fatal error: Cannot declare const bar because the name is already in use in %s on line %d
@@ -0,0 +1,18 @@
--TEST--
using const with same name as defined should fail
--FILE--
<?php
namespace {
const bar = 42;
use const foo\bar;
}
namespace {
echo "Done";
}
?>
--EXPECTF--
Fatal error: Cannot use const foo\bar as bar because the name is already in use in %s on line %d
@@ -0,0 +1,5 @@
<?php
namespace foo;
const bar = 'local bar';
@@ -0,0 +1,5 @@
<?php
namespace foo;
const PHP_VERSION = 42;
@@ -0,0 +1,3 @@
<?php
const bar = 'global bar';
@@ -0,0 +1,3 @@
<?php
const baz = NULL;
@@ -0,0 +1,14 @@
--TEST--
non-existent imported constants should not be looked up in the global table
--FILE--
<?php
require 'includes/global_baz.php';
use const foo\bar\baz;
var_dump(baz);
?>
--EXPECTF--
Notice: Use of undefined constant baz - assumed 'baz' in %s on line %d
string(3) "baz"
+12
View File
@@ -0,0 +1,12 @@
--TEST--
Allow self and parent in use const statement
--FILE--
<?php
namespace {
use const self as foo;
use const parent as bar;
}
?>
--EXPECT--
+16
View File
@@ -0,0 +1,16 @@
--TEST--
shadowing a global core constant with a local version
--FILE--
<?php
require 'includes/foo_php_version.php';
use const foo\PHP_VERSION;
var_dump(PHP_VERSION);
echo "Done\n";
?>
--EXPECTF--
int(42)
Done
+25
View File
@@ -0,0 +1,25 @@
--TEST--
shadowing a global constant with a local version
--FILE--
<?php
namespace {
require 'includes/global_bar.php';
require 'includes/foo_bar.php';
}
namespace {
var_dump(bar);
}
namespace {
use const foo\bar;
var_dump(bar);
echo "Done\n";
}
?>
--EXPECT--
string(10) "global bar"
string(9) "local bar"
Done
+30
View File
@@ -0,0 +1,30 @@
--TEST--
aliasing imported functions to resolve naming conflicts
--FILE--
<?php
namespace foo {
function baz() {
return 'foo.baz';
}
}
namespace bar {
function baz() {
return 'bar.baz';
}
}
namespace {
use function foo\baz as foo_baz,
bar\baz as bar_baz;
var_dump(foo_baz());
var_dump(bar_baz());
echo "Done\n";
}
?>
--EXPECT--
string(7) "foo.baz"
string(7) "bar.baz"
Done
+26
View File
@@ -0,0 +1,26 @@
--TEST--
import namespaced function
--FILE--
<?php
namespace foo\bar {
function baz() {
return 'foo.bar.baz';
}
function qux() {
return baz();
}
}
namespace {
use function foo\bar\baz, foo\bar\qux;
var_dump(baz());
var_dump(qux());
echo "Done\n";
}
?>
--EXPECT--
string(11) "foo.bar.baz"
string(11) "foo.bar.baz"
Done
@@ -0,0 +1,13 @@
--TEST--
importing function with same name but different case should fail
--FILE--
<?php
namespace {
use function foo\bar;
use function foo\BAR;
}
?>
--EXPECTF--
Fatal error: Cannot use function foo\BAR as BAR because the name is already in use in %s on line %d
@@ -0,0 +1,17 @@
--TEST--
function that is conditionally defined at runtime should not cause compiler error
--FILE--
<?php
if (0) {
function foo() {
}
}
use function bar\foo;
echo "Done";
?>
--EXPECT--
Done
@@ -0,0 +1,25 @@
--TEST--
use function statements with conflicting names
--FILE--
<?php
namespace foo {
function baz() {
return 'foo.baz';
}
}
namespace bar {
function baz() {
return 'bar.baz';
}
}
namespace {
use function foo\baz, bar\baz;
echo "Done\n";
}
?>
--EXPECTF--
Fatal error: Cannot use function bar\baz as baz because the name is already in use in %s on line %d
@@ -0,0 +1,20 @@
--TEST--
use and use function with the same alias
--FILE--
<?php
namespace {
function foo() {
return 'foo';
}
}
namespace x {
use foo as bar;
use function foo as bar;
var_dump(bar());
}
?>
--EXPECT--
string(3) "foo"
@@ -0,0 +1,23 @@
--TEST--
use const and use function with the same alias
--FILE--
<?php
namespace {
const foo = 'foo.const';
function foo() {
return 'foo.function';
}
}
namespace x {
use const foo as bar;
use function foo as bar;
var_dump(bar);
var_dump(bar());
}
?>
--EXPECT--
string(9) "foo.const"
string(12) "foo.function"
@@ -0,0 +1,14 @@
--TEST--
defining function with same name as imported should fail
--FILE--
<?php
namespace {
use function foo\bar;
function bar() {}
}
?>
--EXPECTF--
Fatal error: Cannot declare function bar because the name is already in use in %s on line %d
@@ -0,0 +1,18 @@
--TEST--
using function with same name as defined should fail
--FILE--
<?php
namespace {
function bar() {}
use function foo\bar;
}
namespace {
echo "Done";
}
?>
--EXPECTF--
Fatal error: Cannot use function foo\bar as bar because the name is already in use in %s on line %d
@@ -0,0 +1,23 @@
--TEST--
use function should ignore namespaced constants
--FILE--
<?php
namespace foo {
const bar = 42;
}
namespace {
const bar = 43;
}
namespace {
use function foo\bar;
var_dump(bar);
echo "Done\n";
}
?>
--EXPECT--
int(43)
Done
@@ -0,0 +1,7 @@
<?php
namespace foo;
function bar() {
return 'local bar';
}
Loaded 100 of 1975 files, more files were not shown because too many files have changed in this diff. Show more