php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-18 13:31:27 +02:00
Code Issues Packages Projects Releases Wiki Activity
100,019 Commits 547 Branches 1,483 Tags
7cb3e90162d4e1ea57f52e354686ad56effc1b93
Commit Graph

100019 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sara Golemon
7cb3e90162 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Add NEWS entry for bab0b99f
 2017-03-09 11:56:54 -08:00
Sara Golemon
9b16d4c999 Add NEWS entry for bab0b99f 2017-03-09 11:56:06 -08:00
Nikita Popov
305f3c2b76 Merge branch 'PHP-7.0' into PHP-7.1 2017-03-09 20:48:24 +01:00
Nikita Popov
177f87cf05 Fixed bug #73370 
If len=0 malloc() is allowed to return NULL.
 2017-03-09 20:47:06 +01:00
Nikita Popov
314ef0ff69 Merge branch 'PHP-7.0' into PHP-7.1 2017-03-09 17:32:01 +01:00
Thomas Orozco
247ce052cd Fixed bug #71003: Add PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT 2017-03-09 17:31:21 +01:00
Nikita Popov
6635639b75 Merge branch 'PHP-7.0' into PHP-7.1 2017-03-09 16:45:28 +01:00
mcq8
b224e74267 Fixed bug #72096 Swatch time value incorrect for dates before 1970 2017-03-09 16:44:02 +01:00
Joe Watkins
8599ce4f18 Fix bug #74149 static embed SAPI linkage error 2017-03-09 07:43:58 +00:00
andrewnester
8f799137d7 Fixed bug #74058 
Fall back from get_property_ptr_ptr to read_property if offsetGet
is overridden.
 2017-03-09 00:10:00 +01:00
Sara Golemon
1a19b97ac3 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Detect invalid port in xp_socket parse ip address
 2017-03-07 12:11:22 -08:00
Sara Golemon
bab0b99f37 Detect invalid port in xp_socket parse ip address 
For historical reasons, fsockopen() accepts the port and hostname
separately: fsockopen('127.0.0.1', 80)

However, with the introdcution of stream transports in PHP 4.3,
it became possible to include the port in the hostname specifier:

fsockopen('127.0.0.1:80')
Or more formally: fsockopen('tcp://127.0.0.1:80')

Confusing results when these two forms are combined, however.
fsockopen('127.0.0.1:80', 443) results in fsockopen() attempting
to connect to '127.0.0.1:80:443' which any reasonable stack would
consider invalid.

