Commit Graph

896 Commits

Author SHA1 Message Date
Nikita Popov
29af302395 Remove useless dtor handlers in intl
These are only indirections to the default handler
2016-07-16 23:16:43 +02:00
Nikita Popov
267c525820 Fix leak in intl collator compare function 2016-07-16 23:16:20 +02:00
Stanislav Malyshev
aa82e99ed8 Fix bug #72533 (locale_accept_from_http out-of-bounds access) 2016-07-12 22:37:36 -07:00
Christoph M. Becker
0667d60812 Merge branch 'PHP-7.0'
# Resolved conflicts:
#	ext/intl/idn/idn.c
2016-07-12 14:56:23 +02:00
Christoph M. Becker
5fbcc2b90f Merge branch 'PHP-5.6' into PHP-7.0
# Resolved conflicts:
#	ext/intl/idn/idn.c
2016-07-12 14:52:23 +02:00
Christoph M. Becker
76e249d31c Partially fix #72506: idn_to_ascii for UTS #46 incorrect for long domain names
We don't actually fix this issue wrt. the empty $info array, because it is
not clear what this array should contain and we're concerned about the
potential BC break, but at least we fix the inconsistent handling of
resulting domains with 255 bytes (which raise an error), and longer domains
(which just return FALSE), what has to be considered a very minor BC break
if at all.
2016-07-12 14:47:14 +02:00
Anatol Belski
4a522e3b17 fix error text 2016-07-05 15:58:55 +02:00
Anatol Belski
28ed30df53 fix datatypes and add range checks 2016-07-05 15:54:57 +02:00
Anatol Belski
de643ead3e re-add range check 2016-07-05 15:15:20 +02:00
Anatol Belski
41622c86bd Revert "fix datatype and add range check"
This reverts commit 14bdd8246c.
2016-07-05 10:35:19 +02:00
Anatol Belski
14bdd8246c fix datatype and add range check 2016-07-05 10:04:23 +02:00
Aaron Piotrowski
24237027bc Merge branch 'throw-error-in-extensions' 2016-07-05 02:08:39 -05:00
SATO Kentaro
df683fa3b0 Fix #68447: grapheme_extract take an extra trailing character
grapheme_extract() converts UTF-8 string in the argument to UTF-16 to
iterate through graphemes, and count each UTF-16 character as one Unicode
character, which is not correct for UTF-16 surrogate pairs.
The patch removes the conversion and counts UTF-8 directly if needed.
2016-07-01 22:45:37 +09:00
Aaron Piotrowski
e9832b5ab1 Switch failure to register class back to E_ERROR 2016-06-30 12:01:44 -05:00
Dmitry Stogov
0cfb47651c Fixed compilation warnings 2016-06-28 11:37:51 +03:00
Anatol Belski
35bbcd17a9 remove unused declarations 2016-06-23 15:02:43 +02:00
Dmitry Stogov
323b2733f6 Fixed compilation warnings 2016-06-22 00:40:50 +03:00
Anatol Belski
da15af8b3f fix include order 2016-06-21 18:58:11 +02:00
Dmitry Stogov
1616038698 Added ZEND_ATTRIBUTE_FORMAT to some middind functions.
"%p" replaced by ZEND_LONG_FMT to avoid compilation warnings.
Fixed most incorrect use cases of format specifiers.
2016-06-21 16:00:37 +03:00
Xinchen Hui
f83a586d55 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed "implicit declaration of function ‘msgformat_fix_quotes’"
2016-06-17 16:00:04 +08:00
Xinchen Hui
958f18c1a1 Fixed "implicit declaration of function ‘msgformat_fix_quotes’" 2016-06-17 15:59:41 +08:00
Aaron Piotrowski
7d53864574 E_RECOVERABLE_ERROR -> thrown Error 2016-06-14 13:18:43 -05:00
Aaron Piotrowski
771e5cc247 Replace zend_ce_error with NULL and replace more E_ERROR with thrown Error 2016-06-13 09:02:17 -05:00
Aaron Piotrowski
e3c681aa5c Merge branch 'master' into throw-error-in-extensions 2016-06-10 22:02:23 -05:00
Anatol Belski
3c4edc8c62 Merge branch 'PHP-7.0'
* PHP-7.0:
  Add test for bug #53735
2016-06-06 21:08:18 +02:00
Anatol Belski
edb8c3f6e3 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Add test for bug #53735
2016-06-06 21:07:45 +02:00
Anatol Belski
2a0ed8a2eb Add test for bug #53735 2016-06-06 21:06:06 +02:00
Mic
0112b64a34 Fixed bug #69398 IntlDateFormatter formatObject returns wrong value when time style is NONE 2016-06-02 22:40:27 +02:00
Mic
527ddacd20 Fixed bug #69374 IntlDateFormatter formatObject returns wrong utf8 value
Relying on invariant strings is a mistake. Not only UTF-8, but also
many charsets are not single byte. Actual date formats can be mixed
with arbitrary strings, and this can bring erroneous results in the
out. Thus, instead it is more convenient to say, that a format string
can consist either on UTF-8 or on pure ASCII as its subset. This is
what is currently being done in other classes like Formatter, etc.
as well.
2016-06-02 22:27:48 +02:00
Anatol Belski
22336db97f Fixed bug #70484 selectordinal doesn't work with named parameters 2016-06-02 12:17:42 +02:00
Stanislav Malyshev
4ba0197f87 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fix memory leak in imagescale()
  Update NEWS
  Better fix for bug #72135
  Fixed bug #72227: imagescale out-of-bounds read
  Fix bug #72241: get_icu_value_internal out-of-bounds read
  Fix bug #72135 - don't create strings with lengths outside int range
  set versions
  Add check for string overflow to all string add operations
  Fix bug #72114 - int/size_t confusion in fread
  Updated NEWS
  Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream()
2016-05-24 20:53:34 -07:00
Stanislav Malyshev
3ed0114e7f Merge branch 'PHP-5.5' into PHP-7.0.7
* PHP-5.5:
  Fix memory leak in imagescale()
  Update NEWS
  Better fix for bug #72135
  Fixed bug #72227: imagescale out-of-bounds read
  Fix bug #72241: get_icu_value_internal out-of-bounds read
  Fix bug #72135 - don't create strings with lengths outside int range
  Add check for string overflow to all string add operations
  Fix bug #72114 - int/size_t confusion in fread
  Updated NEWS
  Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream()

