Commit Graph

393 Commits

Author SHA1 Message Date
Felipe Pena
920d298f4a - Fixed ZTS build 2014-05-13 00:34:10 -03:00
Xinchen Hui
cd00ea9993 Port iconv (all tests passes) 2014-05-05 13:58:23 +08:00
Dmitry Stogov
f9927a6c97 Merge mainstream 'master' branch into refactoring
During merge I had to revert:
	Nikita's patch for php_splice() (it probably needs to be applyed again)
	Bob Weinand's patches related to constant expression handling (we need to review them carefully)
	I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)

Conflicts:
	Zend/zend.h
	Zend/zend_API.c
	Zend/zend_ast.c
	Zend/zend_compile.c
	Zend/zend_compile.h
	Zend/zend_constants.c
	Zend/zend_exceptions.c
	Zend/zend_execute.c
	Zend/zend_execute.h
	Zend/zend_execute_API.c
	Zend/zend_hash.c
	Zend/zend_highlight.c
	Zend/zend_language_parser.y
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
	Zend/zend_variables.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/date/php_date.c
	ext/dom/documenttype.c
	ext/hash/hash.c
	ext/iconv/iconv.c
	ext/mbstring/tests/zend_multibyte-10.phpt
	ext/mbstring/tests/zend_multibyte-11.phpt
	ext/mbstring/tests/zend_multibyte-12.phpt
	ext/mysql/php_mysql.c
	ext/mysqli/mysqli.c
	ext/mysqlnd/mysqlnd_reverse_api.c
	ext/mysqlnd/php_mysqlnd.c
	ext/opcache/ZendAccelerator.c
	ext/opcache/zend_accelerator_util_funcs.c
	ext/opcache/zend_persist.c
	ext/opcache/zend_persist_calc.c
	ext/pcre/php_pcre.c
	ext/pdo/pdo_dbh.c
	ext/pdo/pdo_stmt.c
	ext/pdo_pgsql/pgsql_driver.c
	ext/pgsql/pgsql.c
	ext/reflection/php_reflection.c
	ext/session/session.c
	ext/spl/spl_array.c
	ext/spl/spl_observer.c
	ext/standard/array.c
	ext/standard/basic_functions.c
	ext/standard/html.c
	ext/standard/mail.c
	ext/standard/php_array.h
	ext/standard/proc_open.c
	ext/standard/streamsfuncs.c
	ext/standard/user_filters.c
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
	main/php_variables.c
	sapi/phpdbg/phpdbg.c
	sapi/phpdbg/phpdbg_bp.c
	sapi/phpdbg/phpdbg_frame.c
	sapi/phpdbg/phpdbg_help.c
	sapi/phpdbg/phpdbg_list.c
	sapi/phpdbg/phpdbg_print.c
	sapi/phpdbg/phpdbg_prompt.c
2014-04-26 00:32:51 +04:00
Dmitry Stogov
050d7e38ad Cleanup (1-st round) 2014-04-15 15:40:40 +04: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
Yasuo Ohgaki
ca927bb47e Add missing E_DEPRECATED error for https://wiki.php.net/rfc/default_encoding 2014-03-12 17:54:22 +09:00
Yasuo Ohgaki
cbd108abf1 Implement RFC https://wiki.php.net/rfc/default_encoding 2014-02-13 11:54:52 +09:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Christopher Jones
c6d977dd39 Fix long-standing visual pain point: the misalignment of './configure help' text.
Whitespace changes and a couple of grammar fixes.
2013-08-06 11:06:09 -07:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui
e081c55fb5 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:31:31 +08:00
Xinchen Hui
610c7fbe7b Remove executable permission on phpt 2012-10-10 10:27:49 +08:00
Stanislav Malyshev
ed6ce83101 fix bug #55042 - erealloc without updating pointer 2012-05-30 22:26:26 -07:00
David Soria Parra
c918ca57a7 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Replace $Revision$ with $Id$ in keyword expansion enable files
  Enable $Id$ expansion for files with the $Revision$ keyword

Conflicts:
	ext/mysqlnd/mysqlnd.h
