clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 14:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
82,388 Commits 494 Branches 1,367 Tags 801 MiB
a8d61ab7f0
Commit Graph

35190 Commits

Author SHA1 Message Date
Remi Collet
3924548bcb Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  revert a4157423934edf7b8fdbcee163cced9bfd5748a, fix build odbc as shared
 2015-03-25 10:33:31 +01:00
Remi Collet
1174b399ad revert a4157423934edf7b8fdbcee163cced9bfd5748a, fix build odbc as shared 2015-03-25 10:33:08 +01:00
Xinchen Hui
86bbacfd53 Merge branch 'PHP-5.5' into PHP-5.6 2015-03-25 12:09:35 +08:00
Xinchen Hui
76c1ec5e96 Bug #69293 NEW segfault when using SoapClient::__setSoapHeader (bisected, regression) 
This was a typo introduced in c8eaca013a
 2015-03-25 12:07:25 +08:00
Stanislav Malyshev
3342a248a2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed #68021 - get_browser() browser_name_regex
 2015-03-22 22:13:08 -07:00
Tjerk Meesters
5b5742c016 Fixed #68021 - get_browser() browser_name_regex 
Replaced expression delimiter with tilde (~) and escape where necessary.
 2015-03-22 22:12:26 -07:00
Stanislav Malyshev
a1bca171d2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Print checking message for all ODBC drivers
  Change default option of ODBC drivers to no to enable bulding standalone ODBC

Conflicts:
	ext/odbc/config.m4
 2015-03-22 22:04:41 -07:00
Lior Kaplan
6f5ed34d20 Print checking message for all ODBC drivers 
This makes the output more readble in case no ODBC driver was selected
 2015-03-22 22:03:38 -07:00
Lior Kaplan
7a41574239 Change default option of ODBC drivers to no to enable bulding standalone ODBC 2015-03-22 22:03:29 -07:00
Stanislav Malyshev
57f835e148 oops, forgot TSRMLS_CC 2015-03-22 21:55:34 -07:00
lesniewskister
c12e031530 Reduce downstream patches 
As per http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/lang/php/5.6/patches/patch-ext_gd_libgd_gdcache_h?rev=1.1&content-type=text/x-cvsweb-markup
 2015-03-22 21:33:45 -07:00
Stanislav Malyshev
aa22e80b1a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Adding a new `createFromImmutable` method to the `DateTime` class to mirror the current `DateTime::createFromMutable()`
 2015-03-22 21:03:46 -07:00
Trevor Suarez
c2e22556ba Adding a new createFromImmutable method to the DateTime class to mirror the current DateTime::createFromMutable() 2015-03-22 20:54:25 -07:00
Juan Basso
3e7f47cb03 Renamed test case to match with reported bug 2015-03-22 20:34:59 -07:00
Juan Basso
4076a4d2a9 Fixed serialization of non string values on __sleep 
Returning just N; (null) on the __sleep makes the number of fields/values be incomplete and corrupting the generated value from serialize, making impossible to unserialize it.

Conflicts:
	ext/standard/var.c
 2015-03-22 20:31:40 -07:00
Stanislav Malyshev
c6384a7908 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  add CURL_HTTP_VERSION_2_0 and CURL_VERSION_HTTP2
 2015-03-22 18:54:48 -07:00
Masaki Kagaya
1badfd8171 add CURL_HTTP_VERSION_2_0 and CURL_VERSION_HTTP2 2015-03-22 18:52:42 -07:00
Stanislav Malyshev
fce9a856e7 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Bacport fix bug #68741 - Null pointer dereference
  Check that the type is correct
 2015-03-22 18:32:16 -07:00
Stanislav Malyshev
723ffe2e89 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Bacport fix bug #68741 - Null pointer dereference
  Check that the type is correct
 2015-03-22 18:30:56 -07:00
Stanislav Malyshev
968fbc6acf Bacport fix bug #68741 - Null pointer dereference 2015-03-22 18:30:05 -07:00
Stanislav Malyshev
fb83c76dee Check that the type is correct 2015-03-22 18:17:47 -07:00
Stanislav Malyshev
40037f1474 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix #68760: Fix freeing null segfault. Added test for behaviour.

Conflicts:
	ext/sqlite3/tests/bug68760.phpt
 2015-03-22 16:46:30 -07:00
Danack
0c27a8eb61 Fix #68760: Fix freeing null segfault. Added test for behaviour. 2015-03-22 16:46:02 -07:00
Danack
1ec430d4ed Fix #68760: Fix freeing null segfault. Added test for behaviour. 2015-03-22 16:44:06 -07:00
Anatol Belski
63d7cd7d5b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  cosmetic fix to default odbcver
  Remove extraneous strlen() call
 2015-03-23 00:07:43 +01:00
Anatol Belski
a759c40872 cosmetic fix to default odbcver 2015-03-23 00:07:09 +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
Derick Rethans
a73d0b0fb3 - Updated to version 2015.2 (2015b) 2015-03-21 14:51:11 +01:00
Derick Rethans
b98a486606 - Updated to version 2015.2 (2015b) 2015-03-21 14:51:09 +01:00
Dmitry Stogov
0c3de98368 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #69152
 2015-03-19 11:48:10 +03:00
Dmitry Stogov
9bdbc7490f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #69152
 2015-03-19 11:42:49 +03:00
Dmitry Stogov
51856a76f8 Fixed bug #69152 2015-03-19 11:36:01 +03:00
Stanislav Malyshev
225cb973e5 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  update NEWS
  Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary

Conflicts:
	ext/zip/lib/zip_dirent.c
 2015-03-17 22:03:24 -07:00
Stanislav Malyshev
53eff4a369 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary
 2015-03-17 22:00:29 -07:00
Stanislav Malyshev
ef8fc4b53d Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary 2015-03-17 21:59:56 -07:00
Stanislav Malyshev
bf2f03ddb3 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #69248 - heap overflow vulnerability in regcomp.c
  add test for bug #68976
 2015-03-17 17:10:05 -07:00
Stanislav Malyshev
890b3987ab Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #69248 - heap overflow vulnerability in regcomp.c
  add test for bug #68976
 2015-03-17 17:09:47 -07:00
Stanislav Malyshev
c83dd84ad6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #69248 - heap overflow vulnerability in regcomp.c
  add test for bug #68976
 2015-03-17 17:08:13 -07:00
Stanislav Malyshev
fb04dcf6db Fix bug #69248 - heap overflow vulnerability in regcomp.c 
Merged from 70bc296560
 2015-03-17 17:04:57 -07:00
Stanislav Malyshev
8b14d3052f add test for bug #68976 2015-03-17 17:03:46 -07:00
Stanislav Malyshev
33a5532b66 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #68976 - Use After Free Vulnerability in unserialize()

Conflicts:
	ext/standard/var_unserializer.c
 2015-03-17 13:23:51 -07:00
Stanislav Malyshev
d5e523f52f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #68976 - Use After Free Vulnerability in unserialize()