Unfortunately, PHP parses the address looking for the first colon
(with special handling for IPv6, don't worry) and calls atoi()
from there.  atoi() in turn, simply stops parsing at the first
non-numeric character and returns the value so far.

The end result is that the explicitly supplied port is treated
as ignored garbage, rather than producing an error.

This diff replaces atoi() with strtol() and inspects the
stop character.  If additional "garbage" of any kind is found,
it fails and returns an error.
 2017-03-07 12:10:53 -08:00
Anatol Belski
b8f75e75f6 sync with the incremental and inter-file analysis option 
available as of cppcheck 1.77
 2017-03-07 15:27:57 +01:00
Nikita Popov
8a6281455e Merge branch 'PHP-7.0' into PHP-7.1 2017-03-07 13:17:33 +01:00
Nikita Popov
549a30d2cd Fix out of bounds access in gc_find_additional_buffer() 2017-03-07 13:16:06 +01:00
Dmitry Stogov
d9231b1667 Fixed pointer allignment 2017-03-07 10:18:34 +03:00
Dmitry Stogov
b273a8cbe4 Ensure pointer alignment. 2017-03-07 09:48:18 +03:00
Dmitry Stogov
6158b517c4 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed file-cache (Zend/tests/unused_shared_static_variables.phpt)
 2017-03-03 16:12:41 +03:00
Dmitry Stogov
648b756f35 Fixed file-cache (Zend/tests/unused_shared_static_variables.phpt) 2017-03-03 16:10:46 +03:00
Anatol Belski
f844c0880d Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  sync NEWS for bug #74159
 2017-03-02 20:46:39 +01:00
Anatol Belski
c082c92b7e sync NEWS for bug #74159 2017-03-02 20:45:15 +01:00
Anatol Belski
1d4248af42 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  improve signal globals consistency check for TS
 2017-03-02 20:34:48 +01:00
Anatol Belski
18f7e26257 improve signal globals consistency check for TS 
Seems when we receive TERM, TLS is destroyed completely. In that case,
not only signal globals, but the entire globals array doesn't exist
anymore.
 2017-03-02 20:27:27 +01:00
Anatol Belski
494fc16184 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  do not try to handle signals, when globals are inconsistent
 2017-03-02 16:41:43 +01:00
Anatol Belski
c7b2c698d0 do not try to handle signals, when globals are inconsistent 2017-03-02 16:40:38 +01:00
Nikita Popov
bf8c463f5b Merge branch 'PHP-7.0' into PHP-7.1 2017-03-02 12:36:13 +01:00
somedaysummer
fab5ce347c PHP bug #74004 
Fix for DOMDocument loadHTML and loadHTMLFile ignore LIBXML_NOWARNING
and LIBXML_NOERROR flags.
 2017-03-02 12:35:42 +01:00
Derick Rethans
a7ff583e7e Merge branch 'PHP-7.0' into PHP-7.1 2017-03-02 11:28:09 +00:00
Derick Rethans
cf60f26da6 Fixed tests after tzdb removed abbreviations 2017-03-02 11:28:02 +00:00
Derick Rethans
61e9b7354f Make sure we anchor this test to February 2017-03-02 11:27:44 +00:00
Nikita Popov
bc1807dbe2 Merge branch 'PHP-7.0' into PHP-7.1 2017-03-02 12:13:38 +01:00
Mitch Hagstrand
29333550d2 Fix bug73858.phpt to work in months without 31 days 
Used hardcoded months in bug73858.phpt rather than the current and previous
month.
 2017-03-02 12:13:06 +01:00
Christopher Jones
9f09c810f5 Update NEWs 2017-03-02 15:34:47 +11:00
Christopher Jones
06e5ec9e32 Merge branch 'PHP-7.0' into PHP-7.1 2017-03-02 15:33:25 +11:00
Christopher Jones
e80ea04c79 Fixed bug #54379 (PDO_OCI: UTF-8 output gets truncated) 
This was a modification of an incomplete PR #2276.
 2017-03-02 15:28:01 +11:00
Derick Rethans
1b16fb594f Updated to version 2017.1 (2017a) 2017-03-01 20:07:51 +00:00
Derick Rethans
dfcb11d7d1 Updated to version 2017.1 (2017a) 2017-03-01 20:07:51 +00:00
Derick Rethans
36d8c1b182 Empty merge 2017-03-01 20:07:51 +00:00
Remi Collet
2f955d5d0a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  make type consistent with glob_t.gl_pathc
 2017-03-01 17:02:42 +01:00
Remi Collet
53a08fd07d make type consistent with glob_t.gl_pathc 2017-03-01 17:01:58 +01:00
Sara Golemon
c5727a30cf Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix potential crash when setting invalid declare value
 2017-02-28 17:17:41 -08:00
Sara Golemon
868930e079 Fix potential crash when setting invalid declare value 
Using a non-literal expression in a declare value can cause the
compiler to crash trying to turn that AST node into a usable zval.

There was an existing test for such values using 'encoding',
but that didn't crash because it's handled by the lexer
rather than being compiled.

Trying to use a non-literal with ticks reproduces the crash.
 2017-02-28 17:08:23 -08:00
Remi Collet
3006d1de5b make test slower again 2017-02-28 11:36:24 +01:00
Joe Watkins
55bcef1751 prepare 7.1.4 2017-02-28 09:08:05 +00:00
Anatol Belski
52393daa3a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  prepare next
 2017-02-28 09:47:56 +01:00
Anatol Belski
21a05b0418 prepare next 2017-02-28 09:46:11 +01:00
Joe Watkins
585ea4cda0 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Revert "fix crash in phpdbg shutdown process when opcache is loaded"
 2017-02-27 19:21:37 +00:00
Joe Watkins
c564924d31 Revert "fix crash in phpdbg shutdown process when opcache is loaded" 
This reverts commit 008fb28eaf.
 2017-02-27 19:21:10 +00:00
Joe Watkins
7aa59a4440 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix crash in phpdbg shutdown process when opcache is loaded
 2017-02-27 17:55:14 +00:00
Joe Watkins
008fb28eaf fix crash in phpdbg shutdown process when opcache is loaded 2017-02-27 17:54:48 +00:00