clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-26 20:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,529 Commits 494 Branches 1,367 Tags 881 MiB
8a985edfb2
Commit Graph

34124 Commits

Author SHA1 Message Date
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
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
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
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
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
eb84d5d0a6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  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:12:06 +02:00
Anatol Belski
fca1501ed6 added test for bug #53965 2014-04-01 10:08:08 +02:00
Anatol Belski
3cb056f523 Fixed bug #53965 <xsl:include> cannot find files w/ relative paths when loaded w/ "file://" 2014-04-01 10:07:18 +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
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
Remi Collet
178eac6c98 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fixed Bug #66987 Memory corruption in fileinfo ext (bigendian)
 2014-03-31 16:57:12 +02:00
Remi Collet
2c204a55af Fixed Bug #66987 Memory corruption in fileinfo ext (bigendian) 
On little endian:
	map->p == php_magic_database
	map->magic[i] = pointer into the map

	map->p == NULL
	map->magic[i] = pointer to allocated memory

On big endian (ppc64, s390x, ...):
	map->p != php_magic_database and map->p != NULL
        map->magic[i] = pointer into a copy of the map

Trying to efree pointer in the later cause memory corruption
Thanks to dkatulek / Red Hat for the report.
 2014-03-31 16:50:47 +02: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
Andrey Hristov
84cd0f9911 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 2014-03-26 13:57:13 +02:00
Andrey Hristov
89ea2650a1 Fix test 2014-03-26 13:56:58 +02: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
Derick Rethans
039cb10fa3 Merge branch 'PHP-5.4' into PHP-5.5 2014-03-25 12:17:15 +00:00
Derick Rethans
170cf3ec00 - Updated to version 2014.2 (2014b) 2014-03-25 12:17:14 +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
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
64d7dd55d3 Fix merge (5.6 already have file 5.17) 2014-03-25 11:03:59 +01:00
Remi Collet
84b0ab6d8f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  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:01:20 +01:00
Remi Collet
4374a52e9d Fixed bug #66946 extensive backtracking in awk rule regular expression 
CVE-2013-7345

Applied upstream patch:
ef2329cf71

Add the magicdata.patch to track patches applied to upstream data file.
 2014-03-25 11:00:33 +01:00
Remi Collet
1df558c6a0 Fixed bug #66946 extensive backtracking in awk rule regular expression 
CVE-2013-7345

Applied upstream patch:
ef2329cf71

Add the magicdata.patch to track patches applied to upstream data file.
 2014-03-25 10:58:50 +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
7477f5b387 fix disabling PGO for extensions, rel bug #65715 2014-03-25 06:44:54 +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
Andrey Hristov
41b4b84dda Emit a warning in case of unallowed characters. Fix another place this 
code is used - reuse
 2014-03-20 16:23:40 +02: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
Andrey Hristov
059bc99d94 don't replace with ?, just skip it 2014-03-20 12:11:16 +02: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
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
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
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
Andrey Hristov
d63ed101ee Fix problem with mysqli_commt()/mysqli_rollback() 2014-03-19 18:32:19 +02: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
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
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
Derick Rethans
2dfb8fbdf4 Merge branch 'PHP-5.4' into PHP-5.5 2014-03-18 14:48:56 +00:00
Derick Rethans
b30304fb78 - Updated to version 2014.1 (2014a) 2014-03-18 14:48:55 +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
Andrey Hristov
2b811a5aec Add a test 2014-03-18 15:42:38 +02: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
156cc39e21 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed off-by-one in php_url_parse_ex
 2014-03-18 08:57:30 +01:00
Mateusz Kocielski
497b918e62 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed off-by-one in php_url_parse_ex

Conflicts:
	ext/standard/url.c
 2014-03-18 08:54:57 +01:00
Mateusz Kocielski
46566b78c9 Fixed off-by-one in php_url_parse_ex 
Change order of condition, previously pointer could be derefrenced before
bound check was done.
 2014-03-18 08:48:41 +01: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
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
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
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
Stanislav Malyshev
66bf216c66 Fix bug #66873: check if obj->src is set 2014-03-17 01:19:02 -07: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
f5ebea91b0 updated to oniguruma to 5.9.5 2014-03-15 17:56:04 +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
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
Remi Collet
e1d8c0a051 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fixed Bug #66833 Default digest algo is still MD5
 2014-03-14 09:52:02 +01:00
Remi Collet
17f6391bf8 Fixed Bug #66833 Default digest algo is still MD5 
Switch to SHA1, which match internal openssl hardcoded algo.

In most case, won't even be noticed
- priority on user input (default_md)
- fallback on system config
- fallback on this default value

Recent system reject MD5 digest, noticed in bug36732.phpt failure.

