archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 09:24:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
97658 commits 526 branches 1434 tags 881 MiB
Commit graph

97658 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kalle Sommer Nielsen
7813e9de11 Fixed bug #5453 (WSA cleanup executes before MSHUTDOWN) 
This moves the WSACleanup() call to after zend_shutdown() in main.c, I did some testing and I could not find any issues with this. I don't expect this to cause any issues on Netware either, although untested as I do not have such an env available (do we even support Netware anymore? Last release was in 2009 and it is now discontinued)

Besides the movie, then this commit also contains a fix to the check of WSAStartup() where we don't actually confirm we get the desired version of the winsock.dll (We use 2.0).
 2016-08-06 04:06:50 +02:00
Kalle Sommer Nielsen
25437255d7 Merge branch 'master' of git.php.net:php-src 2016-08-06 03:39:10 +02:00
Nikita Popov
324da6f765 Merge branch 'PHP-7.1' 2016-08-05 23:10:32 +02:00
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
da2c2fb22f Merge branch 'PHP-7.1' 2016-08-05 19:56:48 +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
f29149b419 Merge branch 'PHP-7.1' 2016-08-05 16:32:25 +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
Christoph M. Becker
67786d343a Merge branch 'PHP-7.1' 2016-08-05 13:25:30 +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
Kalle Sommer Nielsen
5db7f1ea7e pefree() these (with persistent=0), as internally in zend_multibyte.c they do the same, and at the same time also cast them to void pointers to silence the compiler warnings. 2016-08-05 11:17:26 +02:00
Kalle Sommer Nielsen
b3124dbe12 Fix line endings, getting a little annoyed with VS' warning about mismatch 2016-08-05 11:12:51 +02:00
Kalle Sommer Nielsen
1740823864 Fixed bug #68547 (Exif Header component value check error) (Patch by sjh21a at gmail dot com) 
This patch changes processing a little and causes some crafted tags to not be parsed and generate a warning.

This is a slight BC break from earlier versions, since it will no longer return the tags of that it was mismatching (see bug68799.phpt), namely the "WINXP" section and the "Author" tag is no longer returned due to this. Although this BC break is merely only for crafted tags, this can also have some real life effects on pictures re-saved from editors that can cause bad exif data writes, so lets keep it here.
 2016-08-05 10:03:14 +02:00
Kalle Sommer Nielsen
d9e4d5116b NEWS and UPGRADING for recent fixes and additions to ext/exif 2016-08-05 07:54:36 +02:00
Kalle Sommer Nielsen
aaa136e25d Added support for Sony pictures in EXIF as per requested in bug #72735 
Sony is a little more interesting, as it is have a large range of tags it support in different models. For now I have added all the tags found within the Exif.Sony1 namespace.
 2016-08-05 07:45:02 +02:00
Kalle Sommer Nielsen
93c0e97602 Split this test up to a 64bit version for more coverage 
The 32bit version does not have the 64bit float values here, we already have 3 float tests which I guess will do for now at least
 2016-08-05 07:15:34 +02:00
Nikita Popov
65b6f2013b Fix exif_imagetype() test after zpp change 2016-08-04 22:27:42 +02:00
Nikita Popov
919d208626 Merge branch 'PHP-7.1' 2016-08-04 14:23:16 +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
1ff8856d03 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #72743 (Out-of-bound read in php_stream_filter_create)
 2016-08-04 19:10:56 +08: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
ddc9a44b09 Merge branch 'PHP-7.1' 2016-08-04 12:11:02 +02: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
3e5dbdc3e8 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Clean up FR #72633
  Fixed invalid handle error with Implicit Result Sets and bump OCI8 version.
 2016-08-04 09:38:10 +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
eec630d068 Merge branch 'PHP-7.1' 2016-08-04 17:02:44 +10:00
Christopher Jones
6aeb9ba447 Merge branch 'PHP-7.0' into PHP-7.1 2016-08-04 17:02:08 +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
b15f4aea02 Merge branch 'master' of https://git.php.net/repository/php-src 2016-08-04 16:45:31 +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
2eb182b35d Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix bug #72716 - initialize buffer before read
 2016-08-03 23:04:07 -07: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
69a72df936 Merge branch 'PHP-7.1' 2016-08-04 01:44:18 +02: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
Kalle Sommer Nielsen
4d90b1b5ea Use 'p' to validate a path in exif_imagetype() (like the other exif function already does) 2016-08-03 23:57:51 +02:00
Nikita Popov
372d0457b5 Merge branch 'PHP-7.1' 2016-08-03 23:10:29 +02:00