2012-03-20 17:58:58 +01:00
David Soria Parra
f7b10abae9 Replace $Revision$ with $Id$ in keyword expansion enable files 2012-03-20 17:53:47 +01:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Pierre Joye
50fc27d119 - missing --SKIPIF-- 2011-09-06 09:28:23 +00:00
Pierre Joye
380aac7189 - add skipif 2011-09-06 06:42:11 +00:00
Hannes Magnusson
c6f9556f37 Fix the test in 5.4 and trunk.
older libraries will emmit error here, while new won't. So lets just suppress it rather then making the test uselessly fail for random people.
2011-09-05 11:07:38 +00:00
Hannes Magnusson
3d6fcf06d1 Fix the test in 5.4 and trunk.
older libraries will emmit error here, while new won't. So lets just suppress it rather then making the test uselessly fail for random people.
2011-09-05 11:07:38 +00:00
Matteo Beccati
953b10c59c Fixed test. Apparently it was already fixed on PHP_5_3 98% of the cases and
the fix wasn't ported to trunk/PHP_5_4. However the very same test was failing
on my FreeBSD 6.2 box, that appears to also decode the "ks_c_5601-1987" parts,
so I've made the test more generic.
2011-08-31 22:38:20 +00:00
Matteo Beccati
e9e2357436 Fixed test. Apparently it was already fixed on PHP_5_3 98% of the cases and
the fix wasn't ported to trunk/PHP_5_4. However the very same test was failing
on my FreeBSD 6.2 box, that appears to also decode the "ks_c_5601-1987" parts,
so I've made the test more generic.
2011-08-31 22:38:20 +00:00
Stanislav Malyshev
3b7cdd0227 fix failing tests 2011-08-01 01:00:57 +00:00
Felipe Pena
23e438594d - Make usage of new PHP_FE_END macro 2011-07-25 11:42:53 +00:00
Felipe Pena
4b30846b50 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Pierre Joye
45420bb669 - remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ, missing tests changes in 5.4 2011-07-22 11:56:20 +00:00
Felipe Pena
927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Pierre Joye
aea6771d19 - add phpize support for windows, need a nmake install for now (nmake devel-pkg version is coming), works exactly the same as on unix, or should :) 2010-12-13 18:43:10 +00:00
Pierre Joye
a7ffa09e18 - add PHP_INSTALL_HEADERS to all parts (core&exts) exposing headers, generate the install-headers cmd 2010-12-11 22:18:10 +00:00
Ilia Alshanetsky
d506ce8d94 Fixed bug #51250 (iconv_mime_decode() does not ignore malformed Q-encoded words) 2010-12-01 14:03:36 +00:00
Ilia Alshanetsky
19a0263e65 Fixed bug #51250 (iconv_mime_decode() does not ignore malformed Q-encoded words) 2010-12-01 14:03:36 +00:00
Ilia Alshanetsky
523da85c11 Fixed bug #53304 (quot_print_decode does not handle lower-case hex digits) 2010-11-25 21:38:06 +00:00
Ilia Alshanetsky
8f85ff3dd6 Fixed bug #53304 (quot_print_decode does not handle lower-case hex digits) 2010-11-25 21:38:06 +00:00
Patrick Allaert
817776d1b9 - Fixed tests not passing under windows because of the directory separator
difference (thanks Eyal Teutsch for reporting)
2010-11-08 09:29:15 +00:00
Patrick Allaert
e2e76d40e3 - Fixed tests not passing under windows because of the directory separator
difference (thanks Eyal Teutsch for reporting)
2010-11-08 09:29:15 +00:00
Adam Harvey
5f9956397f Fixed bug #52941 (The 'iconv_mime_decode_headers' function is skipping
headers).
2010-09-30 11:04:21 +00:00
Adam Harvey
750d835b70 Fixed bug #52941 (The 'iconv_mime_decode_headers' function is skipping
headers).
2010-09-30 11:04:21 +00:00
Ilia Alshanetsky
a532eefe29 Fixed bogus char 2010-08-22 18:17:19 +00:00
Ilia Alshanetsky
e9735b92a4 Fixed bug #52599 (iconv output handler outputs incorrect content type when flags are used). 2010-08-19 12:27:13 +00:00
Ilia Alshanetsky
06c460c995 Fixed bug #52599 (iconv output handler outputs incorrect content type when flags are used). 2010-08-19 12:27:13 +00:00
Felipe Pena
e3fdf31b0b - Fixed bug #52211 (iconv() returns part of string on error) 2010-07-01 01:11:08 +00:00
Michael Wallner
11d24c1593 * implement new output API, fixing some bugs and implementing some feature
requests--let's see what I can dig out of the bugtracker for NEWS--
  and while crossing the road:
   * implemented new zlib API
   * fixed up ext/tidy (what was "s&" in zend_parse_parameters() supposed to do?)