Conflicts:
	ext/standard/var_unserializer.c
 2015-03-17 13:22:12 -07:00
Stanislav Malyshev
646572d6d3 Fixed bug #68976 - Use After Free Vulnerability in unserialize() 2015-03-17 13:20:22 -07:00
Stanislav Malyshev
3477568b4e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix tests
  Fix bug #69207 - move_uploaded_file allows nulls in path
 2015-03-17 12:58:00 -07:00
Stanislav Malyshev
9ba4db5e5d fix tests 2015-03-17 12:55:35 -07:00
Stanislav Malyshev
e55e40ca66 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #69207 - move_uploaded_file allows nulls in path
 2015-03-17 12:48:37 -07:00
Stanislav Malyshev
1291d6bbee Fix bug #69207 - move_uploaded_file allows nulls in path 2015-03-17 12:47:58 -07:00
Julien Pauli
2a50877428 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix flaws in session module
 2015-03-16 16:01:12 +01:00
Julien Pauli
4dba99c226 Fix flaws in session module 2015-03-16 16:00:46 +01:00
Anatol Belski
293d6e629d backport af2b0669 into 5.5 2015-03-16 08:32:39 +01:00
Anatol Belski
af2b066911 libxml-2.9.2 compatibility 2015-03-15 18:38:50 +01:00
Anatol Belski
2ac31872ac Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix test
 2015-03-14 18:30:32 +01:00
Anatol Belski
c21c8f369d fix test 2015-03-14 18:29:59 +01:00
Nikita Popov
846c8059e6 Merge branch 'PHP-5.5' into PHP-5.6 2015-03-14 09:18:31 +01:00
Jeff Welch
1e51c5411e Fix #69203: FILTER_FLAG_STRIP_HIGH doesn't strip ASCII 127 2015-03-14 09:17:36 +01:00
Xinchen Hui
96bb3b838c Merge branch 'PHP-5.5' into PHP-5.6 2015-03-14 11:31:53 +08:00
Xinchen Hui
5b87d52041 Fixed typo 2015-03-14 11:31:12 +08:00
Xinchen Hui
396bc00caa Merge branch 'PHP-5.5' into PHP-5.6 2015-03-14 00:53:32 +08:00
Xinchen Hui
ed59370f0a Little improvement, update NEWs, added test 2015-03-14 00:52:53 +08:00
Vektah
482500b455 Fix a leak 2015-03-13 15:54:30 +11:00
Vektah
950d3d6e9b Fix bug #69227 and #65967 
This patch fixes a use (in zend_gc.c) after free (in spl_observer.c).
See https://bugs.php.net/bug.php?id=69227
 2015-03-13 15:02:05 +11:00
Daniel Lowrey
c661121459 Don't block on crypto data inside stream_select() 2015-03-11 09:44:07 -06:00
Daniel Lowrey
3f6b12795c Fix bug# 69215 (Crypto servers should send client CA list) 2015-03-10 18:13:10 -06:00
Dmitry Stogov
b52a2940af Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  We don't cache custom strems with callbacks anymore
 2015-03-10 19:30:32 +03:00
Dmitry Stogov
c814b3294a We don't cache custom strems with callbacks anymore 2015-03-10 19:25:30 +03:00
Xinchen Hui
0584b2df3f Update NEWS 2015-03-10 15:38:34 +08:00
Daniel Lowrey
69691cc8ca Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix crypto stream timeout regressions
 2015-03-09 15:55:33 -06:00
Daniel Lowrey
bbfd4a5e62 Fix crypto stream timeout regressions 2015-03-09 15:53:26 -06:00
Xinchen Hui
4ca14f681e Merge branch 'PHP-5.5' into PHP-5.6 2015-03-09 17:23:04 +08:00
Xinchen Hui
9af1383a3f Revert "Fix #63486" 
This reverts commit f4c96ffcb5.
 2015-03-09 17:22:56 +08:00
Jeff Welch
66a2c528fe Fix #69202: FILTER_FLAG_STRIP_BACKTICK ignored unless other flags are used. 2015-03-09 17:08:35 +08:00
Masaki Kagaya
934d6ed900 added missing parentheses 
added test case for bug #68846
replaced tab with space
added missing parentheses again
See also: http://icu-project.org/docs/papers/gb18030.html#h7
 2015-03-08 23:40:56 -07:00
Julien Pauli
7d47d9fe23 Fix #67626 2015-03-08 23:40:55 -07:00
Julien Pauli
7684d72df8 Fix #63486 2015-03-08 23:40:55 -07:00
Masaki Kagaya
fa72f1ea86 added missing parentheses 
added test case for bug #68846
replaced tab with space
added missing parentheses again
See also: http://icu-project.org/docs/papers/gb18030.html#h7
 2015-03-08 23:39:04 -07:00
Stanislav Malyshev
a8da0a9620 Merge branch 'pull-request/1104' into PHP-5.5 
* pull-request/1104:
  Fix #63486
 2015-03-08 23:21:53 -07:00
Stanislav Malyshev
43b426fbc4 Merge branch 'pull-request/1106' into PHP-5.5 
* pull-request/1106:
  Fix #67626
 2015-03-08 22:52:21 -07:00
Stanislav Malyshev
dcc031470a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Regression tests for SplFileInfo class setters
 2015-03-08 17:13:25 -07:00
Stanislav Malyshev
a2a20d29a8 Merge branch 'pull-request/1134' into PHP-5.5 
* pull-request/1134:
  Regression tests for SplFileInfo class setters
 2015-03-08 17:13:02 -07:00
Remi Collet
43da0d302b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix odbc build as shared
 2015-03-08 07:36:35 +01:00
Remi Collet
89f86119d6 Fix odbc build as shared 
Broken since a41aa46759
 2015-03-08 07:34:51 +01:00
Daniel Lowrey
0928bad9ac Fixed bug #69197 (openssl_pkcs7_sign handles default value incorrectly) 2015-03-06 11:29:56 -07:00
Tjerk Meesters
469b5a9584 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #68917 (parse_url fails on some partial urls)
 2015-03-06 20:58:20 +08:00