Conflicts:
	Zend/zend_operators.c
	ext/intl/locale/locale_methods.c
	ext/phar/dirstream.c
	ext/phar/tests/bug71331.phpt
	ext/standard/file.c
	ext/standard/html.c
2016-05-24 18:05:06 -07:00
Stanislav Malyshev
544940c48a Merge branch 'PHP-5.5' into PHP-5.6.22
* PHP-5.5:
  Fix memory leak in imagescale()
  Update NEWS
  Better fix for bug #72135
  Fixed bug #72227: imagescale out-of-bounds read
  Fix bug #72241: get_icu_value_internal out-of-bounds read
  Fix bug #72135 - don't create strings with lengths outside int range
  Add check for string overflow to all string add operations
  Fix bug #72114 - int/size_t confusion in fread
  Updated NEWS
  Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream()

Conflicts:
	Zend/zend_operators.c
	ext/phar/dirstream.c
	ext/phar/tests/bug71331.phpt
2016-05-24 16:56:36 -07:00
Stanislav Malyshev
97eff7eb57 Fix bug #72241: get_icu_value_internal out-of-bounds read 2016-05-22 17:49:02 -07:00
Dmitry Stogov
6499162ff0 - get rid of EG(scope). zend_get_executed_scope() should be used instead.
- ichanged zval_update_constant_ex(). Use IS_TYPE_IMMUTABLE flag on shared constants and AST, instead of "inline_change" parameter.
2016-04-28 04:13:34 +03:00
Anatol Belski
1a154c7db5 Merge branch 'PHP-7.0'
* PHP-7.0:
  fix merge
  Fix memory leak
  Fix bug #72099: xml_parse_into_struct segmentation fault
  5.5.36 now
  Fix bug #72094 - Out of bounds heap read access in exif header processing
  Fix bug #72093: bcpowmod accepts negative scale and corrupts _one_ definition
  Fix bug #72061 - Out-of-bounds reads in zif_grapheme_stripos with negative offset
  Fix for bug #71912 (libgd: signedness vulnerability)
  Typo in NEWS
2016-04-27 12:30:34 +02:00
Anatol Belski
33d41da347 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fix memory leak
  Fix bug #72099: xml_parse_into_struct segmentation fault
  5.5.36 now
  Fix bug #72094 - Out of bounds heap read access in exif header processing
  Fix bug #72093: bcpowmod accepts negative scale and corrupts _one_ definition
  Fix bug #72061 - Out-of-bounds reads in zif_grapheme_stripos with negative offset
  Fix for bug #71912 (libgd: signedness vulnerability)
  Typo in NEWS
2016-04-27 11:45:29 +02:00
Stanislav Malyshev
e315a162da Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fix memory leak
  Fix bug #72099: xml_parse_into_struct segmentation fault
  5.5.36 now
  Fix bug #72094 - Out of bounds heap read access in exif header processing
  Fix bug #72093: bcpowmod accepts negative scale and corrupts _one_ definition
  Fix bug #72061 - Out-of-bounds reads in zif_grapheme_stripos with negative offset
  Fix for bug #71912 (libgd: signedness vulnerability)
  Typo in NEWS

Conflicts:
	configure.in
	main/php_version.h
2016-04-26 23:48:41 -07:00
Stanislav Malyshev
fd9689745c Fix bug #72061 - Out-of-bounds reads in zif_grapheme_stripos with negative offset 2016-04-24 13:15:17 -07:00
Nikita Popov
dc3ab58c14 Fix intl tests for ICU < 52 2016-04-20 19:43:15 +02:00
Sara Golemon
a9568d5485 Update IntlTimeZone methods for ICU 52
Adds:
  string IntlTimeZone::getWindowsID(string id)
  string IntlTimeZone::getIDForWindowsID(string winID[, string region])

And matching procedural functions
2016-04-18 23:01:25 +00:00
Anatol Belski
f644d6cc3d Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed bug #70484 selectordinal doesn't work with named parameters
  fix version macro to check
2016-04-11 15:02:27 +02:00
Anatol Belski
28b6f66a77 Fixed bug #70484 selectordinal doesn't work with named parameters 2016-04-11 15:01:22 +02:00
Anatol Belski
f62943edc8 fix version macro to check 2016-04-11 15:01:22 +02:00
Joe Watkins
707941413d Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0 2016-04-11 08:04:14 +01:00
Joe Watkins
00d8d9f227 Merge branch 'master' of https://github.com/php/php-src 2016-04-11 08:03:56 +01:00
Joe Watkins
2a5385af32 Merge branch 'PHP-7.0'
* PHP-7.0:
  fix calendar segfault
2016-04-11 08:03:39 +01:00
Joe Watkins
028485ae69 fix calendar segfault 2016-04-11 08:03:15 +01:00
Anatol Belski
4e12897826 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed bug #65480 No declaration for msgformat_fix_quotes() in msgformat.c or msgformat_attr.c
2016-04-09 19:12:16 +02:00
Anatol Belski
58ea2ad489 Fixed bug #65480 No declaration for msgformat_fix_quotes() in msgformat.c or msgformat_attr.c 2016-04-09 19:11:28 +02:00
Anatol Belski
5540525969 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed bug #66289 Locale::lookup incorrectly returns en or en_US if locale is empty
2016-04-09 18:27:57 +02:00
Anatol Belski
ef17343b3c Fixed bug #66289 Locale::lookup incorrectly returns en or en_US if locale is empty 2016-04-09 18:24:42 +02:00
Anatol Belski
bc1d8eca6c Merge branch 'PHP-7.0'
* PHP-7.0:
  fix indent
2016-04-08 14:19:30 +02:00
Anatol Belski
73815573e0 fix indent 2016-04-08 14:17:57 +02:00
Anatol Belski
91da256bb1 Merge branch 'PHP-7.0'
* PHP-7.0:
  fix compat for ICU < 50
2016-04-08 12:49:51 +02:00
Anatol Belski
45d9efaac3 fix compat for ICU < 50 2016-04-08 12:48:26 +02:00
Anatol Belski
de2da3bf02 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed bug #68893 Stackoverflow in datefmt_create
  Added missing newline.
  Changed to check for error with the new function that returns null if error is set
  Added function to check error and return null if error is set.
  Added tests for bug 70451 and 70452
