1
0
mirror of https://github.com/php/php-src.git synced 2026-04-19 05:51:02 +02:00
Commit Graph

100516 Commits

Author SHA1 Message Date
Bob Weinand
af7bfc71fd Merge branch 'PHP-7.0' into PHP-7.1 2017-07-01 11:52:41 +02:00
Bob Weinand
e3cc15daf2 Fixed bug #74840 (Opcache overwrites argument of GENERATOR_RETURN within finally) 2017-07-01 11:52:03 +02:00
Julien Pauli
72f7143295 Updated NEWS 2017-06-29 20:24:34 +02:00
Julien Pauli
e57fce4d00 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Updated NEWS
  Fix bug #74832, crash in extension loading
2017-06-29 20:24:03 +02:00
Julien Pauli
2a1ad88538 Updated NEWS 2017-06-29 20:23:37 +02:00
Julien Pauli
3f4340a796 Fix bug #74832, crash in extension loading 2017-06-29 20:22:21 +02:00
Adam Baratz
c8bb64c406 Fixed bug #69356 2017-06-29 11:43:12 +02:00
Adam Baratz
f15790ec73 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed #69356: PDOStatement::debugDumpParams() truncates query
2017-06-29 11:40:56 +02:00
Adam Baratz
08089f014c Fixed #69356: PDOStatement::debugDumpParams() truncates query 2017-06-29 11:39:50 +02:00
Tyson Andre
a99c5f28c5 Fix typo in PHP 7.1.8 news 2017-06-28 15:46:58 -07:00
George Wang
4e4f2f9f89 Merge branch 'PHP-7.0' into PHP-7.1 2017-06-27 23:16:25 -04:00
George Wang
751d19f698 [BUGFIX] fixes the issue that a value from .user.ini displays in phpinfo(), but not applies.
[BUGFIX] when lsapi used the php_value has higher priority then ini_set when called from the script by itself .
2017-06-27 23:14:36 -04:00
Nikita Popov
e938cfc921 Merge branch 'PHP-7.0' into PHP-7.1 2017-06-25 20:17:26 +02:00
Nikita Popov
604827b694 Fixed bug #73173
Patch by tloi at fortinet dot com.
2017-06-25 20:17:06 +02:00
Bob Weinand
44d734254a Merge branch 'PHP-7.0' into PHP-7.1 2017-06-25 20:13:48 +02:00
Bob Weinand
cfee5116dd Expose inflate_get_status() and inflate_get_read_len() functions 2017-06-25 20:12:45 +02:00
Matthew Trescott
0c4f11ecaa Add more constants, improve comments, and add tests 2017-06-25 20:12:45 +02:00
Nikita Popov
653b96347c Merge branch 'PHP-7.0' into PHP-7.1 2017-06-25 19:49:11 +02:00
Nikita Popov
2fddc4a7f1 Fixed bug #73900 2017-06-25 19:48:17 +02:00
Jakub Zelenka
0c707fcb10 Add OPENSSL_DONT_ZERO_PAD_KEY constant to prevent key padding
It fixes bug #71917 (openssl_open() returns junk on envelope < 16 bytes)
and bug #72362 (OpenSSL Blowfish encryption is incorrect for short
keys).
2017-06-25 18:08:50 +01:00
Nikita Popov
bda0f4e8dc Merge branch 'PHP-7.0' into PHP-7.1 2017-06-25 15:30:29 +02:00
Nikita Popov
de66e80d75 Don't leave holes in func_get_args() and backtraces
Argument lists should always be continuous and hole-free, even if
local variables are unset. Replace UNDEF values with NULLs.
2017-06-25 15:27:45 +02:00
Bob Weinand
fda0a8b735 Fixed bug #73944 (inflate_init() dictionary option) - add NEWS entry 2017-06-25 10:57:36 +02:00
wapmorgan
cd1869bcf2 Remove invalid check of dictionary content and add initialization of dictionary if raw compression used 2017-06-25 10:53:28 +02:00
Anatol Belski
4e98990f6b [ci skip] update NEWS 2017-06-24 01:28:58 +02:00
Anatol Belski
b714309056 Fix bug #74798 pkcs7_en/decrypt does not work if \x0a is used in content
The patch for bug #74720 was incomplete.
2017-06-24 00:18:57 +02:00
Nikita Popov
5b5a92b8b6 Fixed bug #74623 2017-06-23 17:32:45 +02:00
Nikita Popov
4948da178a Make inference robust against infinite loop
Right now, if narrowing occurs on non-debug builds, inference can
easily go into an infinite loop. Prevent this, and add a pointer
that this should be reported as a bug.
2017-06-23 17:07:44 +02:00
Nikita Popov
721de5b542 Merge branch 'PHP-7.0' into PHP-7.1 2017-06-23 13:31:39 +02:00
ideal
4d6100569b Fix error if compiled without -fpermissive flag. 2017-06-23 13:31:23 +02:00
Joe Watkins
bd8940a1fe Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix method "eof"
2017-06-23 07:53:12 +01:00
danchukas
b255b97e43 fix method "eof"
replace "eof" with  "feof"
because:
1) http://php.net/manual/ru/function.feof.php
2) Error: Call to undefined function eof()
2017-06-23 07:53:00 +01:00
Joe Watkins
b903733762 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Remove superfluous branch
2017-06-23 07:51:46 +01:00
Thomas Punt
b1301a0686 Remove superfluous branch 2017-06-23 07:51:32 +01:00
Joe Watkins
21cbdf6984 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix configure error
2017-06-22 14:01:45 +01:00
Peter Kokot
660250f4da Fix configure error
This patch fixes configure error on some systems such as Alpine.