Thanks to Jani and Felipe for pioneering.
2010-05-31 10:29:43 +00:00
Adam Harvey
5c5fd74fdb Fix for bug #48289 (iconv_mime_encode() quoted-printable scheme is broken).
Thanks to Hiroaki Kawai for the original patch.
2010-05-04 11:56:59 +00:00
Adam Harvey
73ddb79613 Fix for bug #48289 (iconv_mime_encode() quoted-printable scheme is broken).
Thanks to Hiroaki Kawai for the original patch.
2010-05-04 11:56:59 +00:00
Rob Richards
0a34d10783 revert change #298288: Remove old dsp/dsw/makefile files 2010-04-28 14:41:51 +00:00
Kalle Sommer Nielsen
518a17e7bf Remove old dsp/dsw/makefile files, these arent used by the build system anymore and are barely updated nor available for all extensions 2010-04-21 23:36:49 +00:00
Jani Taskinen
af49e58f51 - Reverted r296062 and r296065 2010-03-12 10:28:59 +00:00
Jani Taskinen
06f072cb5e MFH: Improved / fixed output buffering (Michael Wallner) 2010-03-11 10:24:29 +00:00
Kalle Sommer Nielsen
62f087df75 Rename the HAVE_LIBICONV_IN_LIBICONV macro to ICONV_ALIASED_LIBICONV, making it less cryptic 2010-03-08 15:51:08 +00:00
Kalle Sommer Nielsen
b961634c5a Fix linking of iconv on Windows 2010-03-08 14:04:35 +00:00
Moriyoshi Koizumi
8481fd7c3b - Fixed bug #49267 (linking fails for iconv) 2010-03-05 09:12:13 +00:00
Rasmus Lerdorf
fcf1058d6b Fix bug #43314
Assume worst case all-encoded case here
2010-03-01 23:49:01 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Jani Taskinen
f0c1cd512f - ws 2009-12-23 21:06:26 +00:00
Jani Taskinen
50a24392e9 - Fix tests assuming wrong ini options and extensions that might not be there 2009-11-30 20:31:52 +00:00
Zoe Slattery
1c98e49afd Test from 2009 testfest 2009-08-26 17:17:58 +00:00
Rasmus Lerdorf
7e32cc59f7 Give this test more headroom since it needs to allocate a 90M block 2009-08-02 23:08:21 +00:00
Rasmus Lerdorf
ee01362c98 Get rid of this platform-specific test 2009-07-28 14:56:08 +00:00
andy wharmby
642b84cd83 New iconv extension tests. Tested on Windows, Linux and Linux 64 bit. 2009-06-13 12:17:42 +00:00
andy wharmby
092562b263 New iconv extension tests. Tested on Windows, Linux and Linux 64 bit. 2009-06-12 18:57:09 +00:00
andy wharmby
c48a3ddea8 New iconv extension tests. Tested on Windows, Linux and Linux 64 bit 2009-06-12 17:16:01 +00:00
Moriyoshi Koizumi
6e265a738e - Add a new test for the additional delimiter of the encoding conversion filter 2009-05-14 19:06:20 +00:00
Moriyoshi Koizumi
cc547c86df - Update the test as newer libc gets the bogus input through rather than
rejecting it.
2009-05-14 19:02:38 +00:00
Moriyoshi Koizumi
d8a22d0b05 - MFH: Make iconv filter accept '.' as the delimiter between encoding names as
well as '/'. It's impossible to specify the filter in php://filter without
  this fix.

