clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-27 04:47:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
85,309 Commits 494 Branches 1,367 Tags 780 MiB
3eb679b952
Commit Graph

2939 Commits

Author SHA1 Message Date
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
Adam Harvey
aa3a5f7681 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Keep 308-399 HTTP response codes when header('Location:') is called.
 2014-06-12 17:38:52 -07:00
Adam Harvey
1b9cbab9a7 Keep 308-399 HTTP response codes when header('Location:') is called. 
Fixes bug #67428 (header('Location: foo') will override a 308-399 response
code).
 2014-06-12 17:35:05 -07:00
Andrea Faulds
2b5d25d1fc Merge branch 'httponly-cookies' of https://github.com/mj/php-src 2014-06-12 10:03:14 +01:00
Dmitry Stogov
dd1c68e67f Merge branch 'master' into phpng 
* master: (77 commits)
  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(
  Fix potential segfault in dns_get_record()
  Revert "Add optional second arg to unserialize()"
  5.5.15 now
  update NEWS
  Fix bug #66127 (Segmentation fault with ArrayObject unset)
  5.4.31 next
  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
  Remove unused included file
  NEWS
  NEWS
  NEWS
  Fixed Bug #67413 	fileinfo: cdf_read_property_info insufficient boundary chec
  ...

Conflicts:
	Zend/zend_closures.c
	Zend/zend_execute.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/spl/spl_array.c
	ext/standard/basic_functions.c
	ext/standard/dns.c
	ext/standard/var.c
 2014-06-12 05:07:33 +04: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
b060880c87 Fixed bug #67399 (putenv with empty variable may lead to crash) 2014-06-08 23:10:44 -07:00
Stanislav Malyshev
336b5f59b6 Fixed bug #67399 (putenv with empty variable may lead to crash) 2014-06-08 23:10:04 -07:00
Stanislav Malyshev
4b0b032676 Fixed bug #67399 (putenv with empty variable may lead to crash) 2014-06-08 23:09:31 -07:00
Stanislav Malyshev
62857998c5 Fixed bug #67399 (putenv with empty variable may lead to crash) 2014-06-08 23:09:09 -07: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
Anatol Belski
e2710310a0 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed regression introduced by patch for bug #67072
 2014-06-03 20:51:18 +02:00
Anatol Belski
20568e5028 Fixed regression introduced by patch for bug #67072 
This applies to 5.4 and 5.5 only as a legacy fix.
 2014-06-03 20:43:58 +02:00
Xinchen Hui
91b2ddc816 Merge branch 'master' into phpng 
Conflicts:
	ext/spl/spl_array.c
	ext/spl/spl_directory.c
	ext/standard/formatted_print.c
 2014-06-01 22:43:06 +08:00
Dmitry Stogov
cf603fb960 Reference counter in phpng may have a bit different meaning and must not be the same 2014-05-28 02:16:21 +04: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
Stanislav Malyshev
a2f8c9c1ae Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  update NEWS
  Fix bug #67249: printf out-of-bounds read
 2014-05-27 12:10:41 -07:00
Stanislav Malyshev
091b7642c2 Fix bug #67249: printf out-of-bounds read 2014-05-27 11:28:22 -07:00
Nikita Popov
43cf92edf6 Fix in_array (strict) with references 2014-05-25 18:19:00 +02:00
Dmitry Stogov
b11a30f5ea Merge branch 'master' into phpng 
* master:
  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
  adding NEWS block for beta4
  5.4.30 next
  enable email notifications
  update NEWS
  update NEWS
  update NEWS
  - Updated to version 2014.3 (2014c)
  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)

Conflicts:
	ext/opcache/zend_persist.c
	ext/spl/spl_array.c
 2014-05-18 21:17:31 +04:00
zborboa-google
ec7eccaaae Test 2014-05-14 13:11:51 -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
Stanislav Malyshev
a03a1ab88c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  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)

Conflicts:
	ext/date/lib/parse_date.c
	ext/date/lib/parse_date.re
 2014-05-13 17:02:09 -07:00