```
 line 3472: test: =: unary operator expected
```

One of the fixes has been suggested also here already:
https://bugs.php.net/bug.php?id=39835

Thank you for considering merging this.
2017-06-22 14:01:18 +01:00
Joe Watkins
c56378b0d5 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix bug #73471 PHP freezes with AppendIterator
2017-06-22 11:57:39 +01:00
jhdxr
81c2a4b9ba fix bug #73471 PHP freezes with AppendIterator 2017-06-22 11:56:49 +01:00
Joe Watkins
ed1f64e083 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix bug #74780 parse_url() borken when query string contains colon
2017-06-22 11:52:39 +01:00
jhdxr
db287b2303 fix bug #74780 parse_url() borken when query string contains colon 2017-06-22 11:52:06 +01:00
Christopher Jones
c288ed44a2 Update NEWS 2017-06-21 16:16:20 +10:00
Christopher Jones
5d666d2a02 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Add bug #74625 to package.xml
  Add IN bind case to bug74625.phpt
  Fixed bug #74625 (Integer overflow in oci_bind_array_by_name).
2017-06-21 15:55:54 +10:00
Christopher Jones
b3bd379198 Merge branch 'pull-request/2532' into PHP-7.0
* pull-request/2532:
  Add bug #74625 to package.xml
  Add IN bind case to bug74625.phpt
  Fixed bug #74625 (Integer overflow in oci_bind_array_by_name).
2017-06-21 15:55:28 +10:00
Christopher Jones
cda87977a5 Add bug #74625 to package.xml 2017-06-21 15:50:51 +10:00
Christopher Jones
b4c5f20c46 Add IN bind case to bug74625.phpt 2017-06-21 15:47:32 +10:00
Ingmar Runge
fa3615f14e Fixed bug #74625 (Integer overflow in oci_bind_array_by_name). 2017-06-21 15:44:55 +10:00
Christopher Jones
13347e8a7d Merge branch 'PHP-7.0' into PHP-7.1 2017-06-21 15:04:03 +10:00
Christopher Jones
3fbbcf7f93 Remove use of obsolete create_function() 2017-06-21 15:02:58 +10:00
Christopher Jones
d9feb3c2d0 Merge branch 'PHP-7.0' into PHP-7.1 2017-06-21 14:29:43 +10:00
Christopher Jones
1bdc290017 Update OCI8 version test and package.xml 2017-06-21 14:29:30 +10:00