2016-04-08 12:32:27 +02:00
Anatol Belski
1541a55a4f Fixed bug #68893 Stackoverflow in datefmt_create 2016-04-08 12:31:19 +02:00
Daniel Persson
f7600e17cb Added missing newline. 2016-04-08 12:31:19 +02:00
Daniel Persson
0030fa322f Changed to check for error with the new function that returns null if error is set 2016-04-08 12:31:19 +02:00
Daniel Persson
e3b160bf86 Added function to check error and return null if error is set. 2016-04-08 12:31:19 +02:00
Daniel Persson
ff2af89519 Added tests for bug 70451 and 70452 2016-04-08 12:31:19 +02:00
Anatol Belski
00b5b3a540 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed bug #70455 Missing constant: IntlChar::NO_NUMERIC_VALUE
2016-04-08 10:03:29 +02:00
Anatol Belski
93f8eaf3b8 Fixed bug #70455 Missing constant: IntlChar::NO_NUMERIC_VALUE 2016-04-08 09:55:57 +02:00
Anatol Belski
91a4c22598 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed bug #71516 IntlDateFormatter losts locale if pattern is set via constructor
2016-04-08 09:00:58 +02:00
Anatol Belski
49d31fa01d Fixed bug #71516 IntlDateFormatter losts locale if pattern is set via constructor 2016-04-08 08:59:43 +02:00
Andrea Faulds
1c1e20d771 Deduplicate NAN/INF portability, move to Zend 2016-03-20 01:32:44 +00:00
Nikita Popov
64dae1ea76 Statically bind static method call arguments
If we know what method will be called, use ct-bound send opcodes.

The intl test is changed because a runtime error changed to a
compile-time error.
2016-03-14 17:50:56 +01:00
Francois Laupretre
4a8c51c7d7 Add negative offset support to grapheme_strpos/stripos/extract() 2016-03-09 14:41:37 +01:00
Nikita Popov
f57c0b3249 Merge branch 'PHP-7.0' 2016-03-03 16:50:47 +01:00
Nikita Popov
1ac152938c Move semicolon into TSRMLS_CACHE_EXTERN/DEFINE
Also re bug #71575.
2016-03-03 16:50:01 +01:00
Stanislav Malyshev
cf842f1064 Remove TSRMLS_* from docs as it's not used anymore 2016-02-17 22:36:01 -08:00
Nikita Popov
93dc91b386 Remove version checks
PHP_VERSION_ID
PHP_API_VERSION
ZEND_MODULE_API_NO
PHP_MAJOR_VERSION, PHP_MINOR_VERSION
ZEND_ENGINE_2

I've left litespeed alone, as it seems to genuinely maintain support
for many PHP versions.
2016-01-30 15:35:28 +01:00
Anatol Belski
fe99f02437 Merge branch 'PHP-7.0'
* PHP-7.0:
  remove duplicated skipif conditions
2016-01-02 13:59:13 +01:00
Anatol Belski
302a35bb15 remove duplicated skipif conditions 2016-01-02 13:56:56 +01:00
Anatol Belski
caf007cdd6 Merge branch 'PHP-7.0'
* PHP-7.0:
  sync with new tests from 7.0 for ICU 55_1 and 56_1 compat
  sync skipifs for ext/intl for ICU 55_* and 56_* compat
2016-01-01 20:28:02 +01:00
Anatol Belski
2c6a4445f7 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  sync with new tests from 7.0 for ICU 55_1 and 56_1 compat
  sync skipifs for ext/intl for ICU 55_* and 56_* compat
2016-01-01 20:27:23 +01:00
Anatol Belski
a7b1ea3c84 sync with new tests from 7.0 for ICU 55_1 and 56_1 compat 2016-01-01 20:25:36 +01:00
Anatol Belski
6bcf4b4f40 sync skipifs for ext/intl for ICU 55_* and 56_* compat 2016-01-01 20:13:35 +01:00
Tom Van Looy
6d0dec27fa Remove leftovers of TSRMLS in docs 2015-12-25 11:13:28 +01:00
Nikita Popov
04e3d82b55 Make duplicate class constant error for internal class
And drop two duplicate constant declarations from intl. These
were leaking previously.
2015-12-10 22:22:49 +01:00
Xinchen Hui
e48988311d Fixed bug #71020 (Use after free in Collator::sortWithSortKeys) 2015-12-07 10:58:26 +08:00
Ferenc Kovacs
03e1e88db1 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  fixup, both catched by nikic
  use another character device in this test as /dev/console seems that it is different for lxc containers
  the de_DE(iso-8859-1) locale is not available on ubuntu by default, but there is no reason to require that over the utf-8 one
  let's try running our testsuite without sudo
2015-10-19 23:02:52 +02:00
Ferenc Kovacs
395ef4efb7 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fixup, both catched by nikic
  use another character device in this test as /dev/console seems that it is different for lxc containers
  the de_DE(iso-8859-1) locale is not available on ubuntu by default, but there is no reason to require that over the utf-8 one
  let's try running our testsuite without sudo
2015-10-19 22:47:23 +02:00
Anatol Belski
5492fe9f25 fork test for ICU 56.1 2015-10-12 11:20:51 +02:00
Anatol Belski
aea420c7cf fork test for ICU-56.1 2015-10-12 11:16:27 +02:00
Anatol Belski
3fb6f0014a fix test for ICU-56.1 2015-10-12 11:10:04 +02:00
Nikita Popov
0a3c1fb4c2 More zpp cleanup in ext/intl 2015-10-06 22:58:02 +02:00
Nikita Popov
1287c48082 Fix/improve zpp usage
The ext/interbase changes are done blindly, fingers crossed.

