clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 02:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
97,491 Commits 491 Branches 1,363 Tags 841 MiB
be31515cc6
Commit Graph

97491 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita Popov
be31515cc6 Merge branch 'PHP-7.0' into PHP-7.1 2016-08-05 23:10:12 +02:00
Nikita Popov
a2a2ea18fe Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	ext/standard/ftp_fopen_wrapper.c
 2016-08-05 23:09:30 +02:00
Ville Hukkamaki
65056e9d6c Fix #72764 
Negotiate data channel encryption after NLST command.
This is to prevent issues with IIS and ProFTPD.
 2016-08-05 22:56:54 +02:00
Nikita Popov
3859bcd1f8 Merge branch 'PHP-7.0' into PHP-7.1 2016-08-05 19:56:27 +02:00
Nikita Popov
807e81937b Fix bug #72767 
The page size calculation did not account for the size of the
stack header (or rather it did account for it, but in the wrong
direction...)
 2016-08-05 19:55:10 +02:00
Nikita Popov
1a780e6727 Add assertion to prevent type narrowing 
Currently type narrowing is always a bug, make sure we know about
it.
 2016-08-05 16:30:57 +02:00
Nikita Popov
fc7c81ff54 Fixed bug #72762 2016-08-05 16:27:55 +02:00
ju1ius
03d03243fa Fix #72711: mb_ereg does not clear the $regs parameter on failure 
When `mb_ereg` failed to match, it didn't update the `$regs` argument.
Now it will always set it to the empty array.
 2016-08-05 13:22:10 +02:00
Ville Hukkamäki
318d3b3a3f Implement request #27814 
Construct HTTP request headers into smart_str and send whole
request in one go.
 2016-08-04 14:20:36 +02:00
Xinchen Hui
3800e1cf97 Fixed bug #72743 (Out-of-bound read in php_stream_filter_create) 2016-08-04 19:10:40 +08:00
Christoph M. Becker
5b547af1ad Merge branch 'PHP-7.0' into PHP-7.1 2016-08-04 12:10:34 +02:00
Christoph M. Becker
62f12a8b86 Merge branch 'PHP-5.6' into PHP-7.0 2016-08-04 12:09:16 +02:00
Christoph M. Becker
a8515a339d Fix broken skip marker in test case 2016-08-04 12:06:07 +02:00
Matteo Beccati
70698d1566 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Clean up FR #72633
  Fixed invalid handle error with Implicit Result Sets and bump OCI8 version.

Conflicts:
	ext/oci8/package.xml
 2016-08-04 09:37:40 +02:00
Matteo Beccati
4003595d60 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Clean up FR #72633
 2016-08-04 09:30:48 +02:00
Matteo Beccati
d3a8e107ac Clean up FR #72633 2016-08-04 09:28:58 +02:00
Christopher Jones
0781f512c3 Fixed invalid handle error with Implicit Result Sets and bump OCI8 version. 2016-08-04 17:14:19 +10:00
Christopher Jones
2b7a699acd Fixed invalid handle error with Implicit Result Sets 2016-08-04 17:01:57 +10:00
Christopher Jones
78488a54c8 Fixed invalid handle error with Implicit Result Sets and bump OCI8 version. 2016-08-04 16:55:54 +10:00
Christopher Jones
06be3c659c Merge branch 'PHP-7.0' of https://git.php.net/repository/php-src into PHP-7.0 2016-08-04 16:45:29 +10:00
Stanislav Malyshev
67264ebc70 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #72716 - initialize buffer before read
 2016-08-03 23:03:15 -07:00
Stanislav Malyshev
b57474f23e Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix bug #72716 - initialize buffer before read

Conflicts:
	ext/standard/ftp_fopen_wrapper.c
 2016-08-03 23:00:32 -07:00
Stanislav Malyshev
4f861b6071 Fix bug #72716 - initialize buffer before read 2016-08-03 22:59:42 -07:00
Ferenc Kovacs
7d4f5e3938 Merge branch 'PHP-7.0' into PHP-7.1 2016-08-04 01:43:27 +02:00
Ferenc Kovacs
db4211a8fe Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	configure.in
	main/php_version.h
 2016-08-04 01:42:00 +02:00