While SHA1 is better than MD5, SHA256 is recommenced,
and defined as default algo in provided configuration on
recent system (Fedora 21, RHEL-7, ...). But the idea is to
keep in sync with openssl internal value for PHP internal value.
 2014-03-14 09:50:15 +01: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
Lior Kaplan
356c442558 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Typo fix: sicret -> secret
 2014-03-13 12:40:14 +02:00
Michael Meyer
737c187013 Typo fix: sicret -> secret 2014-03-13 12:37:25 +02: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
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
3f049bcff2 made libgd recognize the 9 version series 2014-03-12 19:30:27 +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
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
862c006da1 Fix bug #66887 imagescale - poor quality of scaled image 
Issue with signed char overflow.

Upstream fix:
4b86e06937
 2014-03-12 17:10:51 +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
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
Remi Collet
f2d5b2b6c6 Fixed Bug #66893i imagescale ignore method argument 
We also have our goto fail; bug.

Upstream fix for libgd
5b42b1178c
 2014-03-12 15:35:42 +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
Nikita Popov
06bbb657ad Fix hash_pbkdf2() with missing $length argument 
Also change the type of some string length variables to ensure
that the zpp call works correctly on platforms where sizeof(int)
!= sizeof(long).
 2014-03-12 14:16:18 +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
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
Remi Collet
dada2f550f Fixed Bug #66890 imagescale segfault 
zend_parse_parameters "l" expect long, not int
 2014-03-12 13:44:58 +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
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
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
Adam Harvey
f8252aa537 Fix compile error with theoretically supported versions of libcurl < 7.12.3. 2014-03-11 11:04:26 -07: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
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
Tjerk Meesters
cb5178a450 Merge branch 'PHP-5.4' into PHP-5.5 2014-03-11 19:14:43 +08:00
Tjerk Meesters
ddd7ed9b24 Removed bogus loops 2014-03-11 19:08:18 +08:00
Anatol Belski
72050af855 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  restored the old code in 5.4/5 related to bug #66872
 2014-03-11 11:51:35 +01:00
Anatol Belski
1a624e27a6 restored the old code in 5.4/5 related to bug #66872 
The crash is reproducable in 5.6+ only, so 5.4 and 5.5 are fine
with the old code.
 2014-03-11 11:50:14 +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
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
73b3f58bcd updated libsqlite to 3.8.3.1 in 5.5 branch, too 2014-03-10 17:49:35 +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
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
8391277fb8 Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4 
# By Anatol Belski
# Via Anatol Belski
* 'PHP-5.4' of git.php.net:php-src:
  updated libmagic.patch
 2014-03-10 16:31:09 +01:00
Pierre Joye
a92240e209 Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
# By Anatol Belski (1) and others
# Via Anatol Belski
* 'PHP-5.5' of git.php.net:php-src:
  updated libmagic.patch
  Fix indentation
  Do not remove *.1, it's not generated by make but configure
 2014-03-10 16:30:05 +01: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
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
Anatol Belski
c17fd65165 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  updated libmagic.patch
 2014-03-10 14:13:15 +01:00
Anatol Belski
b9d494a33b updated libmagic.patch 2014-03-10 14:12:20 +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
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
Pierre Joye
d2e42d5372 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix #66872, invalid argument crashes gmp_testbit
  fix #66872, invalid argument crashes gmp_testbit
  add vc12 (2013)

Conflicts:
	win32/build/confutils.js
 2014-03-10 12:10:57 +01:00
Pierre Joye
af41914e15 fix #66872, invalid argument crashes gmp_testbit 2014-03-10 12:06:40 +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
Andrey Hristov
3a76cb2d95 Fix indentation 2014-03-10 12:52:56 +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
8e3c2015dc - fix #66869, Invalid 2nd argument crashes imageaffinematrixget 2014-03-09 21:12:19 +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
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
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
972935cd95 Fixed null termination 2014-03-07 19:23:46 +08:00
Tjerk Meesters
7137775ec2 Merge branch 'PHP-5.6' 2014-03-07 19:01:53 +08:00
Tjerk Meesters
64906cdc38 Merge branch 'PHP-5.5' into PHP-5.6 2014-03-07 18:57:36 +08:00
datibbaw
3c673fed34 Add fread(length) method 
Fixed off-by-one write bug

Added test
 2014-03-07 18:50:33 +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
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
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
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
Remi Collet
7d5c11c235 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  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:16 +01:00
Remi Collet
721b9a7c8d Set default Digest Message to use SHA1 instead of MD5 in openssl tests 
as MD5 signature are now rejected by newer openssl Version.

Noticed in RHEL-7 and Fedora 21 build.
 2014-03-06 10:14:08 +01: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