Tjerk Meesters
d7fb52ea20 Fixed bug #68917 (parse_url fails on some partial urls) 2015-03-06 20:51:22 +08:00
Daniel Lowrey
e82878a200 Update test to run locally instead of remotely 2015-03-05 22:00:38 -07:00
Daniel Lowrey
10bc5fd4c4 Fixed bug (#69195 Inconsistent stream crypto values across versions) 
PHP 5.6.0 altered the semantics of the following constants:

- STREAM_CRYPTO_METHOD_SSLv23_CLIENT
- STREAM_CRYPTO_METHOD_SSLv23_SERVER
- STREAM_CRYPTO_METHOD_TLS_CLIENT
- STREAM_CRYPTO_METHOD_TLS_SERVER

Instead of representing the SSLv23_*() handshake methods the v23
constants were changed to allow only SSLv2 or SSLv3 connections.
Likewise, the TLS methods were modified from using only the TLSv1
handshake to allowing TLS1,1.1, and 1.2. This created a situation
in which users upgrading from previous versions faced a potential
security degradation if they did not update code to use different
constants. In the interest of compatibility across PHP versions
the original semantics have been restored with the following
caveat:

**IMPORTANT**

The SSLv23 client/server methods will no longer negotiate the use
of the insecure SSLv2 or SSLv3 protocols by default. Users wishing
to allow these protocols must explicitly add them to the method
bitmask via the appropriate flags.
 2015-03-05 21:09:39 -07:00
Chris Wright
e7df9d710c Fix stream_select() issue with OpenSSL buffer 
Ensure data from OpenSSL internal buffer has been
transfered to PHP stream buffer before a select()
emulation operation is performed

Addresses bug #65137
https://bugs.php.net/bug.php?id=65137

Conflicts:
	ext/openssl/xp_ssl.c
 2015-03-05 17:18:14 -07:00
Daniel Lowrey
ca24d19a89 Really fix zts this time 2015-03-05 14:09:25 -07:00
Daniel Lowrey
c985ec737d Fix ZTS 2015-03-05 12:19:15 -07:00
Daniel Lowrey
010f17534f Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix ZTS build
 2015-03-05 12:13:33 -07:00
Daniel Lowrey
e892f5382f Fix ZTS build 2015-03-05 12:12:55 -07:00
Daniel Lowrey
5939de35a8 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #67403 (Add signatureType to openssl_x509_parse)
  5.5.24 now

Conflicts:
	configure.in
	main/php_version.h
 2015-03-05 10:21:32 -07:00
Daniel Lowrey
94140afa69 Fix bug #67403 (Add signatureType to openssl_x509_parse) 2015-03-05 10:09:06 -07:00
Rasmus Lerdorf
eaa1b3e614 This test fails with multibyte on because it spews 
a conversion error on the bogus file
 2015-03-05 00:45:42 -08:00
Daniel Lowrey
65a9a5ca12 Fixed bug #68265 (SAN match fails with trailing DNS dot) 2015-03-04 23:55:42 -07:00
Daniel Lowrey
1de1ff75f5 Merge branch 'PHP-5.6' of https://github.com/bjori/php-src into PHP-5.6 
* 'PHP-5.6' of https://github.com/bjori/php-src:
  hexadecimal is case*in*sensitive
 2015-03-04 22:55:22 -07:00
Daniel Lowrey
5dcace058a Fixed bug #68879 (IP Address fields in subjectAltNames not used) 2015-03-04 22:39:25 -07:00
Daniel Lowrey
ca766e0787 Fix broken test 2015-03-04 22:37:07 -07:00
Hannes Magnusson
3c2c029bfd hexadecimal is case*in*sensitive 2015-03-04 16:03:45 -08:00
Daniel Lowrey
241f3c34b8 Fixed bug #68920 (use strict peer_fingerprint input checks) 2015-03-04 12:47:46 -07:00
Xinchen Hui
a29b64fc10 Fixed bug #69159 (Opcache causes problem when passing a variable variable to a function) 2015-03-04 14:48:41 +08:00
Xinchen Hui
6183408031 Merge branch 'PHP-5.5' into PHP-5.6 2015-03-03 23:17:37 +08:00
nathan r. hruby
837eeefee9 Make killing a locker an ERROR event 
At least in apache, killing a locker with SIGKILL from inside opcache prevents
the child process from emitting a corresponding log event to the access or
error logs, therefore requests are termed with no record.  This makes is
incredibly difficult to debug problems espically on systems with high counts
of cache restarts.  Since INFO level is far too noisy for production use,
switch the killing to a higher level so we can see it easier.
 2015-03-03 23:16:45 +08:00
Reeze Xia
6cb3b941df Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Improve fix for bug 67741
  Added type checks
  Added type checks
 2015-03-03 16:27:35 +08:00
Dmitry Stogov
b3ac352253 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Added type checks
 2015-03-03 10:45:07 +03:00
Dmitry Stogov
c8eaca013a Added type checks 2015-03-03 10:43:48 +03:00
Dmitry Stogov
035d80523f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Added type checks

Conflicts:
	ext/soap/soap.c
 2015-03-03 09:52:21 +03:00
Dmitry Stogov
0c136a2abd Added type checks 2015-03-03 09:44:46 +03:00
Jeremy Mikola
dea7bc8786 Regression tests for SplFileInfo class setters 
Adds tests for SplFileInfo class setters accepting either the base and child classes, and throwing an exception for unexpected classes.

Related: http://svn.php.net/viewvc?view=revision&revision=336017 and https://github.com/facebook/hhvm/pull/4917
 2015-03-02 14:45:26 -05:00
Dmitry Stogov
d5248f67b5 Check variable type before its usage as IS_ARRAY. 2015-03-02 12:27:36 +03:00
Xinchen Hui
672a396d4a Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	ext/standard/var_unserializer.c
 2015-03-01 23:17:41 +08:00
Xinchen Hui
caebb76131 Fixed bug #69139 (Crash in gc_zval_possible_root on unserialize) 2015-03-01 23:16:15 +08:00
Reeze Xia
1b240ff9e3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #69141 Missing arguments in reflection info for some builtin functions
 2015-02-28 16:40:06 +08:00
Reeze Xia
f824f91ac9 Fixed bug #69141 Missing arguments in reflection info for some builtin functions 
This include:

- setcookie (missing "httponly")
- setrawcookie (missing "httponly")
- spl_autoload_register (missing 2 optional params)
- mktime  (missing "is_dst")
- gmmktime (missing "is_dst")
 2015-02-28 16:37:14 +08:00
Nikita Popov
b41b229d78 Merge branch 'PHP-5.5' into PHP-5.6 2015-02-27 23:23:49 +01:00
Дмитрий Пацура
e9c6798721 Fix ARG_INFO for levenshtein 
This can work with 2 parameters (require)

refs http://php.net/manual/ru/function.levenshtein.php
refs https://github.com/phalcon/zephir/issues/753
 2015-02-27 23:23:24 +01:00
Xinchen Hui
86ba1a2444 Merge branch 'PHP-5.5' into PHP-5.6 2015-02-27 23:32:59 +08:00
Xinchen Hui
997b7e5630 Fixed bug #69085 (SoapClient's __call() type confusion through unserialize()). 2015-02-27 23:32:32 +08:00
Xinchen Hui
cfaf7c3b5f Merge branch 'PHP-5.5' into PHP-5.6 2015-02-27 11:42:57 +08:00
Xinchen Hui
3e82816ba1 Fixed bug #69125 (Array numeric string as key) 2015-02-27 11:42:36 +08:00
Xinchen Hui
2d1a3ecd27 Merge branch 'PHP-5.5' into PHP-5.6 2015-02-27 11:11:45 +08:00
Taoguang Chen
e441d71baa fix bug#68942's patch 
Fix type confusion bug in unserialize() with DateTimeZone. https://bugs.php.net/bug.php?id=68942
 2015-02-27 10:41:53 +08:00
Xinchen Hui
34d397e267 better name 2015-02-25 20:49:07 +08:00
Xinchen Hui
d3615b5fb1 Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	ext/opcache/tests/bug69038.phpt
 2015-02-25 20:13:47 +08:00
Xinchen Hui
d508ff9640 Improve fix for #69038 2015-02-25 20:07:02 +08:00
Xinchen Hui
9641bac0f5 Merge branch 'PHP-5.5' into PHP-5.6 2015-02-25 18:22:18 +08:00
Xinchen Hui
ffdc5728c8 Fixed bug #69108 ("Segmentation fault" when (de)serializing SplObjectStorage) 2015-02-25 18:21:59 +08:00
Julien Pauli
5256ffd4fe Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
  curl: add new proxy constants
 2015-02-23 11:23:00 +01:00
Linus Unnebäck
63ab6d8249 curl: add new proxy constants 2015-02-23 11:19:36 +01:00
Julien Pauli
ee2f749a22 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed test fails for bug68557
 2015-02-23 10:35:35 +01:00
Xinchen Hui
d5a1a3342b Fixed test fails for bug68557 2015-02-23 10:35:16 +01:00
Jakub Zelenka
97d809a8a5 Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	ext/json/json.c
 2015-02-22 20:35:03 +00:00
Jakub Zelenka
591dbcabe5 Fix bug #64695 (JSON_NUMERIC_CHECK has issues with strings that are numbers plus the letter e) 2015-02-22 20:22:47 +00:00
Anatol Belski
e656932d0e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix Win32 SSPI initialization for digest authentication in cURL
 2015-02-22 16:26:52 +01:00
Anatol Belski
68afd75ecd Merge branch 'pull-request/1112' into PHP-5.5 2015-02-22 16:26:02 +01:00
Grant Pannell
7988f703f8 Fix Win32 SSPI initialization for digest authentication in cURL 2015-02-22 23:34:55 +10:30
Anatol Belski
3cf2b7cc2b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  revisit fix for bug #65272

Conflicts:
	ext/standard/file.c
 2015-02-21 14:14:24 +01:00
Anatol Belski
6751f8b314 revisit fix for bug #65272 2015-02-21 14:10:59 +01:00
Julien Pauli
c4c3dca302 Fix #67626 2015-02-20 16:07:40 +01:00
Anatol Belski
b21d0848c9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  split test for bug #68557 for windows
 2015-02-20 16:02:07 +01:00
Anatol Belski
3082177bee split test for bug #68557 for windows 2015-02-20 16:01:34 +01:00
Julien Pauli
13c3b78f1e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix #68557
 2015-02-20 15:38:48 +01:00
Julien Pauli
c111d1cd70 fix #68557 2015-02-20 15:09:35 +01:00
Julien Pauli
f4c96ffcb5 Fix #63486 2015-02-20 13:38:35 +01:00
Dmitry Stogov
90421b0d5b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed type mismatch
 2015-02-20 10:32:34 +03:00
Dmitry Stogov
9fb48edf3c Fixed type mismatch 2015-02-20 10:31:24 +03:00
Ferenc Kovacs
68128efa4b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #69033 (Request may get env. variables from previous requests if PHP works as FastCGI)
 2015-02-18 16:32:23 +01:00
Ferenc Kovacs
08b6fe9ef1 Fix bug #69033 (Request may get env. variables from previous requests if PHP works as FastCGI) 2015-02-18 16:24:09 +01:00
Xinchen Hui
97f8c78b09 Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 2015-02-17 21:17:06 +08:00
Xinchen Hui
ed1967c706 Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6 2015-02-17 21:16:53 +08:00
Xinchen Hui
e22759b1e5 Replace var is introduced 2015-02-17 21:16:37 +08:00
Stanislav Malyshev
0a331f49c1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix TS build
 2015-02-17 07:47:27 +01:00
Stanislav Malyshev
213725057e fix TS build 2015-02-17 07:47:12 +01:00
Stanislav Malyshev
78389b29f9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
  Port for for bug #68552
  Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
  - BFN
 2015-02-17 06:57:50 +01:00
Stanislav Malyshev
cf7d8eabcc Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Port for for bug #68552
  Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone)
  - BFN
 2015-02-17 06:53:48 +01:00
