php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-26 09:28:21 +02:00
Code Issues Packages Projects Releases Wiki Activity
100,161 Commits 549 Branches 1,485 Tags
f33bfd4e447d7d7717afa031c2fbfc022d5987ce
Commit Graph

4770 Commits

Author SHA1 Message Date
Kalle Sommer Nielsen 1b5b9234a3 Remove these NetWare leftovers 2016-11-19 10:47:20 +01:00
Joe Watkins a2bc7cf9ca Merge branch 'master' of git.php.net:/php-src 2016-11-12 17:30:41 +00:00
Andrea Faulds 3ed8b7a87b Use "Standard input code" instead of "php://stdin" 2016-11-12 17:26:20 +00:00
Andrea Faulds a103aa2dbd Show "php://stdin" instead of "-" in error messages 2016-11-12 17:26:20 +00:00
Kalle Sommer Nielsen 2104bea5d7 Remove Netware support 
If this does not break the Unix system somehow, I'll be amazed. This should get most of it out, apologies for any errors this may cause on non-Windows ends which I cannot test atm.
 2016-11-12 11:20:01 +01:00
Kalle Sommer Nielsen 2de9c42f97 Remove this check as discussed with Anatol 2016-11-05 23:08:08 +01:00
Anatol Belski 100650bc5d add some float limits constants 2016-10-26 18:10:44 +02:00
Anatol Belski f7aa911d9b Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #73189 - Memcpy negative size parameter php_resolve_path
 2016-10-12 21:33:13 +02:00
Stanislav Malyshev c4c2cce37d Fix bug #73189 - Memcpy negative size parameter php_resolve_path 
(cherry picked from commit da7e89cde8)
 2016-10-12 21:31:37 +02:00
Sara Golemon 9f86cdaf7f Clear FG(user_stream_current_filename) when bailing out 
If a userwrapper opener E_ERRORs then FG(user_stream_current_filename)
would remain set until the next request and would not be pointing
at unallocated memory.

Catch the bailout, clear the variable, then continue bailing.

Closes https://bugs.php.net/bug.php?id=73188
 2016-10-11 21:46:02 -07:00
Sara Golemon 4d11a8eedf Clear FG(user_stream_current_filename) when bailing out 
If a userwrapper opener E_ERRORs then FG(user_stream_current_filename)
would remain set until the next request and would not be pointing
at unallocated memory.

Catch the bailout, clear the variable, then continue bailing.

Closes https://bugs.php.net/bug.php?id=73188
 2016-10-11 21:44:14 -07:00
Anatol Belski 940731df04 Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix datatype
 2016-10-06 11:03:45 +02:00
Anatol Belski bc5efe501e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix datatype
 2016-10-06 11:03:09 +02:00
Anatol Belski ea83e504e5 fix datatype 2016-10-06 11:01:27 +02:00
Anatol Belski 46f4470e0d ensure the flag doesn't overflow 
In certain case, it could take more than just 0/1, but 2 bits should
be enough.
 2016-10-06 10:18:31 +02:00
Anatol Belski 1e986c709c handle the stream->__exposed flag correctly 
as it's a flag now, just set the value
 2016-10-06 02:15:29 +02:00
Anatol Belski 42b7912f03 catch up with stream datatypes 2016-10-05 22:53:21 +02:00
Anatol Belski 02acb056b3 uint vs. uint32_t 2016-10-05 22:53:21 +02:00
Anatol Belski 0ca15cbeba reduce size of stream struct 
32 bytes are spared on 64-bit build
 2016-10-05 22:53:21 +02:00
Anatol Belski 4b41973ba1 prevent flags overflows 
Sometimes int is overflown. That might still come out with a right
result, but is ofc not clean.
 2016-10-05 22:53:21 +02:00
Anatol Belski 41d04079e3 reduce size of stream bucket struct by 8 bytes on 64-bit 2016-10-05 22:53:21 +02:00
Nikita Popov e81a5a0d1b Merge branch 'PHP-7.1' 2016-09-28 19:20:30 +02:00
Nikita Popov 4c0804c07d Ensure symtable exists before checking it 2016-09-28 19:20:17 +02:00
Anatol Belski cb29c01ed6 prepare next 2016-09-27 12:49:52 +02:00
Anatol Belski 3529f2814d Merge branch 'PHP-7.1' 
* PHP-7.1:
  Revert "Fixed bug #73037 SoapServer reports Bad Request when gzipped"
 2016-09-23 18:48:41 +02:00
Anatol Belski 90a3671c09 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Revert "Fixed bug #73037 SoapServer reports Bad Request when gzipped"
 2016-09-23 18:48:14 +02:00
Anatol Belski 4685297f05 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Revert "Fixed bug #73037 SoapServer reports Bad Request when gzipped"
 2016-09-23 18:46:51 +02:00
Anatol Belski 075aa911ff Revert "Fixed bug #73037 SoapServer reports Bad Request when gzipped" 
This reverts commit f9a699f6c3.
 2016-09-23 18:45:03 +02:00
Anatol Belski f9a699f6c3 Fixed bug #73037 SoapServer reports Bad Request when gzipped 
(cherry picked from commit 410c68788a)
 2016-09-23 18:06:12 +02:00
Anatol Belski f59ea5d6a1 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #73037 SoapServer reports Bad Request when gzipped
 2016-09-23 16:08:09 +02:00
Anatol Belski 4b13f60278 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #73037 SoapServer reports Bad Request when gzipped
 2016-09-23 16:07:12 +02:00