# I hope this to be merged to 5.2 as well. This doesn't break BC as there is
# no such encoding name that contains '.'. (Andif there were to be such one,
# the filter is failed in the first place since it also uses '.' for the
# delimiter between the filter name and the "from" encoding name.
2009-03-17 05:31:04 +00:00
Sebastian Bergmann
08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00
Felipe Pena
fc2fb50d09 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-11-17 11:28:01 +00:00
Felipe Pena
7a37fa2d6b - Revert ZEND_BEGIN_ARG_INFO change 2008-11-02 21:19:39 +00:00
Felipe Pena
df10005563 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-10-24 14:35:40 +00:00
Arnaud Le Blanc
d69dfa4b9f MFH: initialize optional vars 2008-10-21 22:08:38 +00:00
Nuno Lopes
8a77e55566 clean some dead code (with static analysis help) 2008-09-23 15:18:26 +00:00
Pierre Joye
4ef36bc364 - MFH: update lib detection and does not enable it when lib/headers are missing 2008-07-06 16:59:13 +00:00
Antony Dovgal
a894ab2a00 MFH 2008-05-21 15:03:20 +00:00
Dmitry Stogov
240fa244c3 Improved PHP binary size and startup speed with GCC4 visibility control (Nuno) 2008-01-30 09:41:12 +00:00
Sebastian Bergmann
d1dded8751 MFH: Bump copyright year, 2 of 2. 2007-12-31 07:17:19 +00:00
Antony Dovgal
550b617be1 MFH: detect IBM iconv implementation and use correct encoding names 2007-12-04 11:27:25 +00:00
Antony Dovgal
e60e9ae5c8 MFH: initialize correct variable 2007-11-01 19:13:39 +00:00
Yiduo (David) Wang
4b4d634cb9 MFH: Added macros for managing zval refcounts and is_ref statuses 2007-10-07 05:22:07 +00:00
Dmitry Stogov
6c810b0d4c Improved memory usage by movig constants to read only memory. (Dmitry, Pierre) 2007-09-27 18:00:48 +00:00
Antony Dovgal
84195223ec MFH: fix coverity issue #412 2007-09-27 09:18:50 +00:00
Antony Dovgal
366c113156 MFH: plug leak on error (coverity issue #407) 2007-09-21 13:37:30 +00:00
Stanislav Malyshev
7985002fc6 better fix for iconv_substr 2007-09-20 22:35:24 +00:00
Stanislav Malyshev
c70e307e77 fix potential overflow (Mattias Bengtsson) 2007-09-20 21:55:14 +00:00
Stanislav Malyshev
f7e4ff1054 one more test 2007-09-19 00:49:02 +00:00
Stanislav Malyshev
2fe9599880 limit iconv parameter sizes - workaround for glibc bug 2007-09-19 00:30:52 +00:00
Stanislav Malyshev
15a715ae73 add length tests for iconv functions 2007-09-19 00:18:01 +00:00
Ilia Alshanetsky
c8a694eb45 Avoid strlen() 2007-05-19 17:52:30 +00:00
Antony Dovgal
1f65545121 fix test names 2007-05-07 18:03:01 +00:00
foobar
0d5a13ddda MFH 2007-05-05 19:26:39 +00:00
Antony Dovgal
5088614ea1 synchronize iconv_substr() behavior with substr()
no MFB so far, since substr() changes are not MFBed either
2007-03-12 19:34:26 +00:00
Antony Dovgal
acd14f802c MFH 2007-03-01 11:29:43 +00:00
Antony Dovgal
7255b4b953 fix tests on AIX 2007-02-21 19:52:20 +00:00
Antony Dovgal
6e8654aae1 plug leak 2007-02-01 14:02:35 +00:00
Antony Dovgal
d32dc5bda0 MFH 2007-01-24 00:33:51 +00:00
Antony Dovgal
fc9970a6e9 MFH: fix #40129 (iconv extension doesn't compile with CodeWarrior on Netware)
patch by gk at gknw dot de
2007-01-17 20:32:53 +00:00
Sebastian Bergmann
4223aa4d5e MFH: Bump year. 2007-01-01 09:36:18 +00:00
Antony Dovgal
2e3cd64566 MFH 2006-12-25 20:44:45 +00:00
Hannes Magnusson
1e19ee8785 - Fixed incorrect function names on FreeBSD where inet_pton() was named
__inet_pton() and inet_ntop() was named __inet_ntop()
- Fixed bug #39685 (iconv() - undefined function)
- Fixed bug #38852 (XML-RPC Breaks iconv)
2006-12-20 10:34:36 +00:00