Stanislav Malyshev
29a4e710de Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone) 2015-02-17 06:53:27 +01:00
Stanislav Malyshev
bdfe457a2c Port for for bug #68552 2015-02-17 06:53:02 +01:00
Stanislav Malyshev
7b18981830 Fix bug #68942 (Use after free vulnerability in unserialize() with DateTimeZone) 
Conflicts:
	ext/date/php_date.c
 2015-02-17 06:43:51 +01:00
Xinchen Hui
1c0fa36c61 Merge branch 'PHP-5.5' into PHP-5.6 2015-02-17 11:36:15 +08:00
Xinchen Hui
66d3095993 Fixed bug #69038 (switch(SOMECONSTANT) misbehaves) 2015-02-17 11:34:57 +08:00
Felipe Pena
94742054a8 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #67827 (broken detection of system crypt sha256/sha512 support)
  - Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de
  Update NEWS
 2015-02-17 01:08:07 -02:00
Felipe Pena
0c01fca444 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  - Fixed bug #67827 (broken detection of system crypt sha256/sha512 support)
  - Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de
  Update NEWS
 2015-02-17 00:28:28 -02:00
Felipe Pena
a331ae4630 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - Fixed bug #67827 (broken detection of system crypt sha256/sha512 support)
  - Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de
  Update NEWS
 2015-02-17 00:28:11 -02:00
Felipe Pena
8f9ab04d93 - Fixed bug #67827 (broken detection of system crypt sha256/sha512 support) 2015-02-17 00:23:47 -02:00
Felipe Pena
abbc82f448 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  - Fix merge
  BFN
 2015-02-16 13:09:52 -02:00
Felipe Pena
35a68c276d - Fix merge 2015-02-16 13:09:40 -02:00
Felipe Pena
e08bef442c - Fixed bug #67427 (SoapServer cannot handle large messages) patch by: brandt at docoloc dot de 2015-02-16 13:07:26 -02:00
Xinchen Hui
8309988111 Fixed bug #68912 (Segmentation fault at openssl_spki_new) 2015-02-16 14:16:52 +08:00
Xinchen Hui
edd16831b1 Merge branch 'PHP-5.5' into PHP-5.6 2015-02-15 22:55:42 +08:00
Xinchen Hui
a620b79040 Fixed bug #69054 (Null dereference in readline_(read|write)_history() without parameters) 2015-02-15 22:54:05 +08:00
Michael Wallner
4137956d0e fix detection of mbstate_t with clang 
AC_TRY_COMPILE expexts a function body
 2015-02-15 09:25:03 +01:00