Anatol Belski 410c68788a Fixed bug #73037 SoapServer reports Bad Request when gzipped 2016-09-23 16:02:50 +02:00
Xinchen Hui ac07008bb7 Fixed bug #72505 (readfile() mangles files larger than 2G) 2016-09-16 20:53:51 +08:00
Christoph M. Becker fcc6f2df59 Merge branch 'PHP-7.1' 2016-09-06 14:15:05 +02:00
Christoph M. Becker 68d3501381 Merge branch 'pull-request/2115' into PHP-7.1 2016-09-06 14:14:23 +02:00
Nikita Popov 69f0d3df60 Bump PHP_API_VERSION 2016-09-04 14:27:28 +02:00
Christoph M. Becker 727b422ad9 Fix #72948: Uncatchable "Catchable" fatal error for class to string conversions 
E_RECOVERABLE errors are reported as "Catchable fatal error". This is
misleading, because they actually can't be caught via try-catch statements.
Therefore we change the wording to "Recoverable fatal error" as suggested by
Nikita.
 2016-09-03 13:05:37 +02:00
Ferenc Kovacs fbb81dd755 5.6.27 will be next 2016-09-01 20:27:19 +02:00
Anatol Belski bc7460260b prepare for next 2016-08-30 14:11:22 +02:00
Nikita Popov 6416312f9b Merge branch 'PHP-7.1' 2016-08-19 00:34:38 +02:00
Nikita Popov 37b0dcc8e0 Decouple DEBUG_FILE_UPLOAD from ZEND_DEBUG 
Enabling ZEND_DEBUG should not result in intrusive program
behavior changes.
 2016-08-19 00:34:13 +02:00
Xinchen Hui 660d8f1622 Merge branch 'PHP-7.1' 
* PHP-7.1: (49 commits)
  Update NEWs
  Update NEWs
  Unused label
  Fixed bug #72853 (stream_set_blocking doesn't work)
  fix test
  Bug #72663 - part 3
  Bug #72663 - part 2
  Bug #72663 - part 1
  Update NEWS
  BLock test with memory leak
  fix tests
  Fix TSRM build
  Fix bug #72850 - integer overflow in uuencode
  Fixed bug #72849 - integer overflow in urlencode
  Fix bug #72848 - integer overflow in quoted_printable_encode caused heap corruption
  Fix bug #72838 - 	Integer overflow lead to heap corruption in sql_regcase
  Fix bug #72837 - integer overflow in bzdecompress caused heap corruption
  Fix bug #72836 - integer overflow in base64_decode caused heap corruption
  Fix for bug #72807 - do not produce strings with negative length
  Fix for bug #72790 and bug #72799
  ...
 2016-08-17 17:15:11 +08:00
Xinchen Hui ce6ad9bdd9 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0: (48 commits)
  Update NEWs
  Unused label
  Fixed bug #72853 (stream_set_blocking doesn't work)
  fix test
  Bug #72663 - part 3
  Bug #72663 - part 2
  Bug #72663 - part 1
  Update NEWS
  BLock test with memory leak
  fix tests
  Fix TSRM build
  Fix bug #72850 - integer overflow in uuencode
  Fixed bug #72849 - integer overflow in urlencode
  Fix bug #72848 - integer overflow in quoted_printable_encode caused heap corruption
  Fix bug #72838 - 	Integer overflow lead to heap corruption in sql_regcase
  Fix bug #72837 - integer overflow in bzdecompress caused heap corruption
  Fix bug #72836 - integer overflow in base64_decode caused heap corruption
  Fix for bug #72807 - do not produce strings with negative length
  Fix for bug #72790 and bug #72799
  Fix bug #72730 - imagegammacorrect allows arbitrary write access
  ...

Conflicts:
	ext/standard/var_unserializer.c
 2016-08-17 17:14:30 +08:00
Xinchen Hui 3956deb1b2 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed bug #72853 (stream_set_blocking doesn't work)

Conflicts:
	main/streams/plain_wrapper.c
 2016-08-17 16:56:02 +08:00
Xinchen Hui abe00908af Fixed bug #72853 (stream_set_blocking doesn't work) 
Implemented  PHP_STREAM_OPTION_META_DATA_API for plain_wrappers
 2016-08-17 16:54:21 +08:00
Stanislav Malyshev 75d7666968 Merge branch 'PHP-7.0.10' into PHP-7.0 
* PHP-7.0.10:
  Fix bug #72749: wddx_deserialize allows illegal memory access
  Fixed bug #72627: Memory Leakage In exif_process_IFD_in_TIFF
  fix tests
  Fix bug#72697 - select_colors write out-of-bounds
  Fix bug #72708 - php_snmp_parse_oid integer overflow in memory allocation
  Fix bug #72730 - imagegammacorrect allows arbitrary write access
  Fix bug #72750: wddx_deserialize null dereference
  Fix bug #72771: ftps:// opendir wrapper is vulnerable to protocol downgrade attack
  fix tests
  add missing skipif section
  Fix for bug #72790 and bug #72799
  Fix bug #72837 - integer overflow in bzdecompress caused heap corruption
  Fix bug #72742 - memory allocator fails to realloc small block to large one
  Use size_t for path length
  Check for string overflow
  Fix for bug #72782: mcrypt accepts only ints, so don't pass anything else
  Fix bug #72674 - check both curl_escape and curl_unescape
 2016-08-16 23:52:22 -07:00
Anatol Belski 8666d185cd Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix test
  fix blocking pipe stream option value
 2016-08-17 00:59:25 +02:00
Anatol Belski abc7d1f140 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix test
  fix blocking pipe stream option value
 2016-08-17 00:58:54 +02:00
Anatol Belski 6de67244d4 fix blocking pipe stream option value 
As revealed by #72857, this value conflicts with the xport option.
Wrong code can otherwise cause streams misbehave, fe if local and
network streams APIs are mixed.
 2016-08-17 00:53:15 +02:00
Stanislav Malyshev 6304a611cd Use size_t for path length 2016-08-10 23:46:58 -07:00