Stanislav Malyshev
0094fd0969 Merge branch 'bug67252' into PHP-5.4 
* bug67252:
  fix bug #67253: timelib_meridian_with_check out-of-bounds read
  Fix bug #67252: convert_uudecode out-of-bounds read
 2014-05-13 16:47:27 -07:00
Stanislav Malyshev
1e2818b143 Fix bug #67252: convert_uudecode out-of-bounds read 2014-05-11 20:29:27 -07:00
Stanislav Malyshev
3e9cb6a4a5 Fix bug #67250 (iptcparse out-of-bounds read) 2014-05-11 19:09:19 -07:00
Nikita Popov
f1e1231529 Fix strtr() segfault 2014-05-09 15:14:27 +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
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
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
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
Stanislav Malyshev
f6841d250a Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  add a test case previously broken by a bad fix
  Revert "Fixed bug #64604"
 2014-04-24 23:59:32 -07:00
Stanislav Malyshev
03c703b8bd add a test case previously broken by a bad fix 2014-04-24 23:58:38 -07:00
Stanislav Malyshev
a328803803 Revert "Fixed bug #64604" 
This reverts commit b05c088a3a.
Breaks parsing urls where query has : in it, like: /foo/bar?baz=goo:boo
 2014-04-24 23:50:45 -07:00
Dmitry Stogov
d0ed1212a4 Enable PCRE JIT compiler 2014-04-25 08:33:37 +04:00
Nikita Popov
08ae88157b Allocate zend_strings with correct size 
For me (32bit) sizeof(zend_string) is 20, which means that the
char[1] array at the end is padded with three bytes. Thus allocating
based on sizeof(zend_string)-1 overallocates by those 3 padding bytes.

This commit fixes the allocation size, by using XtOffsetOf.
 2014-04-23 19:34:51 +02: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
Stanislav Malyshev
5addf223d5 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #65701: Do not use cache for file file copy
 2014-04-20 15:25:03 -07:00
Boro Sitnikovski
a18cec1b86 Fix bug #65701: Do not use cache for file file copy 2014-04-20 15:22:44 -07: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
Anatol Belski
7c400dc867 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Improved the fix for bug #67072, thanks Nikita
 2014-04-18 15:14:42 +02:00
Anatol Belski
c2acdbdd3d Improved the fix for bug #67072, thanks Nikita 2014-04-18 15:13:32 +02: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
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
Anatol Belski
dc407c2402 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #67072 Echoing unserialized "SplFileObject" crash

Conflicts:
	ext/standard/var_unserializer.c
 2014-04-17 11:05:21 +02:00
Anatol Belski
5328d42899 Fixed bug #67072 Echoing unserialized "SplFileObject" crash 
The actual issue lays in the unserializer code which doesn't honor
the unserialize callback. By contrast, the serialize callback is
respected. This leads to the situation that even if a class has
disabled the serialization explicitly, user could still construct
a vulnerable string which would result bad things when trying
to unserialize.

This conserns also the classes implementing Serializable as well
as some core classes disabling serialize/unserialize callbacks
explicitly (PDO, SimpleXML, SplFileInfo and co). As of now, the
flow is first to call the unserialize callback (if available),
then call __wakeup. If the unserialize callback returns with no
success, no object is instantiated. This makes the scheme used
by internal classes effective, to disable unserialize just assign
zend_class_unserialize_deny as callback.
 2014-04-17 10:48:14 +02: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
30ec1c0051 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #64604
 2014-04-13 18:38:36 -07:00
Ingo Walz
b05c088a3a Fixed bug #64604 2014-04-13 18:37:40 -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
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
Stanislav Malyshev
fe72caa6e5 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #67024 - getimagesize should recognize BMP files with negative height
 2014-04-13 15:23:32 -07:00
Gabor Buella
1010200da5 Fixed bug #67024 - getimagesize should recognize BMP files with negative height 2014-04-13 15:17:04 -07:00
Bob Weinand
bf3edbada6 Merge branch 'PHP-5.4' into PHP-5.5 2014-04-13 23:03:53 +02:00
Bob Weinand
beda5093b4 Reverted to 5a0da281e5 
Discussion: http://news.php.net/php.cvs/76836
 2014-04-13 23:01:31 +02: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
