mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-29 04:46:07 +08:00
Code Issues Packages Projects Releases Wiki Activity
89,918 Commits 500 Branches 1,381 Tags 818 MiB
c734587303
Commit Graph

4432 Commits

Author SHA1 Message Date
Nikita Popov
40e465e357 Clean up some type conversions 
While at it also fix some type checks in iconv and drop dead and
unported code in standard/filters.
 2015-04-27 18:50:08 +02:00
Di Wu
c7492ed224 Fix undeclared identifier 'PHP_STREAM_KEEP_RSRC' 
Identifier named `PHP_STREAM_FREE_KEEP_RSRC`  but use `PHP_STREAM_KEEP_RSRC`

Reference Line 131
 2015-04-09 18:16:53 +02:00
Dmitry Stogov
4d9a1883aa Fixed bug #68887 (resources are not freed correctly) 2015-04-08 13:29:42 +03:00
Dmitry Stogov
b8ba3203e5 Cleanup 2015-04-07 14:19:12 +03:00
Kalle Sommer Nielsen
a5a7db8a6a Fix build 2015-04-04 22:11:37 +02:00
Kalle Sommer Nielsen
118a2fa8d9 This part here was moved to the EG constructor by Anatol in f51a9c71dd 2015-04-04 22:04:32 +02:00
Anatol Belski
69c2e53419 no more winxp, but really 2015-04-04 20:39:04 +02:00
Kalle Sommer Nielsen
298a0554a7 This check here is not needed anymore for Windows (Unsupported Windows version check) 2015-03-30 04:13:43 +02:00
Kalle Sommer Nielsen
c48611772d Remove the special disabled functions on Windows, since we don't even support those versions of Windows anymore hence it makes no sense to even check for it 2015-03-29 09:41:47 +02:00
Kalle Sommer Nielsen
a141ccb4ff Another minor cleanup, drop ENFORCE_SAFE_MODE (all except pdo_pgsql have #if's for checking already) 2015-03-29 09:34:05 +02:00
Kalle Sommer Nielsen
a75e8d1fe6 Drop this VC8+ check, since our bare minimum of required VC version is higher anyway, meaning that CRT warnings are always supported. 2015-03-29 06:45:40 +02:00
Kalle Sommer Nielsen
8153286efe Drop zend_indent() as it was never used, complete or working 2015-03-27 20:04:46 +01:00
Michael Wallner
0ae011f3a7 RFC:continue_ob accepted 2015-03-25 15:22:49 +01:00
Remi Collet
2fe6acd8f5 expose destroy_uploaded_files_hash in the API (used by apfd extension) 2015-03-25 14:33:47 +01:00
Anatol Belski
1a00554aaf fix datatype mismatches 2015-03-24 22:02:31 +01:00
Anatol Belski
3066851dab fix datatype mismatches 2015-03-24 22:02:29 +01:00
Dmitry Stogov
d146d15003 Optimize zend_string_realloc() add more specialized versions zend_string_extend() and zend_string_truncate() 2015-03-20 02:02:42 +03:00
Anatol Belski
184793b5c1 fix condition 2015-03-19 22:33:16 +01:00
Anatol Belski
9bcd64fd83 fix condition 2015-03-19 22:33:15 +01:00
Anatol Belski
f43cc2a19a use portable fseek 2015-03-11 21:46:37 +01:00
Xinchen Hui
56eed39e04 Fixed phar test segfault after merged engine exception 2015-03-10 15:04:01 +08:00
Daniel Lowrey
2dec21634c Revert "Add stream_socket_crypto_info() function" 
This reverts commit 13acb7ec65.

With the added capability to negotiate application layer protocols
via the TLS ALPN extension userland needs a method to access the
negotiated protocol on a given stream. The reverted commit added
a new stream_socket_crypto_info() function for this purpose.

This original approach was discarded in favor of using the
already-existing stream_get_meta_data() API which specifically
exists for just such purposes and requires the addition of no new
functions.
 2015-03-09 23:15:57 -06:00
Nikita Popov
b0055678bf Fix CLI test and drop some now unnecessary code 2015-03-09 14:09:34 +01:00
Dmitry Stogov
1c94ff0595 Implement engine exceptions 
RFC: https://wiki.php.net/rfc/engine_exceptions_for_php7

Pending changes regarding naming of BaseException and whether it
should be an interface.
 2015-03-09 14:01:32 +01:00
Wei Dai
22a61cea33 Fixed build 2015-03-09 15:21:08 +08:00
Julien Pauli
2f06413340 Fix #67626 2015-03-08 23:45:11 -07:00
Reeze Xia
609f05fc19 ZTS cleanup 2015-03-08 19:25:55 +08:00
Daniel Lowrey
3e0a1a71e9 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug (#69195 Inconsistent stream crypto values across versions)

Conflicts:
	ext/standard/http_fopen_wrapper.c
 2015-03-05 21:18:09 -07:00
Daniel Lowrey
10bc5fd4c4 Fixed bug (#69195 Inconsistent stream crypto values across versions) 
PHP 5.6.0 altered the semantics of the following constants:

- STREAM_CRYPTO_METHOD_SSLv23_CLIENT
- STREAM_CRYPTO_METHOD_SSLv23_SERVER
- STREAM_CRYPTO_METHOD_TLS_CLIENT
- STREAM_CRYPTO_METHOD_TLS_SERVER

Instead of representing the SSLv23_*() handshake methods the v23
constants were changed to allow only SSLv2 or SSLv3 connections.
Likewise, the TLS methods were modified from using only the TLSv1
handshake to allowing TLS1,1.1, and 1.2. This created a situation
in which users upgrading from previous versions faced a potential
security degradation if they did not update code to use different
constants. In the interest of compatibility across PHP versions
the original semantics have been restored with the following
caveat:

**IMPORTANT**

The SSLv23 client/server methods will no longer negotiate the use
of the insecure SSLv2 or SSLv3 protocols by default. Users wishing
to allow these protocols must explicitly add them to the method
bitmask via the appropriate flags.
 2015-03-05 21:09:39 -07:00
Daniel Lowrey
88cfc6ccb6 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix stream_select() issue with OpenSSL buffer

Conflicts:
	main/streams/streams.c
 2015-03-05 17:53:04 -07:00
Chris Wright
e7df9d710c Fix stream_select() issue with OpenSSL buffer 
Ensure data from OpenSSL internal buffer has been
transfered to PHP stream buffer before a select()
emulation operation is performed

Addresses bug #65137
https://bugs.php.net/bug.php?id=65137

Conflicts:
	ext/openssl/xp_ssl.c
 2015-03-05 17:18:14 -07:00
Ferenc Kovacs
d4d05c8919 5.6.8 up next 2015-03-05 19:07:23 +01:00
Dmitry Stogov
6d065a8545 Avoid repeatable strlen() calls 2015-03-05 18:18:39 +03:00
Xinchen Hui
fd5a756ad4 Revive Zend Signals handler (and fixed bug #61083) 2015-03-05 18:11:22 +08:00
Reeze Xia
c498cc7407 Merge branch 'pull-request/1142' 
* pull-request/1142:
  Fixed wrong parameter type of php_stream_mmap_range()
 2015-03-05 17:05:21 +08:00
Daniel Lowrey
b5d97140c0 Merge branch 'tls-alpn' 
* tls-alpn:
  Improve test to target specific issue
  Misc updates/cleanup
  Add TLS ALPN extension support in crypto client/server streams
  Add stream_socket_crypto_info() function
  Update for compatibility with newer openssl libs
 2015-03-04 13:56:58 -07:00
Reeze Xia
2dac92b244 Silence a empty while loop warning 2015-03-04 11:34:53 +08:00
Reeze Xia
98766e6375 Fixed wrong parameter type of php_stream_mmap_range() 
There are several warings about this.
The mode type should be php_stream_mmap_access_t but not php_stream_mmap_operate_t
 2015-03-04 11:28:14 +08:00
Dmitry Stogov
2fa8d67a5c Use zend_string* instead of char* for opened_patch handling. Avoid reallocations and improve string reuse. 2015-03-04 02:05:28 +03:00
Reeze Xia
bb2e62ecda Merge branch 'PHP-5.6' 
* PHP-5.6:
  Improve fix for bug 67741

Conflicts:
	main/main.c
 2015-03-03 16:29:41 +08:00
Reeze Xia
6cb3b941df Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Improve fix for bug 67741
  Added type checks
  Added type checks
 2015-03-03 16:27:35 +08:00
Reeze Xia
860fc3947f Improve fix for bug 67741 
Thanks to laruence.
 2015-03-03 16:25:43 +08:00
Reeze Xia
c6e415aeb2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #67741 (auto_prepend_file messes up __LINE__)

Conflicts:
	main/main.c
 2015-03-03 11:44:52 +08:00
Reeze Xia
4e2c87edb3 Fixed bug #67741 (auto_prepend_file messes up __LINE__) 
This also fixes bug #54081
 2015-03-03 11:43:23 +08:00
Reeze Xia
34f09b6240 Fixed bug #67741 (auto_prepend_file messes up __LINE__) 
This also fixes bug #54081
 2015-03-03 11:25:30 +08:00
Daniel Lowrey
13acb7ec65 Add stream_socket_crypto_info() function 2015-02-28 17:41:29 -05:00
Xinchen Hui
8f5676f73e Merge branch 'PHP-5.6' 2015-02-27 12:03:04 +08:00
Xinchen Hui
578903578c Merge branch 'PHP-5.5' into PHP-5.6 2015-02-27 12:03:00 +08:00
Xinchen Hui
4eb830b212 Reorder 2015-02-27 12:02:42 +08:00
Xinchen Hui
b0e95e1e35 Merge branch 'PHP-5.6' 2015-02-27 12:01:40 +08:00