clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 11:27:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
82,613 Commits 491 Branches 1,363 Tags 847 MiB
c19d59c550
Commit Graph

82613 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julien Pauli
c22da81b71 Fixed double ZEND_TICKS opcode generation for declare() 2015-07-07 14:56:05 +02:00
Stanislav Malyshev
ed84af4b88 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Better fix for bug #69958
 2015-07-07 00:01:42 -07:00
Stanislav Malyshev
eda31f57fb Better fix for bug #69958 2015-07-07 00:01:26 -07:00
Stanislav Malyshev
09de64a58d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Better fix for bug #69958
 2015-07-06 23:03:05 -07:00
Stanislav Malyshev
61b0b80388 Better fix for bug #69958 2015-07-06 22:58:28 -07:00
Stanislav Malyshev
485b7c6981 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  update news
 2015-07-06 21:53:02 -07:00
Stanislav Malyshev
c938d2f537 update news 2015-07-06 21:52:56 -07:00
Stanislav Malyshev
303d97feda Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM)
  Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath
  Fix bug #69958 - Segfault in Phar::convertToData on invalid file

Conflicts:
	ext/mysqlnd/mysqlnd.c
 2015-07-06 21:52:49 -07:00
Stanislav Malyshev
0d2f147d80 Fix bug #69669 (mysqlnd is vulnerable to BACKRONYM) 2015-07-06 21:50:01 -07:00
Côme Bernigaud
022068342b Attempt at falling back on ldap_find_control for Mac OS 2015-07-06 14:54:04 +02:00
Côme Bernigaud
42f7e4c044 Updated README, added test to create LDAP base if missing and ease tests 2015-07-06 14:26:49 +02:00
Dominic
b27bcd90b3 Cleaned white spaces in PHP_INI definition of phar 
Removes unnecessary white spaces.
 2015-07-05 01:10:22 -07:00
Stanislav Malyshev
04ca04f830 Merge branch 'pull-request/1324' into PHP-5.6 
* pull-request/1324:
  fix typo, see #68476
 2015-07-05 01:01:00 -07:00
Stanislav Malyshev
3e88d610e5 Fix bug #69923 - Buffer overflow and stack smashing error in phar_fix_filepath 2015-07-04 23:47:48 -07:00
Stanislav Malyshev
452d30cf7d Fix bug #69958 - Segfault in Phar::convertToData on invalid file 2015-07-04 21:01:50 -07:00
Anatol Belski
b281211979 fix backport mistake 
in 5.6 it has to be explicitly copied to avoid double free
 2015-07-03 16:21:02 +02:00
Christoph M. Becker
344ff5dd4c fixed fix #69975 wrt. ODBCVER < 0x0300 2015-07-03 13:30:39 +02:00
Anatol Belski
d870683d6b backport c01943bffc into 5.6 2015-07-03 11:16:02 +02:00
Edgar R. Sandi
48d71af7ed Added more tests to improve function coverage 2015-07-03 03:02:40 +02:00
Christoph M. Becker
616661e0f8 updated NEWS 2015-07-03 00:23:44 +02:00
Christoph M. Becker
16db4d1462 Fix #69975: PHP segfaults when accessing nvarchar(max) defined columns 
The SQL Server Native Client 11.0 and maybe other ODBC drivers report
NVARCHAR(MAX) columns as SQL_WVARCHAR with size 0. This causes too small a
buffer to be emalloc'd, likely causing a segfault in the following. As we don't
know the real size of the column data, we treat such colums as
SQL_WLONGVARCHAR.

The related bug #67437 suggests that some drivers report a size of ~4GB. It is
not certain that this is really the case (there might be some integer overflow
involved, and anyway, there has been no feedback), so we do not cater for this
now. However, it would not be hard to treat all sizes above a certain threshold
in a similar way, i.e. as SQL_WLONGVARCHAR.
 2015-07-03 00:15:47 +02:00
Anatol Belski
57525d01dc keep LDAP_DEPRECATED in config.w32 2015-06-30 09:30:48 +02:00
Edgar R. Sandi
1b1a86c415 Improved code coverage of explode function 2015-06-29 23:49:41 +02:00
Edgar R. Sandi
d2bc45f6b3 Added basic and error tests for hex2bin function 2015-06-29 23:10:50 +02:00
Edgar R. Sandi
a8d61ab7f0 adding several other testing scenarios of code without coverage in stripcslashes function 2015-06-29 19:20:23 +02:00
Edgar R. Sandi
7acdfdc84e adding another testing scenario without coverage in setlocale function 2015-06-29 18:15:03 +02:00
Dmitry Stogov
ee1e67fae6 On Windows PHP may be restarted with different set of DSO extensions without SHM reset. 
This may make optimisation for entities from DSO extensions inconsistent.
 2015-06-29 17:45:56 +03:00