Some of these are bug fixes, some make zpp usage more idiomatic.
2015-10-02 09:35:00 +02:00
Dmitry Stogov
560e4fa393 Removed or simplified incorrect SEPARATE_*() macros usage. 2015-09-29 11:17:43 +03:00
Dmitry Stogov
ad4fa8f758 Fixed incorrect usage of HASH_OF() macro. Replaced HASH_OF() with more appropriate Z_ARRVAL_P() or Z_OBJPROP_P(). 2015-09-24 22:39:59 +03:00
Dmitry Stogov
92708e3e04 Cleanup: avoid reallocations 2015-09-24 02:23:09 +03:00
Dmitry Stogov
95ac055fd3 Cleanup: zend_object_std_dtor() is called through free_obj handler 2015-09-23 00:12:31 +03:00
Dmitry Stogov
27f6b8864e Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
  Aligned IntlChar protos to their ARG_INFO (related to #70453)
  Skip IntlChar related test if ext/intl is not available
2015-09-10 02:53:57 +03:00
Dmitry Stogov
c174e4cd73 Change array sorting implementation to avoid two level callbacks system.
Simplify zval comparion API.
2015-09-10 02:51:23 +03:00
Christoph M. Becker
46c20ecf0a Aligned IntlChar protos to their ARG_INFO (related to #70453) 2015-09-10 01:38:15 +02:00
Christoph M. Becker
31962306f4 Skip IntlChar related test if ext/intl is not available 2015-09-10 01:31:55 +02:00
Christoph M. Becker
1c902e2e63 Fix #70454: IntlChar::forDigit second parameter should be optional
ZPP expects "ll" instead of "l|l" what would match the "proto" and the
ARG_INFO.
2015-09-07 23:46:12 +02:00
Christoph M. Becker
1372909429 Fix #70453: IntlChar::foldCase() incorrect arguments and missing constants
We add missing ARG_INFO for the seconds parameter $options, and add the
respective constants IntlChar::FOLD_CASE_DEFAULT and
::FOLD_CASE_EXCLUDE_SPECIAL_I.
2015-09-07 23:02:56 +02:00
Ferenc Kovacs
941bbf2067 the de_DE(iso-8859-1) locale is not available on ubuntu by default, but there is no reason to require that over the utf-8 one 2015-08-24 14:40:06 +02:00
Dmitry Stogov
715d5d2855 Get rid of implicit type casting in GC_*() macros in Zend/zend_types.h.
This prevented compilation warnings and disclosed few incorrect usages in Zend/zend_vm_def.h and ext/dom/xpath.c.
Now explicit type casting may be required on call site.
This may break some C extension code, but it shoulfn't be a problem to add explicit casting.
2015-08-13 13:56:29 +03:00
Rodrigo Prado
6bd3ace67e Check the function UConverter::getAvailable with parameter wrong 2015-08-06 00:10:37 -03:00
Anatol Belski
4e66cce87c switch to the unified globals accessor where appropriate 2015-07-29 13:26:35 +02:00
Nikita Popov
5c95226d50 Various warning fixes 2015-07-17 20:18:25 +02:00
Aaron Piotrowski
1c7619491e Fix failing tests from exception code changes 2015-07-07 23:14:05 -05:00
Aaron Piotrowski
907476f34c Convert E_ERROR to thrown Error in extensions 2015-07-05 12:16:57 -05:00
Aaron Piotrowski
ed1b64877d Switch position of ce in exception ce variable names 2015-07-03 09:45:03 -05:00
Aaron Piotrowski
a812a74c2e Change zend_exception_get_default() to zend_exception_ce 2015-07-03 09:44:48 -05:00
Anatol Belski
333db013fd change the inclusion order which fixes the vc build 2015-07-01 15:21:34 +02:00
Dmitry Stogov
f7b6de5b5e Cleanup (avoid string reallocations) 2015-07-01 13:26:39 +03:00
Dmitry Stogov
4a2e40bb86 Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes). 2015-06-30 04:05:24 +03:00
Dmitry Stogov
4bd22cf1c1 Improved zend_string API (Francois Laupretre)
Squashed commit of the following:

commit d96eab8d79
Author: Francois Laupretre <francois@tekwire.net>
Date:   Fri Jun 26 01:23:31 2015 +0200

    Use the new 'ZSTR' macros in the rest of the code.

    Does not change anything to the generated code (thanks to compat macros) but cleaner.

commit b352643910
Author: Francois Laupretre <francois@tekwire.net>
Date:   Thu Jun 25 13:45:06 2015 +0200

    Improve zend_string API

    Add missing methods
2015-06-29 16:44:54 +03:00
Aaron Piotrowski
110e0a5a2c Merge branch 'master' into throwable-interface
# Conflicts:
#	Zend/zend_language_scanner.c
#	Zend/zend_language_scanner.l
#	ext/simplexml/tests/SimpleXMLElement_xpath.phpt
2015-06-14 18:53:11 -05:00
Dmitry Stogov
1c754f0b71 Get rid of more ZVAL_ZVAL() macros 2015-06-12 13:33:14 +03:00
Dmitry Stogov
8e10e8f921 Avoid zval duplication in ZVAL_ZVAL() macro (it was necessary only in few places).
Switch from ZVAL_ZVAL() to simpler macros where possible (it makes sense to review remaining places)
2015-06-12 12:33:23 +03:00
Ferenc Kovacs
7ec3016e29 fix hard-coded path in test 2015-06-09 16:42:02 +02:00
Anatol Belski
f378b9a998 fix test title 2015-05-18 22:37:31 +02:00
Anatol Belski
6fe4f18dcd fork test for ICU >= 55.1 compat 2015-05-18 22:37:29 +02:00
Anatol Belski
8af0de914f sync test with exception currently thrown 2015-05-18 22:37:28 +02:00
Anatol Belski
d3515bdef0 fork test for ICU >= 55.1 compat 2015-05-18 22:37:26 +02:00
Anatol Belski
bb27f4ca8b fork test for ICU >= 55.1 compat 2015-05-18 22:37:25 +02:00
Anatol Belski
83f98277c2 skip test for ICU >= 55.1, a newer test is available and passes 2015-05-18 22:37:23 +02:00
Anatol Belski
3658412814 fork test for ICU >= 55.1 compat 2015-05-18 22:37:22 +02:00
Anatol Belski
30be2e654e fork test for ICU >= 55.1 compat 2015-05-18 22:37:21 +02:00
Aaron Piotrowski
e97d5fab35 Update exception names in tests after formatting changes. 2015-05-17 17:31:43 -05:00
Aaron Piotrowski
fb7206e452 Merge branch 'master' into throwable-interface 2015-05-17 16:15:35 -05:00
Nikita Popov
440481fb3e Display TypeExceptions like normal exceptions
We currently don't show the argument at which the error actually
occured in the trace - should probably either add it or don't
display args on incomplete frames altogether, otherwise this'll
probably be confusing.
2015-05-17 19:54:12 +02:00
Nikita Popov
3ae995f03c Tweak uncaught exception message display
This implements a reduced variant of #1226 with just the following
change:

-Fatal error: Uncaught exception 'EngineException' with message 'Call to private method foo::bar() from context ''' in %s:%d
+Fatal error: Uncaught EngineException: Call to private method foo::bar() from context '' in %s:%d

The '' wrapper around messages is very weird if the exception
message itself contains ''. Futhermore having the message wrapped
in '' doesn't work for the "and defined" suffix of
TypeExceptions.
2015-05-17 18:47:06 +02:00
Aaron Piotrowski
434a46612e Fix a few missed tests. 2015-05-16 22:04:16 -05:00
Aaron Piotrowski
64b167d201 Updated tests to reflect exception class changes. 2015-05-16 16:49:14 -05:00
Nikita Popov
c9f27ee422 Display EngineExceptions like ordinary exceptions
TypeException stays as-is for now because it uses messages that are
incompatible with the way exception messages are displayed.

closure_038.phpt and a few others now show that we're generating
too many exceptions for compound operations on undefined properties
-- this needs to be fixed in a followup.
2015-05-15 23:40:32 +02:00
Dmitry Stogov
e96616739c Fixed redundand internal constructor behavior (they shouldn't return NULL anymore) 2015-05-07 10:38:47 +03:00
Nikita Popov
e74b84a9fe Fix Intl constructor leaks
Drop the Z_OBJ(return_value) = NULL hack and return status code
from ctor function instead.
2015-04-17 10:33:59 +02:00
Nikita Popov
25affa8a0f Fix leak in transliterator_transliterate() 2015-04-17 10:33:58 +02:00
Nikita Popov
8138756295 Fix leak in IntlDateFormatter::getTimeZone() 2015-04-17 09:28:38 +02:00
Nikita Popov
4e2be45309 Fix leak in IntlCalendar::fromDateTime() 2015-04-17 09:28:36 +02:00
Nikita Popov
122d759618 Always throw TypeException on throwing zpp failures
Introduces a ZEND_PARSE_PARAMS_THROW flag for zpp, which forces to
report FAILURE errors using a TypeException instead of a Warning,
like it would happen in strict mode.

Adds a zend_parse_parameters_throw() convenience function, which
invokes zpp with this flag.

Converts all cases I could identify, where we currently have
throwing zpp usage in constructors and replaces them with this API.
Error handling is still replaced to EH_THROW in some cases to handle
other, domain-specific errors in constructors.
2015-04-06 11:27:34 +02:00
Anatol Belski
a0eaa37afe missing includes 2015-04-01 13:39:25 +02:00
Anatol Belski
e271ace5f8 fix extern "C"
now, it shouldn't matter where intl_common.h is included,
not need for extra putting it into extern C
2015-04-01 13:18:52 +02:00
Anatol Belski
ca1ef2749d C89 compat 2015-04-01 13:18:51 +02:00
Nikita Popov
cf0ffa8e4c Remove datefmt_set_timezone_id and OO variant 2015-04-01 12:34:28 +02:00
Dmitry Stogov
2afca9f179 Fixed test 2015-03-30 21:48:54 +03:00
Dmitry Stogov
1018f462d8 Patch improvement:
Removed the corresponding core code.
Fixed ext/com_dotnet and ext/date.
Refactored ext/intl changes.
Improved ext/fileinfo and ext/pdo changes.
Fixed tests.
2015-03-30 18:53:38 +03:00
Dmitry Stogov
9155a267ad Merge branch 'InternalClassClean' of github.com:Danack/php-src into InternalClassClean
* 'InternalClassClean' of github.com:Danack/php-src:
  Fixed indentation. Fixed comment style. Fixed commented out code.
  Reverted change to function name and added note of why it is different from the class it is actually changing.
  Made UConverter throw an exception if the constructor fails.
  Fixed PDO constructor to not return null.
  Fixed fileinfo behaviour.
  Made Phar throw exception on bad constructor.
  Converted intl extension to use IntlException in constructors.
  Fixed SplFixedArray and tests.
  Fixed ReflectionExtension and ReflectionProperty.
  Fixed ReflectionFunction, ReflectionMethod and ReflectionParameter.
  Fixed PDORow behaviour and message.
2015-03-30 12:14:43 +03:00
Anatol Belski
2d78023244 cleanup the mod version macros, round 2 2015-03-23 20:33:54 +01:00
Rasmus Lerdorf
d33636f764 Remove extraneous strlen() call 2015-03-21 08:29:12 -07:00
Rasmus Lerdorf
7fce3607ea Remove extraneous strlen() call 2015-03-21 08:28:40 -07:00
Rasmus Lerdorf
f01071f55f Remove extraneous strlen() call 2015-03-21 08:26:06 -07:00
Danack
910a324306 Fixed indentation. Fixed comment style. Fixed commented out code. 2015-03-16 23:14:56 +00:00
Danack
9803fccfbc Made UConverter throw an exception if the constructor fails. 2015-03-15 15:30:25 +00:00
Danack
99dae96dc0 Converted intl extension to use IntlException in constructors. 2015-03-15 13:59:48 +00:00
Lior Kaplan
a4384bd3d4 s/PHP Version 5/PHP Version 7/g
Follow up for d0cb7153
2015-03-13 11:09:42 +02:00
Dmitry Stogov
8633685675 Use specialized macro for string zval creation 2015-03-12 16:53:51 +03:00
Dmitry Stogov
816b196973 Fixed memory leak 2015-03-10 23:16:09 +03:00
Dmitry Stogov
a30d328671 Errors converted to exceptions are not "recoverable" anymore. 2015-03-10 10:31:55 +03:00
Dmitry Stogov
1c94ff0595 Implement engine exceptions
RFC: https://wiki.php.net/rfc/engine_exceptions_for_php7

Pending changes regarding naming of BaseException and whether it
should be an interface.
2015-03-09 14:01:32 +01:00
zxcvdavid
a4a85887e0 Fix compile error 2015-03-04 09:56:50 +08:00
Anatol Belski
af3ca74501 made ZEND_TSRMLS_CACHE_* macros look like function calls
which also comply with the current semantics for such macros
2015-02-16 17:19:32 +01:00
Dmitry Stogov
bc630ad6da Get rid of old HashTable iteration API (it doesn't work with constant arrays) 2015-02-13 20:18:29 +03:00
Xinchen Hui
5f285482ea zend_get_parameters_ex is deprecated 2015-02-13 11:26:40 +08:00
Dmitry Stogov
9e70d7672d Move zend_object->guards into additional slot of zend_object->properties_table[]. As result size of objects without __get/__set/__unset/__isset magic methods is reduced. 2015-02-04 15:24:13 +03:00
Anatol Belski
d2f64edf29 remove unused var 2015-01-30 10:31:37 +01:00
Dmitry Stogov
8aa146b810 Fixed use after free 2015-01-26 12:24:33 +03:00
Stanislav Malyshev
cb6fb59b59 Fix the fix for #68884 2015-01-24 23:07:50 -08:00
Anatol Belski
699ada706a Fixed bug #68884 Null pointer deference 2015-01-22 15:01:27 +01:00
Stanislav Malyshev
02402ae695 fix size & compilation on Darwin 2015-01-18 22:44:35 -08:00
Joshua Rogers
f418486343 Fixed bug #68848 Missing return 2015-01-17 20:59:04 +01:00
Xinchen Hui
f487e4c638 attempt to fix again :< 2015-01-17 15:21:32 +08:00
Xinchen Hui
151411f8bd Fix again 2015-01-17 14:43:05 +08:00
Xinchen Hui
8c24a33d24 Merge branch 'master' of https://git.php.net/repository/php-src 2015-01-17 12:12:16 +08:00
Xinchen Hui
d630962b89 Try to fix ext/intl/tests/collator_asort.phpt (according to CI's output) 2015-01-17 12:11:49 +08:00
Sara Golemon
ebb60ac7dd Add IntlChar class to intl extension
Exposes ICU's uchar functionality as a set of static methods
2015-01-16 14:37:44 -08:00
Xinchen Hui
2823c9dafb Fixed missed test 2015-01-15 01:17:58 -05:00
Xinchen Hui
2193de0d18 Faster sorting algo 2015-01-14 18:02:41 +08:00
Stanislav Malyshev
b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Nikita Popov
1266515e19 Fix uses of zval_add_ref and add comment on usage
zval_add_ref should be used as a copy ctor, after the value was
already copied.

In particular when used with hash insertions, it should be applied
to the return value of the insert function.
2015-01-05 17:02:11 +01:00
Stanislav Malyshev
82f3d36583 cleanup intl types 2014-12-29 14:06:12 -08:00
Stanislav Malyshev
78d7ad27e2 eliminate usage of deprecated zend_get_parameters_ex 2014-12-28 23:46:42 -08:00
Stanislav Malyshev
983fdb25ea fix typo 2014-12-28 23:18:12 -08:00
Andrea Faulds
e5eb9530ab Use "float" and "integer" in typehint and zpp errors 2014-12-21 13:23:02 +00:00
Anatol Belski
4acc56d5b2 Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
  fix unserializer patch
  move this entry to the correct version
  add missing NEWS entry
  add missing NEWS entry
  Updated or skipped certain 32-bit tests
  add NEWS entry for #68594
  5.4.37
  add more BC breaks
  update news
  add CVE
  add missing test file
  Fix bug #68594 - Use after free vulnerability in unserialize()
  Fix typo
  Hash value must not zero?
2014-12-17 05:29:36 +01:00
Andrea Faulds
1392102b0c Updated or skipped certain 32-bit tests 2014-12-17 01:06:48 +00:00
Anatol Belski
7b6ed8db2f almost all the replacements of TSRMLS_* are done
Some places have to be yet touched as they use different/custom
macros namings for the same. Also some places in the code became
redundant now, this is the next task. To name some: ext/mysqlnd,
sapi/embed, ext/curl and some smaller places here and there.
2014-12-14 14:22:42 +01:00
Anatol Belski
bdeb220f48 first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
Anatol Belski
88bb9fedc4 Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (111 commits)
  Fix zend_fcall_info_arg*() to use ZVAL_COPY
  Fixed #65213 - cannot cast SplFileInfo to boolean
  add initial install
  switch to C travis project instead of PHP
  use the generic TRAVIS environment var to check for travis (see http://docs.travis-ci.com/user/ci-environment/)
  fix TS build
  add config option to target codegen architectures
  updated NEWS
  updated NEWS
  Fixed bug #55541 errors spawn MessageBox, which blocks test automation
  Get rid of duplicate handlers (ZEND_ADD_SPEC_TMP_TMP and ZEND_ADD_SPEC_VAR_VAR are absolutely the same).
  Use zend_string* for op_array->arg_info[]->name and op_array->arg_info[]->class_name. For internal functions we still use char*.
  Fixed __debugInfo() support
  Update UPGRADING for the new variadic functions, and re-sort.
  Improved POST INC/DEC
  make sure that we don't truncate the stack trace and cause false test failures when the test is executed in a directory with long path
  Missed closed folder mark
  Revert "Unecessary assignment"
  Fixed improper memory release
  Unecessary assignment
  ...
2014-12-05 03:50:02 +01:00
Stanislav Malyshev
b564e7b0de Merge branch 'PHP-5.6'
* PHP-5.6:
  Update NEWS
  fix typo
  Added test and review suggestion
  Fix bug #68335: rmdir doesnt work with file:// stream wrapper
2014-11-30 17:35:11 -08:00
Stanislav Malyshev
aae5d4d9db Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Update NEWS
  fix typo
2014-11-30 17:34:51 -08:00
Stanislav Malyshev
977974f95f fix typo 2014-11-30 17:09:53 -08:00
Stanislav Malyshev
fff70770dd Merge branch 'PHP-5.6'
* PHP-5.6:
  fix tests for systems with no de_DE locales
2014-11-30 16:13:14 -08:00
Stanislav Malyshev
f6aa6324fb fix tests for systems with no de_DE locales 2014-11-30 16:12:56 -08:00
Anatol Belski
3ca0ca1548 Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (102 commits)
  fix dir separator in test
  fix TS build
  fix TS build
  Better fix for bug #68446
  Revert "Merge remote-tracking branch 'origin/PHP-5.6'"
  Revert NEWS and set test to XFAIL
  Revert "Fix bug #68446 (bug with constant defaults and type hints)"
  Improved zend_hash_clean() and added new optimized zend_symtable_clean()
  Use inline version of zval_ptr_dtor()
  Added new optimized zend_array_destroy() function
  Moved i_zval_ptr_dtor() from zend_execute.h to zend_variables.h
  fix REGISTER_NS_*_CONSTANT macros
  Removed useless assert. EG(uninitialized_zval) can't be refcounted.
  Use specialized destructors when types of zvals are known.
  move tests into proper place
  Improved assignment to object property
  Reuse zend_assign_to_variable() in zend_std_write_property()
  cleanup comments from svn/cvs era
  fix dir separator in test
  fork test for windows
  ...
2014-11-26 08:17:35 +01:00
Anatol Belski
bcd9c6b256 Merge branch 'PHP-5.6'
* PHP-5.6:
  added test for things done so far for bug #66265
  partially fixed bug #66265
  forked bug67052.phpt for Windows
2014-11-21 10:25:18 +01:00
Anatol Belski
0581e877a5 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  added test for things done so far for bug #66265
  partially fixed bug #66265
  forked bug67052.phpt for Windows
2014-11-21 10:24:53 +01:00
Anatol Belski
502ce90873 forked bug67052.phpt for Windows 2014-11-21 09:53:55 +01:00
Anatol Belski
4f3ac2cdbe Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (36 commits)
  NEWS
  adapt test for error message introduce in fix for #68463
  Fix bug #68463 listen.allowed_clients can silently result in no allowed access
  run a few request in this test
  fix test
  fix test
  added info about some other macro changes
  added note about toolset and phpize
  added note about the response files
  split msgfmt_format_intlcalendar_variant*.phpt for ICU 54.1
  split formatter_format*.phpt for ICP 54.1
  split dateformat_timezone_arg_variations*.phpt for ICU 54.1
  split dateformat_get_set_timezone_variant*.phpt for ICU 54.1
  fix icu version to test
  split ext/intl/tests/dateformat_get_set_calendar_variant*.phpt for 54.1
  split dateformat_formatObject_datetime_variant*.phpt for ICU 54.1
  split dateformat_formatObject_calendar_variant*.phpt for ICU 54.1
  split dateformat_create_cal_arg_variant2.phpt for ICU 53.1 and 54.1
  clone dateformat_calendars_variant3.phpt for ICU 54.1
  split collator_get_sort_key_variant3.phpt for icu 54.1
  ...
2014-11-20 15:20:18 +01:00
Anatol Belski
548fe5617c Merge branch 'PHP-5.6'
* PHP-5.6:
  split msgfmt_format_intlcalendar_variant*.phpt for ICU 54.1
  split formatter_format*.phpt for ICP 54.1
  split dateformat_timezone_arg_variations*.phpt for ICU 54.1
  split dateformat_get_set_timezone_variant*.phpt for ICU 54.1
  fix icu version to test
  split ext/intl/tests/dateformat_get_set_calendar_variant*.phpt for 54.1
  split dateformat_formatObject_datetime_variant*.phpt for ICU 54.1
  split dateformat_formatObject_calendar_variant*.phpt for ICU 54.1
  split dateformat_create_cal_arg_variant2.phpt for ICU 53.1 and 54.1
  clone dateformat_calendars_variant3.phpt for ICU 54.1
  split collator_get_sort_key_variant3.phpt for icu 54.1
  split ext/intl/tests/collator_create3.phpt for icu >= 54.1
2014-11-20 13:37:13 +01:00
Anatol Belski
e25b23d1c9 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  split msgfmt_format_intlcalendar_variant*.phpt for ICU 54.1
  split formatter_format*.phpt for ICP 54.1
  split dateformat_timezone_arg_variations*.phpt for ICU 54.1
  split dateformat_get_set_timezone_variant*.phpt for ICU 54.1
  fix icu version to test
  split ext/intl/tests/dateformat_get_set_calendar_variant*.phpt for 54.1
  split dateformat_formatObject_datetime_variant*.phpt for ICU 54.1
  split dateformat_formatObject_calendar_variant*.phpt for ICU 54.1
  split dateformat_create_cal_arg_variant2.phpt for ICU 53.1 and 54.1
  clone dateformat_calendars_variant3.phpt for ICU 54.1
  split collator_get_sort_key_variant3.phpt for icu 54.1
  split ext/intl/tests/collator_create3.phpt for icu >= 54.1

Conflicts:
	ext/intl/tests/dateformat_create_cal_arg_variant3.phpt
	ext/intl/tests/dateformat_formatObject_calendar_variant3.phpt
	ext/intl/tests/dateformat_formatObject_datetime_variant3.phpt
	ext/intl/tests/dateformat_get_set_calendar_variant3.phpt
	ext/intl/tests/dateformat_get_set_timezone_variant3.phpt
	ext/intl/tests/dateformat_timezone_arg_variations3.phpt
	ext/intl/tests/msgfmt_format_intlcalendar_variant3.phpt
2014-11-20 13:36:37 +01:00
Anatol Belski
6c3768b154 split msgfmt_format_intlcalendar_variant*.phpt for ICU 54.1 2014-11-20 13:26:23 +01:00
Anatol Belski
65ca28b463 split formatter_format*.phpt for ICP 54.1 2014-11-20 13:17:41 +01:00
Anatol Belski
2ec7f04f7e split dateformat_timezone_arg_variations*.phpt for ICU 54.1 2014-11-20 13:12:02 +01:00
Anatol Belski
a52ff5cde6 split dateformat_get_set_timezone_variant*.phpt for ICU 54.1 2014-11-20 13:06:22 +01:00
Anatol Belski
36a2e235dd fix icu version to test 2014-11-20 13:01:04 +01:00
Anatol Belski
96249b68e5 split ext/intl/tests/dateformat_get_set_calendar_variant*.phpt for 54.1 2014-11-20 12:58:41 +01:00
Anatol Belski
278d71e508 split dateformat_formatObject_datetime_variant*.phpt for ICU 54.1 2014-11-20 12:53:11 +01:00
Anatol Belski
9cfe459e21 split dateformat_formatObject_calendar_variant*.phpt for ICU 54.1 2014-11-20 12:46:48 +01:00
Anatol Belski
54af278762 split dateformat_create_cal_arg_variant2.phpt for ICU 53.1 and 54.1 2014-11-20 12:39:52 +01:00
Anatol Belski
b61dba5e1d clone dateformat_calendars_variant3.phpt for ICU 54.1 2014-11-20 11:49:39 +01:00
Anatol Belski
8ca69ff641 split collator_get_sort_key_variant3.phpt for icu 54.1 2014-11-20 11:37:06 +01:00
Anatol Belski
f97fc096a3 split ext/intl/tests/collator_create3.phpt for icu >= 54.1 2014-11-20 11:17:42 +01:00
Veres Lajos
4b9535341a typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-19 20:23:00 +00:00
Anatol Belski
4fce2ae2c6 opcache, intl, gmp, exif, com, bcmath to use static tsrmls 2014-10-17 15:51:21 +02:00
Anatol Belski
c00424e427 bring back all the TSRMLS_FETCH() stuff
for better comparability with the mainstream
2014-10-15 09:37:55 +02:00
Anatol Belski
8a7c8d2213 cleanup TSRMLS_FETCH 2014-09-26 21:39:29 +02:00
Anatol Belski
e48b196505 cleanup tsrm_ls 2014-09-26 20:52:57 +02:00
Anatol Belski
31cc63b1a4 fix some extension builds 2014-09-25 20:02:48 +02:00
Nikita Popov
a770d29df7 Add smart_str_append for appending zend_strings
Also replaces usages in Zend/ and ext/standard
2014-09-21 20:58:31 +02:00
Nikita Popov
e33f3d3b7c Move smart_str implementation into Zend/
So we can use it there as well...

For now I've retained the zend_smart_str_public.h header, though
it would probably be better to just move that one struct into
zend_types.h.
2014-09-21 20:49:39 +02:00
Florian MARGAINE
8eb7e7bf7f Merge branch 'master' into issue-67910
Conflicts:
	README.PARAMETER_PARSING_API
	ext/gmp/tests/001.phpt
2014-09-20 10:09:21 +02:00
Florian MARGAINE
cf0303e782 Replaces php5 with php7, without whitespace changes. 2014-09-20 10:01:44 +02:00
Johannes Schlüter
d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Dmitry Stogov
3bc8a958c5 Fixed useless or duplicated IS_INTERNED() checks 2014-09-19 15:41:01 +04:00
Dmitry Stogov
e51677b2e6 fixed reference counting 2014-09-02 11:24:52 +04:00
Dmitry Stogov
88d7ca44f6 Refactored INI subsystem to use zend_string* instead of char* 2014-09-01 20:57:33 +04:00
Anatol Belski
0e41927ca0 fixed UConverter::convert() 2014-08-27 23:03:58 +02:00
Anatol Belski
6db8d4f829 's' works with size_t round 3 2014-08-27 20:49:36 +02:00
Anatol Belski
257ed4061a 's' works with size_t round 2 2014-08-27 20:49:33 +02:00
Anatol Belski
3234480827 first show to make 's' work with size_t 2014-08-27 20:49:31 +02:00
Anatol Belski
202e8db1dc fixed several long vs zend_long casts 2014-08-26 11:26:53 +02:00
Anatol Belski
af59e92b24 master renames phase 7 2014-08-25 21:51:49 +02:00
Anatol Belski
4d997f63d9 master renames phase 3 2014-08-25 20:22:49 +02:00
Anatol Belski
c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Anatol Belski
70de6180d5 fixes to %pd format usage 2014-08-24 02:35:34 +02:00
Anatol Belski
113e3c1eeb fix zpp 2014-08-21 15:42:48 +02:00
Anatol Belski
7ef536e4c9 Merge remote-tracking branch 'php/master'
Conflicts:
	Zend/zend_exceptions.c
2014-08-21 13:54:15 +02:00
krakjoe
e530817209 fix the version requirements for these tests 2014-08-21 09:29:43 +01:00
krakjoe
25cc882425 correct version number requirements for this test 2014-08-21 09:22:05 +01:00
Anatol Belski
4c2330c1e8 make g++ see all the stdint.h stuff 2014-08-20 15:26:53 -07:00
Anatol Belski
888ef26cc5 yet trivial fixes 2014-08-20 22:54:00 +02:00
Anatol Belski
063079b62e ported ext/intl, bugfixes to go 2014-08-19 22:57:17 +02:00
Anatol Belski
63d3f0b844 basic macro replacements, all at once 2014-08-19 08:07:31 +02:00
Xinchen Hui
d790eceb01 Fixed version id 2014-08-16 16:44:02 +08:00
Xinchen Hui
7af24dcb47 Better version checking 2014-08-15 18:39:45 +08:00
krakjoe
dc70139d85 update zend_make_printable_zval to take TSRM context 2014-08-11 06:09:46 +01:00
Dmitry Stogov
ce1af1e47b Fixed bug #67725 (now we create immutable arrays only in SHM) 2014-08-05 15:38:43 +04:00
Xinchen Hui
238a3167e6 Fixed valgrind issues 2014-07-31 18:15:47 +08:00
Rasmus Lerdorf
050ef52549 1.2 is a problematic float to print out
Lower the default display precision for this test
2014-07-14 07:21:10 -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
Dmitry Stogov
42c4bcaed1 Fixed ZTS build 2014-07-14 14:25:04 +04:00
Dmitry Stogov
32e477c98c Merge branch 'master' into phpng
* master: (40 commits)
  Bug #67609: TLS connections fail behind HTTP proxy
  Updated NEWS for #67594
  Updated NEWS for #67594
  Fix #67594 - invisible colon should be stripped off header name
  Updated NEWS for 34407
  Updated NEWS for 34407
  Updated NEWS for 34407
  Fix for bug #34407 - ucwords and title case
  fixed broken merged code
  Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
  fixed broken merged code
  Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
  Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
  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
  fix makefile in phpize mode
  fixe output_as_table() when no ext was enabled
  fix end of stream exception when generating makefile
  ...

Conflicts:
	ext/standard/http_fopen_wrapper.c
	ext/standard/string.c
	sapi/cli/php_cli_server.c
2014-07-14 11:44:53 +04: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