Ferenc Kovacs
562c17eb4e 5.6.26 will be next 2016-08-04 01:39:37 +02:00
Nikita Popov
ec6d70db77 Fix leak on self-referencing constants 2016-08-03 23:10:09 +02:00
Davey Shafik
b304ab5c70 Move fix for #72735 to 7.1.0beta3 2016-08-03 12:31:15 -07:00
Anatol Belski
662e5ae951 improve the check, avoid strlen on NULL 2016-08-03 12:29:03 -07:00
Kalle Sommer Nielsen
835ef14979 Changed the way MAKERNOTE is handled in case we do not have a matching signature (Remi). 
Before this patch, exif_process_IFD_in_MAKERNOTE() would return false, then causing the rest of the EXIF parsing to be interrupted. This is a regression from earlier which was most likely a part of a security fix for MAKERNOTE.

The new behavior is to instead of stopping to parse, to continue so we can still fetch data like thumbnail and GPS, thrus allowing yet unsupported formats to parse. If EXIF's debugging mode is enabled, a notice will display in case we do not match against a valid MAKERNOTE signature.

This should temporarily fix bug #72682 (exif_read_data() fails to read all data for some images) until I get around to debug it further.
 2016-08-03 12:29:03 -07:00
Jakub Zelenka
6822af2e73 Do not add already added object to the internal OpenSSL table 
This fixes OpenSSL 1.1 where adding object with OID that has been
already added causes an error - preventing of duplication.
 2016-08-03 20:01:41 +01:00
Anatol Belski
8f0baa9707 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  improve the check, avoid strlen on NULL
 2016-08-03 18:29:42 +02:00
Anatol Belski
138689ffb7 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  improve the check, avoid strlen on NULL
 2016-08-03 18:28:48 +02:00
Anatol Belski
9667ee4f72 improve the check, avoid strlen on NULL 2016-08-03 18:26:29 +02:00
Anatol Belski
a60e1bfedf update NEWS 2016-08-03 17:42:45 +02:00
Anatol Belski
8830b3d020 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  update NEWS
  update NEWS
  Changed the way MAKERNOTE is handled in case we do not have a matching signature (Remi).
 2016-08-03 17:40:38 +02:00
Anatol Belski
2bdb34fd40 update NEWS 2016-08-03 17:39:55 +02:00
Anatol Belski
0e82eb48cb Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  update NEWS
  Changed the way MAKERNOTE is handled in case we do not have a matching signature (Remi).
 2016-08-03 17:39:22 +02:00
Anatol Belski
f15c155363 update NEWS 2016-08-03 17:38:11 +02:00
Kalle Sommer Nielsen
d5796fb298 Changed the way MAKERNOTE is handled in case we do not have a matching signature (Remi). 
Before this patch, exif_process_IFD_in_MAKERNOTE() would return false, then causing the rest of the EXIF parsing to be interrupted. This is a regression from earlier which was most likely a part of a security fix for MAKERNOTE.

The new behavior is to instead of stopping to parse, to continue so we can still fetch data like thumbnail and GPS, thrus allowing yet unsupported formats to parse. If EXIF's debugging mode is enabled, a notice will display in case we do not match against a valid MAKERNOTE signature.

This should temporarily fix bug #72682 (exif_read_data() fails to read all data for some images) until I get around to debug it further.

(cherry picked from commit aabcb5481d)
 2016-08-03 17:36:00 +02:00
Anatol Belski
c17092fc13 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  update libs_versions.txt
  update libs_versions.txt
 2016-08-03 15:06:39 +02:00
Anatol Belski
e3dabe448d update libs_versions.txt 2016-08-03 15:06:02 +02:00
Anatol Belski
7922e0f0bf Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  update libs_versions.txt
 2016-08-03 15:05:39 +02:00
Anatol Belski
67c2b0a9e8 update libs_versions.txt 2016-08-03 15:03:41 +02:00
Remi Collet
f9ce8aa75b Minor revert of be3640150c 
On 32bits this may cause php to hangs forever.
 2016-08-03 14:27:46 +02:00
Remi Collet
a70ca97c18 fix paths in tests 2016-08-03 14:24:35 +02:00
Remi Collet
8b7f594a2b clean removed functions (since they are alias) 2016-08-03 12:59:14 +02:00
Remi Collet
cff668f7a7 Fix 32bits tests 
Notice: this warning is only raise since rand is an alias to mt_rand
 2016-08-03 12:56:07 +02:00
Anatol Belski
39587c4817 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix ts build
 2016-08-03 12:20:23 +02:00
Anatol Belski
151c39827a Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix ts build
 2016-08-03 12:19:29 +02:00