Xinchen Hui
1db720cd6d Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	ext/pgsql/pgsql.c
 2015-02-14 22:18:13 +08:00
Xinchen Hui
7667f8efc6 Fixed bug #68638 (pg_update() fails to store infinite values) 2015-02-14 22:17:01 +08:00
Xinchen Hui
40a94597ae Merge branch 'PHP-5.4' of https://github.com/wfelipew/php-src into PHP-5.5 2015-02-14 22:03:53 +08:00
Yasuo Ohgaki
a54300b3f6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Add NULL byte protection to exec, system and passthru
 2015-02-14 05:27:44 +09:00
Yasuo Ohgaki
3ea76a768c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Add NULL byte protection to exec, system and passthru
 2015-02-14 05:26:54 +09:00
Yasuo Ohgaki
a8722f5330 Add NULL byte protection to exec, system and passthru 2015-02-14 05:25:04 +09:00
Anatol Belski
b3d28d14d6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix condition
 2015-02-13 13:40:10 +01:00
Anatol Belski
5ff77b005b fix condition 2015-02-13 13:39:46 +01:00
Xinchen Hui
adc4265792 Merge branch 'PHP-5.5' into PHP-5.6 2015-02-13 13:12:44 +08:00
Xinchen Hui
3a71fa36a2 Micro opt 2015-02-13 13:09:56 +08:00
Xinchen Hui
371c016986 Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 2015-02-13 12:54:04 +08:00
Xinchen Hui
68ab716f18 Fixed #69015 (php-cgi's getopt does not see $argv) 
No test script is added because of complicated
 2015-02-13 12:53:34 +08:00
William Felipe Welter
0421404b73 Fixed bug #68638 pg_update() fails to store infinite values 
Fix indent
 2015-02-12 23:39:54 -02:00
Anatol Belski
b5aca81de1 backport gd config.w32 to support freetype 2.5 2015-02-12 20:27:48 +01:00
Anatol Belski
4d8db154ad Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix dir separator in test
 2015-02-10 16:59:22 +01:00
Anatol Belski
bc3e88b9af fix dir separator in test 2015-02-10 16:58:59 +01:00
William Felipe Welter
60d5cdf137 Fixed bug #68638 pg_update() fails to store infinite values 
Check if value is "infinity" with strcasestr() to add quotes
 2015-02-09 20:35:18 -02:00
Daniel Lowrey
fb2314798e Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	ext/openssl/xp_ssl.c
 2015-02-09 11:44:09 -05:00
Daniel Lowrey
1eef4f2a0c Miscellaneous cleanup 2015-02-09 11:42:17 -05:00
Daniel Lowrey
a8cb1d2b85 Merge branch 'PHP-5.5' of github.com:bbroerman30/php-src into PHP-5.5 2015-02-09 11:40:04 -05:00
Bob Weinand
fc444fbc70 Shut up, my lovely compiler; I do not like your warnings 
Conflicts:
	Zend/zend_object_handlers.c
 2015-02-09 11:23:35 +08:00
Anatol Belski
979020fcad moved the part of the test into an appropriate place 2015-02-08 14:10:52 +01:00
Anatol Belski
ffdc2c4123 Merge branch 'pull-request/1060' into PHP-5.6 2015-02-08 12:33:15 +01:00
manuel
cc13d8696f Fix another invalid free of CG(interned_empty_string) 
Fixes #68214
 2015-02-07 19:17:31 +01:00
manuel
3550cc5fd9 add tests for #68996 2015-02-07 18:52:26 +01:00
William Felipe Welter
bb3a81c4b4 Fixed bug #68638 pg_update() fails to store infinite values. 
Add quotes only if "infinity" values are received.
 2015-02-07 01:26:12 -02:00
Anatol Belski
464667153d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix setting default ODBCVER value in config.w32
 2015-02-06 19:59:55 +01:00
Anatol Belski
9bf95d8291 fix setting default ODBCVER value in config.w32 2015-02-06 19:59:14 +01:00
Anatol Belski
e46e208819 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #68964 Allowed memory size exhausted with odbc_exec
 2015-02-06 19:05:13 +01:00
Anatol Belski
a41aa46759 Fixed bug #68964 Allowed memory size exhausted with odbc_exec 
This is done in two steps:

- the ODBCVER has to be rased to 0x0300 which corresponds to Sql
  Server 9, otherwise the client will not recognize several SQL
  datatypes

- additionally the config scripts was tweaked so then ODBCVER
  can be overridden, that still allows enabling compatibility
  with lower versions

Bug #67437 might be fixed by this as well.
 2015-02-06 19:00:27 +01:00
manuel
13fc7f20a4 Invalid free of CG(interned_empty_string) 
On failure php_escape_html_entities returns STR_EMPTY_ALLOC which is an
alias of CG(interned_empty_string) if interned strings are enabled.
Make sure we don't free this.
 2015-02-06 16:53:01 +01:00
Anatol Belski
63761ab91e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Removed erroneous condition
 2015-02-06 09:42:41 +01:00
Anatol Belski
9ef0c39b2b Removed erroneous condition 
This condition is always false. Furthermore headers_list() is
documented to always return an array.
 2015-02-06 09:41:02 +01:00
Stanislav Malyshev
928fdbea08 fix tests 2015-02-05 21:54:47 -08:00
Stanislav Malyshev
a1c28567c6 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update header handling to RFC 7230
 2015-02-05 20:10:09 -08:00
Stanislav Malyshev
067340bbc8 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update header handling to RFC 7230
 2015-02-05 20:09:13 -08:00
Stanislav Malyshev
f001c63073 Update header handling to RFC 7230 2015-02-05 20:08:12 -08:00
William Felipe Welter
b64f149176 Test case Bug #68638 pg_update() fails to store infinite values 2015-02-05 13:19:52 -02:00
Stanislav Malyshev
d33f4c6eb8 fix test to not hit php.net 2015-02-05 00:41:51 -08:00
Stanislav Malyshev
ee864f3301 fix test to not hit php.net 2015-02-05 00:11:44 -08:00
Julien Pauli
583af4979b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Revert "Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)"
 2015-02-04 17:39:34 +01:00
Julien Pauli
f51b73c833 Revert "Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat)" 
This reverts commit 8e19705a93.
 2015-02-04 17:39:16 +01:00
Brad Broerman
dddbe0fc33 Update xp_ssl.c 
Added TSRMLS_CC to php_openssl_sockop_io calls.
 2015-02-04 10:13:36 -05:00
Julien Pauli
93315c4e1d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Revert "json_decode() should generate a syntax error when given ""."
  Update NEWS
 2015-02-04 12:48:57 +01:00
Julien Pauli
c85f12e3ac Revert "json_decode() should generate a syntax error when given ""." 
This reverts commit a7b3abe4e6.
 2015-02-04 12:48:17 +01:00
William Felipe Welter
cb3833a3be Fixed bug #68638 pg_update() fails to store infinite values. 
Regex to check float values changed to accept "infinity" values
and ignore case. Quotes are added to prevent syntax error on
PostgreSQL.
 2015-02-03 22:47:05 -02:00
