php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-02 05:32:28 +02:00
Code Issues Packages Projects Releases Wiki Activity
94,751 Commits 547 Branches 1,481 Tags
a2a2ea18feea8945be7a7f02f384f015fa47076a
Commit Graph

94751 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
Anatol Belski
fad3f936ac fix ts build 2016-08-03 12:16:42 +02:00
Nikita Popov
1bcd439cad Fix bug #72724 2016-08-03 00:34:36 +02:00
Christoph M. Becker
3a8c027ec3 Merge branch 'PHP-5.6' into PHP-7.0 2016-08-02 18:49:59 +02:00
Christoph M. Becker
f5622f5c87 Fix #72709: imagesetstyle() causes OOB read for empty $styles 
Calling imagesetstyle() with an empty $styles array caused gdImageSetStyle()
to be called with `noOfPixels==0`, what could have lead to OOB reads.
Actually, this issue will be fixed in libgd, but to avoid issues when older
libgd is in use, we simply disallow passing an empty $styles array to
imagesetstyle(), what wouldn't serve a useful purpose anyway.
 2016-08-02 18:43:37 +02:00
Anatol Belski
072af35b5c Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  update NEWS
  cleanup table after test
  - lastInsertId using Postgres Lastval() function
 2016-08-02 14:40:31 +02:00
Anatol Belski
e95625f47e update NEWS 2016-08-02 14:36:56 +02:00
Anatol Belski
40b3a031b2 cleanup table after test 2016-08-02 14:35:24 +02:00
Pablo Santiago Sánchez
90c6cbd09b - lastInsertId using Postgres Lastval() function 2016-08-02 14:34:30 +02:00
Anatol Belski
5c51433e2a prepare next 2016-08-02 11:13:20 +02:00
Anatol Belski
9f14920725 fix php_version.h 2016-08-02 11:06:33 +02:00
Anatol Belski
753e6eacd5 update NEWS 2016-07-31 14:58:46 +02:00
Anatol Belski
5f9df47ea8 Revert "upgraded to PCRE 8.39" 
This reverts commit 2fba646837.

PCRE-8.39 throws weird valgrind backtraces on some systems, see
http://news.php.net/php.cvs/93494 . Those could be false positives
due to some changes in JIT, still i couldn't 100% ensure this.
Thus, better we continue to ship 8.38 bundled for now, and apply
patches, if needed.
 2016-07-31 14:55:17 +02:00
Nikita Popov
c4d35c3214 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-30 18:36:00 +02:00
Nikita Popov
c9d3ff0c6e Revert "Fixed bug #71219" 
This reverts commit 14d674442e.

I misread the discussion on the bug -- this is not the correct
fix. However the other proposed fix does not work either, so just
reverting for now.
 2016-07-30 18:34:34 +02:00
Nikita Popov
9fe0398dad Merge branch 'PHP-5.6' into PHP-7.0 2016-07-30 18:24:14 +02:00
Nikita Popov
14d674442e Fixed bug #71219 2016-07-30 18:21:19 +02:00
Nikita Popov
dd7bea17bf Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	ext/wddx/wddx.c
 2016-07-30 16:29:10 +02:00
Nikita Popov
99613431b4 Add missing TSRMLS_FETCH() 2016-07-30 16:28:42 +02:00
Nikita Popov
029f8e8777 Fix incorrect merge 
Forgot to amend the merge fixes...
 2016-07-30 16:07:54 +02:00
Nikita Popov
1f67b4c24d Merge branch 'PHP-5.6' into PHP-7.0 2016-07-30 15:51:23 +02:00
Nikita Popov
e87ac688d5 Fixed bug #72142 2016-07-30 15:13:03 +02:00
Christoph M. Becker
e5940aa795 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-30 12:01:29 +02:00
ju1ius
1d32b80903 fixes bad address given to onig_error_code_to_str 
Closes bug #72710

(cherry picked from commit 0fb7eb6723)
 2016-07-30 11:46:34 +02:00
Nikita Popov
8a442a33c3 Fix ref handling in array_merge/replace_recursive() 
As usual, if the reference has rc=1 it really isn't a reference.
 2016-07-29 19:07:04 +02:00
Anatol Belski
1666e80cb9 document file cache fallback ini directive 2016-07-29 13:04:51 +02:00
Christoph M. Becker
293dd3d701 Merge branch 'PHP-5.6' into PHP-7.0 
# Resolved conflicts:
#	ext/calendar/calendar.c
 2016-07-29 01:26:15 +02:00