Côme Bernigaud
2e85e6d3ee Merge PR about LDAP cleaning by removing deprecated calls 
Merge branch 'pull-request/1357' into PHP-5.6

* pull-request/1357:
  Putting back deprecated symbols for ldap_sort
  Removed deprecated function calls from ldap module
  Removed ifdefs of LDAP_API_FEATURE_X_OPENLDAP, fixed a warning
 2015-06-29 09:31:37 +02:00
Stanislav Malyshev
d7daf814b7 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Move strlen() check to php_mail_detect_multiple_crlf()
  Fixed Bug #69874 : Can't set empty additional_headers for mail()
 2015-06-29 00:30:55 -07:00
Côme Bernigaud
736d840c8b Putting back deprecated symbols for ldap_sort 2015-06-29 09:07:49 +02:00
Stanislav Malyshev
8f2e08239f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Move strlen() check to php_mail_detect_multiple_crlf()
  Fixed Bug #69874 : Can't set empty additional_headers for mail()
 2015-06-28 20:23:00 -07:00
Stanislav Malyshev
cd9c39d77c Merge branch 'pull-request/1350' into PHP-5.4 
* pull-request/1350:
  Move strlen() check to php_mail_detect_multiple_crlf()
  Fixed Bug #69874 : Can't set empty additional_headers for mail()
 2015-06-28 20:18:56 -07:00
Christoph M. Becker
7e97faa3e8 updated NEWS 2015-06-27 20:03:38 +02:00
Christoph M. Becker
bbe28d3a55 Fixed #69655: php -S changes MKCALENDAR request method to MKCOL 
The parsing of the request method in the CLI server has been faulty, so that
several unsupported methods have been recognized as other methods.
 2015-06-27 20:02:21 +02:00
Christoph M. Becker
b811bb3920 added skip condition for powershell requirement of test 2015-06-27 15:02:52 +02:00
Christoph M. Becker
0730fc8830 updated NEWS 2015-06-27 14:32:34 +02:00
Christoph M. Becker
1920ba6f7b Fix #64878: 304 responses return Content-Type header 
According to RFC 7232 304 responses should not send a Content-Type header,
so the CLI server should comply.
 2015-06-27 14:28:33 +02:00
Christoph M. Becker
6400ef192c added regression test for bug #69679 
DOMDocument::loadHTML refuses to accept NULL bytes.
 2015-06-27 01:08:56 +02:00
Christoph M. Becker
bdf3bb668f slightly revised bug69462.phpt 2015-06-26 23:20:22 +02:00
Tomasz Sawicki
af17316fcd Test for bug #69462 
Test scenario for already fixed bug #69462 with segmentation fault when
SoapVar XML node name was null.
 2015-06-26 23:19:29 +02:00
Tjerk Meesters
2ff3dafccf Fixed #69882: OpenSSL error "key values mismatch" after openssl_pkcs12_read with extra certs 
Squashed commit of the following:

commit a64c1d9bc4
Author: Tomasz Sawicki <falundir@gmail.com>
Date:   Wed Jun 24 08:49:37 2015 +0200

    Fix #69882: OpenSSL error "key values mismatch" after openssl_pkcs12_read with extra certs

    The "key values mismatch" error is triggered in openssl_pkcs12_read by
    PKCS12_parse, because it uses X509_check_private_key to separate main
    certificate (which corresponds to private key) from extra certificates.
    Extra certificates usually comes first (p12 contents are reversed as
    stack) and X509_check_private_key triggers X509_R_KEY_VALUES_MISMATCH
    error.
    The fix pops "key values mismatch" error from OpenSSL error stack for
    each extra certificate if there are any.
 2015-06-26 05:33:28 +08:00
Julien Pauli
b1ec4515b0 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix unknown size of void error
 2015-06-25 19:13:20 +02:00
Anatol Belski
80f9a9725c fix unknown size of void error 2015-06-25 19:12:26 +02:00
Anatol Belski
7bb52dda6a backport missing rev bfdc9e2805 2015-06-25 11:34:04 +02:00
Ferenc Kovacs
1efe5b1157 5.6.12 next 2015-06-25 00:21:45 +02:00
Julien Pauli
ca82114f21 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  5.5.28 now - Security Only

Conflicts:
	configure.in
	main/php_version.h
 2015-06-24 10:42:41 +02:00
Julien Pauli
8e440dc1d7 5.5.28 now - Security Only 2015-06-24 10:41:06 +02:00
Christoph M. Becker
c201b63873 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Made bug44295-win.phpt locale independent
 2015-06-24 01:42:22 +02:00
Christoph M. Becker
cd068b1ed6 Made bug44295-win.phpt locale independent 
Formerly it failed on non English installations.
 2015-06-24 01:41:33 +02:00
Christoph M. Becker
e181931f77 updated NEWS 2015-06-24 00:42:24 +02:00