Yasuo Ohgaki
36f73412c1 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed Bug #65199 pg_copy_from() modifies input array variable
 2015-02-03 15:27:19 +09:00
Yasuo Ohgaki
f8a8ccaba2 Fixed Bug #65199 pg_copy_from() modifies input array variable 2015-02-03 15:26:02 +09:00
Yasuo Ohgaki
4dd7851208 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed Bug #66623 no EINTR check on flock(LOCK_EX)
 2015-02-03 14:04:03 +09:00
Yasuo Ohgaki
b41a6c6f05 Fixed Bug #66623 no EINTR check on flock(LOCK_EX) 2015-02-03 14:02:58 +09:00
Yasuo Ohgaki
2983ef3c48 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #68063 Empty session IDs do still start sessions
 2015-02-03 13:41:31 +09:00
Yasuo Ohgaki
853ae39d6e Fixed bug #68063 Empty session IDs do still start sessions 2015-02-03 13:38:49 +09:00
Yasuo Ohgaki
665997bf16 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Bug #61470 is fixed only in master
 2015-02-03 12:26:25 +09:00
Yasuo Ohgaki
17beba686e Bug #61470 is fixed only in master 2015-02-03 12:26:01 +09:00
Daniel Lowrey
f86600c167 Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	ext/standard/file.c
 2015-02-02 10:52:27 -05:00
Daniel Lowrey
f2f467bd96 Fixed bug #65272: correctly set flock() out param in windows 2015-02-02 10:47:54 -05:00
Adam Harvey
05d591dfdf Merge branch 'PHP-5.5' into PHP-5.6 2015-02-02 11:31:54 +00:00
Adam Harvey
9d8b1170aa Let's not assume bash is always /bin/bash. 2015-02-02 11:31:10 +00:00
Adam Harvey
db375cfd4d Merge branch 'PHP-5.5' into PHP-5.6 2015-02-02 11:11:05 +00:00
Adam Harvey
a7b3abe4e6 json_decode() should generate a syntax error when given "". 
Fixes bug #68938 (json_decode() decodes empty string without error).
Patch by jeremy at bat-country dot us.
 2015-02-02 11:07:34 +00:00
Yasuo Ohgaki
675a12bbcf Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Add test for bug #61470. It is already fixed.
 2015-02-02 18:39:48 +09:00
Yasuo Ohgaki
fb803ff819 Add test for bug #61470. It is already fixed. 2015-02-02 18:39:07 +09:00
Stanislav Malyshev
969e389121 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix sizeof size
 2015-02-01 12:41:33 -08:00
Stanislav Malyshev
0bfcc2829c Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5 
* 'PHP-5.5' of git.php.net:php-src:
  - Updated to version 2015.1 (2015a)
 2015-02-01 12:41:10 -08:00
Stanislav Malyshev
f66f5b2ffa Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix sizeof size
 2015-02-01 12:41:00 -08:00
Stanislav Malyshev
7efbd70b03 fix sizeof size 2015-02-01 12:40:38 -08:00
Derick Rethans
263fb375bd - Updated to version 2015.1 (2015a) 2015-02-01 18:31:21 +00:00
Derick Rethans
4d28d12f86 - Updated to version 2015.1 (2015a) 2015-02-01 18:31:19 +00:00
Stanislav Malyshev
463611714c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #64938: libxml_disable_entity_loader setting is shared between threads
 2015-02-01 00:09:04 -08:00
Martin Jansen
de31324c22 Fix bug #64938: libxml_disable_entity_loader setting is shared between threads 
The availability of entity loading is stored in a module global which
previously was only initialized in the GINIT constructor. This had the
effect that disabling the entity loader in one request caused
subsequent requests hitting the same Apache child process to  also have
the loader disabled.

With this change the loader is explicitely enabled in the request init
phase.
 2015-02-01 00:08:35 -08:00
Stanislav Malyshev
55d5811f85 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix TSRM
 2015-01-31 23:34:44 -08:00
Stanislav Malyshev
d82424b46f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix TSRM
 2015-01-31 23:34:27 -08:00
Stanislav Malyshev
94d6cb4a78 fix TSRM 2015-01-31 23:34:14 -08:00
Stanislav Malyshev
b64cafdb9e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Added test and possible fix for https://bugs.php.net/bug.php?id=67068
 2015-01-31 23:17:24 -08:00
Danack
dbc0a80b23 Added test and possible fix for https://bugs.php.net/bug.php?id=67068 2015-01-31 23:13:55 -08:00
Stanislav Malyshev
6a960b6d1b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Use better constant since MAXHOSTNAMELEN may mean shorter name
  use right sizeof for memset
 2015-01-31 21:48:40 -08:00
Stanislav Malyshev
af1f867308 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Use better constant since MAXHOSTNAMELEN may mean shorter name
  use right sizeof for memset
 2015-01-31 21:48:14 -08:00