191d9fc227 Merge branch 'PHP-5.4' into PHP-5.5 2014-04-13 19:37:06 +02:00
Bob Weinand
f07e37c96d Forgot title in phpt for bug #67064 2014-04-13 19:34:17 +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
Bob Weinand
eca0644e0a Merge branch 'PHP-5.4' into PHP-5.5 2014-04-13 19:25:07 +02:00
Bob Weinand
1a4a9eede5 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().
 2014-04-13 19:24:12 +02:00
Dmitry Stogov
c6af3781ee Fixed test (now string data allocated together with zend_string structure) 2014-04-11 23:25:50 +04:00
Dmitry Stogov
affc7ab6c5 Fixed test (order of variables doesn't mater) 2014-04-11 23:04:47 +04: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
Ferenc Kovacs
e00e4b9334 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  abstract namespace for unix sockets is a linux only feature
 2014-04-09 19:02:25 +02:00
Ferenc Kovacs
2c8aeda6dc abstract namespace for unix sockets is a linux only feature 2014-04-09 19:01:01 +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
Tjerk Meesters
287790d5c8 Don't test for specific non-zero substr_compare() return value 2014-04-09 20:10:34 +08:00
Tjerk Meesters
419d98b291 Merge branch 'PHP-5.6' 2014-04-09 07:37:07 +08:00
Tjerk Meesters
2aba2494f5 Merge branch 'PHP-5.5' into PHP-5.6 2014-04-09 07:34:49 +08:00
Tjerk Meesters
032921d80c Fixed bug 67043 2014-04-09 07:33:55 +08: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
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
f453917f62 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #61019 (Out of memory on command stream_get_contents)
 2014-04-02 15:37:50 +02:00
Michael Wallner
1ec83d44a1 Fixed bug #61019 (Out of memory on command stream_get_contents) 2014-04-02 15:36: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
Michael Wallner
af147ac9b7 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #64330
 2014-04-02 11:10:59 +02:00
Michael Wallner
91a9d24aa3 Fix bug #64330 
stream_socket_server() creates wrong Abstract Namespace UNIX sockets
 2014-04-02 11:09:26 +02: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
Dmitry Stogov
e82f112468 Fixed test (scalar values don't have reference counters...) 2014-03-26 00:01:33 +04:00
Yasuo Ohgaki
e1fe76f28a Add default_charset handling 2014-03-20 10:50:32 +09:00
Dmitry Stogov
89ad91a8cc Fixed tests 2014-03-18 13:28:50 +04:00
Dmitry Stogov
dbc68b9b88 Fixed tests (scalar don't have reference counter, other values may get different counter values) 2014-03-18 01:16:12 +04:00
Dmitry Stogov
493d5adab5 Fixed test (scalars don;t have reference counter any more) 2014-03-13 23:04:30 +04:00
Xinchen Hui
a38694be52 Fixed warning mesg 2014-03-10 10:49:53 +08:00
Xinchen Hui
43eaced19f All tests passed in ext/standard/tests/dir now 2014-03-09 20:10:02 +08:00
Nikita Popov
200c97829d Merge branch 'PHP-5.5' into PHP-5.6 2014-03-06 23:15:30 +01:00
Nikita Popov
ecf7570072 Merge branch 'PHP-5.4' into PHP-5.5 2014-03-06 23:12:41 +01:00
Dmitry Panin
e2fc6b52f0 Fix HTML entity table generation 2014-03-06 23:10:31 +01:00
Xinchen Hui
53a3210750 Fixed refcount showing 2014-03-05 12:06:56 +08:00
Xinchen Hui
91a1e7b90b Fixed warning mesgs 2014-03-05 12:05:28 +08:00
Xinchen Hui
12478f7287 Fixed warning msg 2014-03-04 20:31:24 +08:00
Xinchen Hui
851ba9a198 Fixed warning mesg 2014-03-04 20:10:41 +08:00
Xinchen Hui
1f228e46d0 Error message has been changed 2014-03-03 22:39:20 +08:00
Tjerk Meesters
330ffe2e24 Merge branch 'PHP-5.5' into PHP-5.6 2014-03-03 05:58:03 +08:00
Tjerk Meesters
bbd0781b39 Merge branch 'PHP-5.4' into PHP-5.5 2014-03-03 05:56:22 +08:00
Tjerk Meesters
e73c05b75e proc_open(): separate environment values that aren't strings 
Added a test case
 2014-03-03 05:49:52 +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
datibbaw
2e459be237 substr_compare(): Allow zero length comparison 
Treat zero length comparison as always equal.
 2014-02-28 23:45:04 +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
d022c8565d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed test case title
  [bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given
 2014-02-28 22:30:21 +08:00
Tjerk Meesters
eca13f7909 Fixed test case title 2014-02-28 22:27:32 +08:00
Tjerk Meesters
79b3c2a744 [bug 66535] X-PHP-Originating-Script adds newline if no custom headers are given 
A newline is added to the mail headers when mail.add_x_header is used and no other headers are passed to mail().

The scenario in which custom headers are used was already fixed in #48620, back in 2009.
 2014-02-28 22:22:07 +08:00
Xinchen Hui
4b6eb998da Fixed error msg 2014-02-26 16:24:44 +08: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
Bob Weinand
363ff60475 Fixed memory leak in pow operator 2014-02-06 21:31:40 +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
Stanislav Malyshev
d5560faaa3 drop precision since trigonometric functions are non-portable 
See: http://stackoverflow.com/questions/21212326/floating-point-arithmetic-and-reproducibility
 2014-01-26 15:51:17 -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
1dcaa109a1 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  drop precision since trigonometric functions are non-portable
 2014-01-26 15:15:38 -08:00
Stanislav Malyshev
35cb180d9e drop precision since trigonometric functions are non-portable 
See: http://stackoverflow.com/questions/21212326/floating-point-arithmetic-and-reproducibility
 2014-01-26 15:14:16 -08: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
Will Fitch
767e6d2e08 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #66509: copy() arginfo incorrect since 5.4

Conflicts:
	NEWS
 2014-01-18 11:39:32 -05:00
Will Fitch
5b906ce6eb Fix bug #66509: copy() arginfo incorrect since 5.4 
Since 5.4, the ZEND_BEGIN_ARG_INFO_EX was replaced
by non _EX, causing Reflection to assume the
$context parameter is required.
 2014-01-18 11:25:53 -05: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
748e707bf9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  one more extension for the basename test
 2014-01-05 19:21:27 +01:00
Anatol Belski
1c586d4070 one more extension for the basename test 2014-01-05 19:19:54 +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
3bde9cfd8d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  improved the fix for bug #66395
 2014-01-05 19:12:52 +01:00
Anatol Belski
3f7f72adb2 improved the fix for bug #66395 
- fixed the traverse vulnerability in case like c:d:file.txt
- ensure paths containing NTFS streams are still worky
 2014-01-05 19:05:04 +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
Anatol Belski
d3a053d9f4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #66395 basename function doesn't remove drive letter
 2014-01-03 22:32:39 +01:00
Anatol Belski
46f60fae22 Fixed bug #66395 basename function doesn't remove drive letter 2014-01-03 22:25:58 +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
Eric Stenson
330168a247 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-15 16:51:21 +08: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
Sara Golemon
32a4cc8353 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:49:16 -08: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
2f5ab04c5f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed tests
 2013-12-02 12:04:07 +04:00
Dmitry Stogov
edbefd1d5c Fixed tests 2013-12-02 11:53:35 +04: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
Anatol Belski
ad5a63e8bc Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixed test
 2013-11-21 21:29:02 +01:00
Anatol Belski
345032946c fixed test 2013-11-21 21:24:47 +01: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
Yasuo Ohgaki
b8b92bd790 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean
 2013-11-20 07:23:54 +09:00
Yasuo Ohgaki
0d558afc05 Fix WS in serialization_error_002.phpt 2013-11-20 07:17:53 +09:00
Aaron Hamid
050dd59c63 added a test to cover distinction between boolean return value of unserialize function and deserializing serialized boolean 2013-11-20 07:14:53 +09:00
Jeff Welch
72a8489a12 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:34 +09:00
Jeff Welch
101c780500 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:23 +09:00