Stanislav Malyshev
b30a6d6018 Use better constant since MAXHOSTNAMELEN may mean shorter name 2015-01-31 21:46:56 -08:00
Stanislav Malyshev
41bdd6e7cc Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Add mitigation for CVE-2015-0235 (bug #68925)
  Add mitigation for CVE-2015-0235 (bug #68925)
 2015-01-31 19:12:20 -08:00
Stanislav Malyshev
882a375dba Add mitigation for CVE-2015-0235 (bug #68925) 2015-01-31 19:10:52 -08:00
Stanislav Malyshev
237128603f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Add mitigation for CVE-2015-0235 (bug #68925)
 2015-01-31 19:08:37 -08:00
Stanislav Malyshev
0f9c708229 Add mitigation for CVE-2015-0235 (bug #68925) 2015-01-31 19:08:13 -08:00
Yasuo Ohgaki
d9a9afa499 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed typo in comment
 2015-02-01 05:14:56 +09:00
Yasuo Ohgaki
c8a12508c7 Fixed typo in comment 2015-02-01 05:14:27 +09:00
Yasuo Ohgaki
7b06cc8d22 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Use bash rather than sh
 2015-01-29 15:27:08 +09:00
Yasuo Ohgaki
d463ddd3c7 Use bash rather than sh 2015-01-29 15:21:17 +09:00
Brad Broerman
1482ed2d56 reneg and should_close are not yet members of sslsock. Removing... 2015-01-28 22:36:41 -05:00
Yasuo Ohgaki
5f28622e09 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed Bug #68941 mod_files.sh is a bash-script
 2015-01-29 09:29:11 +09:00
Yasuo Ohgaki
abf9e2ea09 Fixed Bug #68941 mod_files.sh is a bash-script 2015-01-29 09:25:28 +09:00
Xinchen Hui
5208113ad1 Merge branch 'PHP-5.5' into PHP-5.6 2015-01-29 00:01:00 +08:00
Xinchen Hui
b2cf3f064b Fixed bug #68901 (use after free) 2015-01-29 00:00:09 +08:00
Brad Broerman
fd4641696c Updated with SSL fixes (backported from trunk) 2015-01-28 00:04:20 -05:00
Bob Weinand
666cb333f7 Merge remote-tracking branch 'origin/PHP-5.5' into PHP-5.6 
Conflicts:
	NEWS
 2015-01-26 22:51:37 +01:00
Bob Weinand
b8461eb9ac Fix call after close if multiple filters are attached 2015-01-26 22:47:35 +01:00
Keyur Govande
4c6918ec17 Patch commit d9f85373e3 by moving the float_to_double function to 
a header file.
 2015-01-26 21:20:29 +00:00
Keyur Govande
b34f8ef599 Fix for bugs #68114 (Build fails on OS X due to undefined symbols) 
and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient
has rounding errors).

The patch removes support for Decimal floating point numbers and
now defaults to using similar logic as what libmysqlclient does:
convert a 4 byte floating point number into a string, and then the
string into a double. The quirks of MySQL are maintained as seen in
Field_Float::val_str()
 2015-01-26 21:20:29 +00:00
Keyur Govande
1933b556b9 Patch commit d9f85373e3 by moving the float_to_double function to 
a header file.
 2015-01-26 21:19:00 +00:00
Keyur Govande
e51980f4e6 Fix for bugs #68114 (Build fails on OS X due to undefined symbols) 
and #68657 (Reading 4 byte floats with Mysqli and libmysqlclient
has rounding errors).

The patch removes support for Decimal floating point numbers and
now defaults to using similar logic as what libmysqlclient does:
convert a 4 byte floating point number into a string, and then the
string into a double. The quirks of MySQL are maintained as seen in
Field_Float::val_str()
 2015-01-26 21:19:00 +00:00
Anatol Belski
093a23d1c4 Fixed bug #68731 finfo_buffer doesn't extract the correct mime with some gifs 
The fix for bug #67647 applies here, too.
 2015-01-22 12:26:50 +01:00
Anatol Belski
c9d0894ec5 Fixed bug #67647 Bundled libmagic 5.17 does not detect quicktime files correctly 2015-01-22 11:48:11 +01:00
Anatol Belski
60c2621b2a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  simplify error handling for dirs as magic
 2015-01-22 10:17:14 +01:00
Anatol Belski
43652d386a simplify error handling for dirs as magic 2015-01-22 10:16:13 +01:00
Anatol Belski
d0e75bdc59 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #68827 Double free with disabled ZMM
  Fixed segfault while running with moodle
 2015-01-22 10:00:10 +01:00
Joshua Rogers
91aa340180 Fixed bug #68827 Double free with disabled ZMM 2015-01-22 09:59:13 +01:00
Xinchen Hui
251745c012 Fixed segfault while running with moodle 2015-01-22 16:38:34 +08:00
Anatol Belski
24157f396c fix timelib build configuration 2015-01-21 16:22:23 +01:00
Anatol Belski
bd52f4a833 make timelib_config.h inclusion configurable 2015-01-21 13:48:38 +01:00
Anatol Belski
9c88a214a4 backported the timelib cleanups to 5.6 2015-01-21 11:03:16 +01:00
Xinchen Hui
57ff5a4e6f Merge branch 'PHP-5.5' into PHP-5.6 2015-01-21 11:18:08 +08:00
Xinchen Hui
20e5911d82 Fixed test fails 2015-01-21 11:17:49 +08:00
Derick Rethans
1d09926e33 Merge branch 'PHP-5.5' into PHP-5.6 2015-01-20 21:44:25 +00:00
Derick Rethans
8e19705a93 Fixed bug #55407 (Impossible to prototype DateTime::createFromFormat) 2015-01-20 21:44:19 +00:00
Stanislav Malyshev
e18ec95687 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  5.4.38 next
  Fix bug #68799: Free called on unitialized pointer
  Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())

Conflicts:
	ext/standard/var_unserializer.c
 2015-01-20 10:40:39 -08:00
Stanislav Malyshev
e2744c51b6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  5.4.38 next
  Fix bug #68799: Free called on unitialized pointer
  Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())

Conflicts:
	configure.in
	main/php_version.h
 2015-01-20 10:40:11 -08:00
Julien Pauli
157508d87d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Updated NEWS
  Fix bug #68711 Remove useless checks. 'num' is unsigned and cannot be <0.
 2015-01-20 15:09:34 +01:00
Joshua Rogers
df67c4e8bd Fix bug #68711 Remove useless checks. 'num' is unsigned and cannot be <0. 2015-01-20 14:54:48 +01:00
Stanislav Malyshev
e63f7b47e1 Merge branch 'bug68710' into PHP-5.4 
* bug68710:
  Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize())
 2015-01-20 01:02:26 -08:00
Stanislav Malyshev
fc6aa939f5 Merge branch 'bug68799' into PHP-5.4 
* bug68799:
  Fix bug #68799: Free called on unitialized pointer
 2015-01-20 01:00:11 -08:00
Derick Rethans
6f2f2ce5cf Merge branch 'PHP-5.5' into PHP-5.6 2015-01-19 22:59:31 +00:00
Derick Rethans
b0159431e3 Fixed bug #45081 (strtotime incorrectly interprets SGT time zone). 2015-01-19 22:59:24 +00:00
Juan Basso
ac7cfad3b5 Fixed bug #50224 where float without decimals were converted to integer 2015-01-19 00:46:02 -08:00
Anatol Belski
3d6a83a7d0 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
  PDO_MySQL: Differentiate between linux and win32 when passing unix_socket
 2015-01-15 17:48:11 +01:00
steffen
7c9633412e PDO_MySQL: Differentiate between linux and win32 when passing unix_socket 
Unix uses "127.0.0.1" as default host for named pipes,
while when using Windows a "." is required as host by mysqlnd.
(This can be seen at mysqlnd.c (line 945 or searching #ifndef PHP_WIN32)
 2015-01-15 16:42:51 +01:00
Xinchen Hui
0579e8278d bump year 2015-01-15 23:26:37 +08:00
Xinchen Hui
73c1be2653 Bump year 2015-01-15 23:26:03 +08:00
Daniel Lowrey
80a337bba1 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update NEWS
  Fixed bug #55618 (use case-insensitive cert name matching)
 2015-01-14 18:04:41 +01:00
Daniel Lowrey
e2fe8e164f Fixed bug #55618 (use case-insensitive cert name matching) 2015-01-14 18:02:50 +01:00
Anatol Belski
edb66e05db Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #68771 SQL syntax error in sqlite lib
 2015-01-12 17:02:18 +01:00
Anatol Belski
ef58622534 Fixed bug #68771 SQL syntax error in sqlite lib 2015-01-12 16:55:47 +01:00
Stanislav Malyshev
2fc178cf44 Fix bug #68799: Free called on unitialized pointer 2015-01-11 00:51:05 -08:00
Rasmus Lerdorf
46f429f8e6 We can't output absolute S and T values for the 
Diophantine solution here since it can vary based
on the libgmp version we are linking against and
in general there are almost always multiple valid
solutions
 2015-01-09 16:23:50 -08:00
Rasmus Lerdorf
3b9057bc6f We can't output absolute S and T values for the 
Diophantine solution here since it can vary based
on the libgmp version we are linking against and
in general there are almost always multiple valid
solutions
 2015-01-09 16:16:47 -08:00
Julien Pauli
138b6442d4 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #68260
 2015-01-09 16:24:32 +01:00
Julien Pauli
dc810543cf Fix bug #68260 2015-01-09 16:24:14 +01:00
Xinchen Hui
0547edb5c2 Fixed bug (try block removed while combined with xdebug) 2015-01-09 11:53:47 +08:00
Adam Harvey
16b6f6c7f4 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Calling crypt() with a salt of *0 should always return *1.
  5.5.22 now

Conflicts:
	configure.in
	main/php_version.h
 2015-01-08 19:16:32 +00:00
Adam Harvey
8b0f105761 Calling crypt() with a salt of *0 should always return *1. 2015-01-08 19:13:23 +00:00
Anatol Belski
2e79820c0e fix test 2015-01-08 18:11:15 +01:00
Anatol Belski
4756207e7e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix ACLs tests, make it create dir where it has to, not file
 2015-01-05 19:20:07 +01:00
Anatol Belski
339139f876 fix ACLs tests, make it create dir where it has to, not file 2015-01-05 19:19:24 +01:00
Matteo Beccati
38f1b569c2 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Update test after fixing bug #68371
 2015-01-05 12:11:46 +01:00
Matteo Beccati
ea1c0c5627 Update test after fixing bug #68371 2015-01-05 12:11:16 +01:00
Matteo Beccati
3de6f80ff5 Ref #68371 - Added support for PDO::PGSQL_ATTR_DISABLE_PREPARES 2015-01-05 11:00:11 +01:00
Matteo Beccati
488d3dac2e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
 2015-01-05 10:48:18 +01:00
Matteo Beccati
7d2f8525d8 Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names 2015-01-05 09:25:48 +01:00
Stanislav Malyshev
95183cc339 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix memory leak
 2015-01-04 21:08:16 -08:00
Stanislav Malyshev
184b6d9e73 fix memory leak 2015-01-04 21:07:57 -08:00
Stanislav Malyshev
97f894e189 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix GD tests with no GD loaded
  Fixed typo
  GD: imagepalettetotruecolor tests
 2015-01-04 19:57:29 -08:00
Stanislav Malyshev
5639c3350e Merge branch 'pull-request/742' into PHP-5.5 
* pull-request/742:
  Fixed typo
  GD: imagepalettetotruecolor tests
 2015-01-04 19:47:54 -08:00
Stanislav Malyshev
75f93ed663 fix GD tests with no GD loaded 2015-01-04 19:45:57 -08:00
Anatol Belski
03ae6f22b6 updated libmagic.patch in 5.6 2015-01-04 17:07:32 +01:00
Anatol Belski
4ed261870f updated libmagic.patch in 5.5 2015-01-04 17:05:42 +01:00
Anatol Belski
ebb98e7aeb updated libmagic.patch in 5.4 2015-01-04 17:04:13 +01:00
Anatol Belski
28e44f9d44 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
  Fixed bug #68735 fileinfo out-of-bounds memory access
 2015-01-04 14:23:56 +01:00
Anatol Belski
5fe54dbaf9 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #68735 fileinfo out-of-bounds memory access
 2015-01-04 14:22:37 +01:00
Anatol Belski
ede59c8feb Fixed bug #68735 fileinfo out-of-bounds memory access 2015-01-04 14:20:21 +01:00
Anatol Belski
c06f66563a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  removed dead code

Conflicts:
	ext/fileinfo/libmagic/readelf.c
	ext/fileinfo/libmagic/readelf.h
 2015-01-04 09:42:46 +01:00
Anatol Belski
b644dcfb72 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  removed dead code
 2015-01-04 09:40:56 +01:00
Remi Collet
919abf0cb1 removed dead code 2015-01-04 09:40:19 +01:00
Ferenc Kovacs
fe46966678 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixes #67960 - Long/short day names reversed in jddayofweek()
 2015-01-02 10:15:01 +01:00
Greg Roach
244fc1e053 Fixes #67960 - Long/short day names reversed in jddayofweek() 2015-01-02 10:14:12 +01:00
Stanislav Malyshev
b585a3aed7 Fix for bug #68710 (Use After Free Vulnerability in PHP's unserialize()) 2015-01-01 16:19:05 -08:00
Anatol Belski
ce6cbb3110 updated libmagic.patch 2014-12-30 20:22:51 +01:00
Anatol Belski
99162b8198 updated libmagic.patch 2014-12-30 20:21:28 +01:00
Anatol Belski
091ea62262 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #68671 incorrect expression in libmagic
 2014-12-30 19:38:08 +01:00
Anatol Belski
d92a87d7cb Fixed bug #68671 incorrect expression in libmagic 2014-12-30 19:37:27 +01:00
Adam Harvey
3ef6e3726c Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Check the return value of lo_export.
 2014-12-30 17:59:39 +00:00
Adam Harvey
211f4ceeae Check the return value of lo_export. 
Patch by Ondřej Surý. Fixes bug #68697 (lo_export return -1 on failure).
 2014-12-30 17:47:19 +00:00
Anatol Belski
3485925a3a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #66679 Alignment Bug in PCRE 8.34 upstream
  remove BOM from NEWS
 2014-12-30 16:51:06 +01:00
Anatol Belski
d5123415f6 Fixed bug #66679 Alignment Bug in PCRE 8.34 upstream 2014-12-30 16:50:22 +01:00
Anatol Belski
a72cd07f29 Fixed bug #68665 (Invalid free) 2014-12-28 13:58:01 +01:00
Keyur Govande
83e5547827 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix for failing tests. gcc 4.8.3 would optimize away the assigment.
 2014-12-26 20:37:50 +00:00
Keyur Govande
aa192f57c9 Fix for failing tests. gcc 4.8.3 would optimize away the assigment. 2014-12-26 20:36:19 +00:00
Remi Collet
faba230153 Fix bug #68656 Report gd library version 2014-12-26 08:33:21 +01:00
Xinchen Hui
316f72ce28 Merge branch 'PHP-5.5' into PHP-5.6 2014-12-25 06:21:14 -05:00
Xinchen Hui
80260bcfa6 Fixed test 2014-12-25 06:20:52 -05:00
Xinchen Hui
bba4a8aad5 Fixed bug #68644 (strlen incorrect : mbstring + func_overload=2 +UTF-8 + Opcache) 2014-12-24 17:55:58 +08:00
Nikita Popov
87ccf50bad Merge branch 'PHP-5.5' into PHP-5.6 2014-12-19 21:46:38 +01:00