clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-02 07:16:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
89,318 Commits 494 Branches 1,367 Tags 803 MiB
f8461d4aa3
Commit Graph

38338 Commits

Author SHA1 Message Date
Stanislav Malyshev
1ecd82f588 Merge branch 'PHP-5.6' 
* PHP-5.6:
  update NEWS
  Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary
  oops, no idea how this got in
  Fix bug #69248 - heap overflow vulnerability in regcomp.c
  add test for bug #68976
  add NEWS
  Fixed bug #68976 - Use After Free Vulnerability in unserialize()
  update news
  Fixed bug #69134 (Per Directory Values overrides PHP_INI_SYSTEM configuration options)
  fix tests
  Fix bug #69207 - move_uploaded_file allows nulls in path

Conflicts:
	ext/ereg/regex/regcomp.c
	ext/standard/basic_functions.c
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
	win32/registry.c
 2015-03-17 22:04:39 -07:00
Stanislav Malyshev
225cb973e5 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  update NEWS
  Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary

Conflicts:
	ext/zip/lib/zip_dirent.c
 2015-03-17 22:03:24 -07:00
Stanislav Malyshev
53eff4a369 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary
 2015-03-17 22:00:29 -07:00
Stanislav Malyshev
ef8fc4b53d Fix bug #69253 - ZIP Integer Overflow leads to writing past heap boundary 2015-03-17 21:59:56 -07:00
Xinchen Hui
205fe3ab89 Re-fix tests 2015-03-18 12:28:27 +08:00
Xinchen Hui
22b8b1d3f3 Revert "fix tests" 
This reverts commit 38e15d89d7.
 2015-03-18 12:27:13 +08:00
Xinchen Hui
e78278d878 Revert "Fixed tests" 
This reverts commit f57f1a903d.
 2015-03-18 12:26:56 +08:00
Xinchen Hui
f57f1a903d Fixed tests 2015-03-18 12:19:56 +08:00
Stanislav Malyshev
d76b293ac7 forgot to commit this one 2015-03-17 17:16:27 -07:00
Stanislav Malyshev
63c9f830b1 add test for bug #68976 2015-03-17 17:16:15 -07:00
Stanislav Malyshev
bf2f03ddb3 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #69248 - heap overflow vulnerability in regcomp.c
  add test for bug #68976
 2015-03-17 17:10:05 -07:00
Stanislav Malyshev
890b3987ab Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #69248 - heap overflow vulnerability in regcomp.c
  add test for bug #68976
 2015-03-17 17:09:47 -07:00
Stanislav Malyshev
c83dd84ad6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #69248 - heap overflow vulnerability in regcomp.c
  add test for bug #68976
 2015-03-17 17:08:13 -07:00
Stanislav Malyshev
fb04dcf6db Fix bug #69248 - heap overflow vulnerability in regcomp.c 
Merged from 70bc296560
 2015-03-17 17:04:57 -07:00
Stanislav Malyshev
8b14d3052f add test for bug #68976 2015-03-17 17:03:46 -07:00
Stanislav Malyshev
780222f97f Fixed bug #68976 - Use After Free Vulnerability in unserialize() 2015-03-17 16:31:52 -07:00
Stanislav Malyshev
38e15d89d7 fix tests 2015-03-17 16:30:57 -07:00
Stanislav Malyshev
6632684e03 Fix bug #69207 - move_uploaded_file allows nulls in path 2015-03-17 16:30:57 -07:00
Stanislav Malyshev
33a5532b66 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #68976 - Use After Free Vulnerability in unserialize()

Conflicts:
	ext/standard/var_unserializer.c
 2015-03-17 13:23:51 -07:00
Stanislav Malyshev
d5e523f52f Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #68976 - Use After Free Vulnerability in unserialize()

Conflicts:
	ext/standard/var_unserializer.c
 2015-03-17 13:22:12 -07:00
Stanislav Malyshev
646572d6d3 Fixed bug #68976 - Use After Free Vulnerability in unserialize() 2015-03-17 13:20:22 -07:00
Stanislav Malyshev
3477568b4e Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix tests
  Fix bug #69207 - move_uploaded_file allows nulls in path
 2015-03-17 12:58:00 -07:00
Stanislav Malyshev
9ba4db5e5d fix tests 2015-03-17 12:55:35 -07:00
Stanislav Malyshev
e55e40ca66 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #69207 - move_uploaded_file allows nulls in path
 2015-03-17 12:48:37 -07:00
Stanislav Malyshev
1291d6bbee Fix bug #69207 - move_uploaded_file allows nulls in path 2015-03-17 12:47:58 -07:00
julien.pons
90114a3e93 Add wifcontinued and wcontinued for pcntl 2015-03-17 10:59:58 +01:00
Danack
910a324306 Fixed indentation. Fixed comment style. Fixed commented out code. 2015-03-16 23:14:56 +00:00
Julien Pauli
4d3a3811a9 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix flaws in session module

Conflicts:
	ext/session/session.c
 2015-03-16 16:11:02 +01:00
Julien Pauli
2a50877428 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix flaws in session module
 2015-03-16 16:01:12 +01:00
Julien Pauli
4dba99c226 Fix flaws in session module 2015-03-16 16:00:46 +01:00
Dmitry Stogov
0a6ab089cd Use memcmp() instead of strncmp() 2015-03-16 15:53:54 +03:00
Anatol Belski
293d6e629d backport af2b0669 into 5.5 2015-03-16 08:32:39 +01:00
Danack
6b232643e5 Reverted change to function name and added note of why it is different from the class it is actually changing. 2015-03-15 18:03:08 +00:00
Anatol Belski
8f0dbe2355 Merge branch 'PHP-5.6' 
* PHP-5.6:
  libxml-2.9.2 compatibility
 2015-03-15 18:39:38 +01:00
Anatol Belski
af2b066911 libxml-2.9.2 compatibility 2015-03-15 18:38:50 +01:00
Danack
9803fccfbc Made UConverter throw an exception if the constructor fails. 2015-03-15 15:30:25 +00:00
Danack
d3267d0092 Fixed PDO constructor to not return null. 2015-03-15 15:03:03 +00:00
Danack
78ebf83ad3 Fixed fileinfo behaviour. 2015-03-15 14:54:49 +00:00
Danack
0922eca0c7 Made Phar throw exception on bad constructor. 2015-03-15 14:47:07 +00:00
Danack
99dae96dc0 Converted intl extension to use IntlException in constructors. 2015-03-15 13:59:48 +00:00
Anatol Belski
bbc183d88a Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix test
 2015-03-14 18:31:02 +01:00
Anatol Belski
2ac31872ac Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix test
 2015-03-14 18:30:32 +01:00
Anatol Belski
c21c8f369d fix test 2015-03-14 18:29:59 +01:00
Nikita Popov
547d387973 Merge branch 'PHP-5.6' 2015-03-14 09:18:50 +01:00
Nikita Popov
846c8059e6 Merge branch 'PHP-5.5' into PHP-5.6 2015-03-14 09:18:31 +01:00
Jeff Welch
1e51c5411e Fix #69203: FILTER_FLAG_STRIP_HIGH doesn't strip ASCII 127 2015-03-14 09:17:36 +01:00
Reeze Xia
7409fd4bf7 Fix folder mark 2015-03-14 14:06:57 +08:00
Xinchen Hui
9420a2a5b0 Merge branch 'PHP-5.6' 2015-03-14 11:32:09 +08:00
Xinchen Hui
96bb3b838c Merge branch 'PHP-5.5' into PHP-5.6 2015-03-14 11:31:53 +08:00
Xinchen Hui
5b87d52041 Fixed typo 2015-03-14 11:31:12 +08:00
Dmitry Stogov
db10b72523 Use fastcall calling convention for most critical ZE subsystems. 2015-03-13 21:10:09 +03:00
Xinchen Hui
326ac546ab Remove TSRMLS 2015-03-14 01:04:00 +08:00
Xinchen Hui
e827d1a424 Merge branch 'PHP-5.6' 
Conflicts:
	ext/spl/spl_observer.c
 2015-03-14 01:01:02 +08:00
Xinchen Hui
396bc00caa Merge branch 'PHP-5.5' into PHP-5.6 2015-03-14 00:53:32 +08:00
Xinchen Hui
ed59370f0a Little improvement, update NEWs, added test 2015-03-14 00:52:53 +08:00
Anatol Belski
92d106d26d fixed test 2015-03-13 17:33:48 +01:00
Anatol Belski
b680ccb2b0 the test shouldn't fail when unlink failed 2015-03-13 17:33:47 +01:00
Dmitry Stogov
2b42d71908 Changed HashTable layout: 
Removed HashTable->arHash (reduced memory consumption). Now hash slots may be accessed using HT_HASH() macro.
Hash slotas are allocated together with Buckets (before them) and lay in reverse order from HashTable->arData base address (see comments in Zend/zend_types.h)
Indexes in hash table and conflict resolution chains (Z_NEXT) may be stored as indeces or offsets in bytes, depending on system (32 or 64-bit).
HashTable data filelds are reordered to keep the most useful for zend_hash_find() data in the same CPU cache line.
 2015-03-13 17:13:19 +03:00
Nikita Popov
0a4a11b73a Regenerate ext/tokenizer data 2015-03-13 14:14:01 +01:00
Lior Kaplan
a4384bd3d4 s/PHP Version 5/PHP Version 7/g 
Follow up for d0cb7153
 2015-03-13 11:09:42 +02:00
Vektah
482500b455 Fix a leak 2015-03-13 15:54:30 +11:00
Xinchen Hui
d695a44a7e Revert previously commit by accident 2015-03-13 12:02:39 +08:00
Vektah
950d3d6e9b Fix bug #69227 and #65967 
This patch fixes a use (in zend_gc.c) after free (in spl_observer.c).
See https://bugs.php.net/bug.php?id=69227
 2015-03-13 15:02:05 +11:00
Wei Dai
25566c67fe Implement preg_replace_callback_array function 2015-03-13 11:52:36 +08:00
Dmitry Stogov
6289f7e52f Executor cleanup: fix GOTO and SWITCH VMs, remove aility to build additional PHP-5.0 compatible VM, hide executor implementation details. 2015-03-12 20:39:04 +03:00
Anatol Belski
41571e7fa9 improve ssl operations with possible renegotiation 2015-03-12 17:31:28 +01:00
Anatol Belski
1cf70266e7 use _set_errno where appropriate 2015-03-12 16:24:56 +01:00
Dmitry Stogov
9d71d65388 Fixed tests 2015-03-12 16:58:50 +03:00
Dmitry Stogov
8633685675 Use specialized macro for string zval creation 2015-03-12 16:53:51 +03:00
Anatol Belski
0e30c543ec upgrade to oniguruman 5.9.6 2015-03-12 13:42:36 +01:00
Anatol Belski
ff337bf52b expose oniguruma version 2015-03-12 13:28:43 +01:00
Anatol Belski
11716401bd fix possible unititialized pointer usage 2015-03-12 13:00:36 +01:00
Anatol Belski
1923c7a9b8 simplify condition 2015-03-12 10:21:43 +01:00
Anatol Belski
53b7258797 force ext/ftp to be always shared on Windows 2015-03-12 00:36:22 +01:00
Anatol Belski
2f443acad1 remove ext/openssl dependency for ext/ftp from conf 2015-03-12 00:13:01 +01:00
Anatol Belski
d2ee0840d2 don't depend on ext/openssl for ftp ssl support 
instead just link against the openssl and init manually, that's
more flexible
 2015-03-11 23:58:59 +01:00
Anatol Belski
4ee0395a4a init mbstring tsrm_ls_cache on MINIT 
as some globals are accessed there already
 2015-03-11 23:42:39 +01:00
Anatol Belski
d5f2b4b398 fix ftp_login with ssl enabled 2015-03-11 21:46:40 +01:00
Anatol Belski
f1a47988b0 added comment 2015-03-11 21:46:39 +01:00
Anatol Belski
167979fe76 enable ftps for shared ext/ftp 2015-03-11 21:46:38 +01:00
Daniel Lowrey
589374d027 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Don't block on crypto data inside stream_select()
 2015-03-11 09:45:28 -06:00
Daniel Lowrey
c661121459 Don't block on crypto data inside stream_select() 2015-03-11 09:44:07 -06:00
Nikita Popov
c532376ee7 Fix some memory leaks in WebPhar 2015-03-11 15:27:42 +01:00
Trevor Suarez
98c6567e71 Putting whitespace back to the way it was. 2015-03-11 09:29:08 -04:00
Dmitry Stogov
d68861eb4b Improved php_json_escape_string() 2015-03-11 15:03:07 +03:00
Dmitry Stogov
781d1c400c Improved table search 2015-03-11 15:02:47 +03:00
Daniel Lowrey
4a336f5d0b Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug# 69215 (Crypto servers should send client CA list)

Conflicts:
	ext/openssl/xp_ssl.c
 2015-03-10 18:18:19 -06:00
Daniel Lowrey
3f6b12795c Fix bug# 69215 (Crypto servers should send client CA list) 2015-03-10 18:13:10 -06:00
Dmitry Stogov
026b0adc50 Fixed memory leaks 2015-03-11 01:28:13 +03:00
Dmitry Stogov
48deb1cd94 Free memory if destructor wasn't called 2015-03-11 00:57:28 +03:00
Dmitry Stogov
816b196973 Fixed memory leak 2015-03-10 23:16:09 +03:00
Dmitry Stogov
5d0bacfe67 Merge branch 'PHP-5.6' 
* PHP-5.6:
  We don't cache custom strems with callbacks anymore

Conflicts:
	ext/opcache/ZendAccelerator.c
 2015-03-10 19:32:38 +03:00
Dmitry Stogov
b52a2940af Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  We don't cache custom strems with callbacks anymore
 2015-03-10 19:30:32 +03:00
Dmitry Stogov
c814b3294a We don't cache custom strems with callbacks anymore 2015-03-10 19:25:30 +03:00
Xinchen Hui
d4c1dca98c Merge branch 'master' of https://git.php.net/repository/php-src 2015-03-10 17:09:41 +08:00
Xinchen Hui
a5317e9d41 Merge branch 'PHP-5.6' 
Conflicts:
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
 2015-03-10 15:49:02 +08:00
Xinchen Hui
0584b2df3f Update NEWS 2015-03-10 15:38:34 +08:00
Dmitry Stogov
a30d328671 Errors converted to exceptions are not "recoverable" anymore. 2015-03-10 10:31:55 +03:00
Xinchen Hui
d25acb5fd0 Revert "Fixed phar file action failure after engine exception rfc been merged" 
This reverts commit f174859acd.
 2015-03-10 15:03:15 +08:00
Daniel Lowrey
c5c4d22c10 Deprecate "session_meta_capture" SSL context option 
Meta data about encrypted streams is now available as part of the
"crypto" key in the array returned by stream_get_meta_data(). This
update deprecates the use of the "session_meta_capture" ssl
context option in encrypted streams.
 2015-03-09 23:15:57 -06: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
Daniel Lowrey
676a5059b2 Add crypto info to stream_get_meta_data() result on encrypted streams 
A "crypto" key is added to the output of stream_get_meta_data() calls
when invoked using a stream on which crypto is currently active. The
new key's associated array contains the following keys:

 - protocol (string e.g. TLSv1.2, TLSv1.1, etc)
 - cipher_name (string)
 - cipher_bits (int)
 - cipher_version (string)

If the TLS ALPN extension was used to successfully negotiate an
application protocol that protocol's identifier is stored in the
following key:

 - alpn_protocol

If no ALPN protocol was negotiated the "alpn_protocol" key is not
present in the crypto meta data array. More meta information
concerning the stream's active encryption state may be added in the
future.
 2015-03-09 23:15:57 -06:00
Juan Basso
6b7b5e777f Renamed test case to match with reported bug 2015-03-10 00:01:26 -04:00
Daniel Lowrey
748433e7bc Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix crypto stream timeout regressions

Conflicts:
	ext/openssl/xp_ssl.c
 2015-03-09 16:02:04 -06:00
Daniel Lowrey
69691cc8ca Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix crypto stream timeout regressions
 2015-03-09 15:55:33 -06:00
Daniel Lowrey
bbfd4a5e62 Fix crypto stream timeout regressions 2015-03-09 15:53:26 -06:00
Reeze Xia
f174859acd Fixed phar file action failure after engine exception rfc been merged 2015-03-09 17:07:18 +00:00
Xinchen Hui
47f2e42fc9 Remove PHAR_GLOBALS (make it respect ZEND_ENABLE_STATIC_TSRMLS_CACHE) 2015-03-09 23:00:56 +08:00
Juan Basso
cbdeccd6ed Fixed serialization of non string values on __sleep 
Returning just N; (null) on the __sleep makes the number of fields/values be incomplete and corrupting the generated value from serialize, making impossible to unserialize it.
 2015-03-09 09:04:34 -04: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
Nikita Popov
a4262827ea Fix ReflectionFunction::isDeprecated() test 
We currently don't have deprecated functions ... so just switch
this to testing a non-deprecated function.
 2015-03-09 12:27:06 +01:00
Nikita Popov
7810659cc3 Removed deprecated mcrypt_ecb() etc 2015-03-09 11:37:13 +01:00
Nikita Popov
c488a45701 Remove deprecated mcrypt_generic_end() alias 2015-03-09 11:10:52 +01:00
Nikita Popov
a81e65a501 Remove xsl.security_prefs ini option 
Conflicts:
	ext/xsl/php_xsl.c
	ext/xsl/xsltprocessor.c
 2015-03-09 11:06:18 +01:00
Nikita Popov
b5184ef336 Remove unsafe curl file uploads 
The option CURLOPT_SAFE_UPLOAD still exists, but cannot be disabled.
 2015-03-09 11:00:04 +01:00
Xinchen Hui
c24afc8d8f Revert commit by mistake 2015-03-09 17:27:51 +08:00
Xinchen Hui
64bbc98dff Merge branch 'PHP-5.6' 
Conflicts:
	ext/mysqli/php_mysqli_structs.h
 2015-03-09 17:23:34 +08:00
Xinchen Hui
4ca14f681e Merge branch 'PHP-5.5' into PHP-5.6 2015-03-09 17:23:04 +08:00
Xinchen Hui
9af1383a3f Revert "Fix #63486" 
This reverts commit f4c96ffcb5.
 2015-03-09 17:22:56 +08:00
Jeff Welch
fdbdb11514 Fix #69202: FILTER_FLAG_STRIP_BACKTICK ignored unless other flags are used. 2015-03-09 17:14:47 +08:00
Jeff Welch
66a2c528fe Fix #69202: FILTER_FLAG_STRIP_BACKTICK ignored unless other flags are used. 2015-03-09 17:08:35 +08:00
Xinchen Hui
f66bef2414 Fixed build 2015-03-09 15:50:52 +08:00
Masaki Kagaya
9d81d7ff70 added missing parentheses 
added test case for bug #68846
replaced tab with space
added missing parentheses again
See also: http://icu-project.org/docs/papers/gb18030.html#h7
 2015-03-08 23:45:11 -07:00
Julien Pauli
2f06413340 Fix #67626 2015-03-08 23:45:11 -07:00
Julien Pauli
37ecfdad09 Fix #63486 2015-03-08 23:41:46 -07:00
Masaki Kagaya
934d6ed900 added missing parentheses 
added test case for bug #68846
replaced tab with space
added missing parentheses again
See also: http://icu-project.org/docs/papers/gb18030.html#h7
 2015-03-08 23:40:56 -07:00
Julien Pauli
7d47d9fe23 Fix #67626 2015-03-08 23:40:55 -07:00
Julien Pauli
7684d72df8 Fix #63486 2015-03-08 23:40:55 -07:00
Masaki Kagaya
fa72f1ea86 added missing parentheses 
added test case for bug #68846
replaced tab with space
added missing parentheses again
See also: http://icu-project.org/docs/papers/gb18030.html#h7
 2015-03-08 23:39:04 -07:00
Stanislav Malyshev
a8da0a9620 Merge branch 'pull-request/1104' into PHP-5.5 
* pull-request/1104:
  Fix #63486
 2015-03-08 23:21:53 -07:00
Stanislav Malyshev
43b426fbc4 Merge branch 'pull-request/1106' into PHP-5.5 
* pull-request/1106:
  Fix #67626
 2015-03-08 22:52:21 -07:00
Xinchen Hui
7bf082d638 Merge branch 'filter/adjust-logic' of https://github.com/whatthejeff/php-src 2015-03-09 11:43:10 +08:00
Stanislav Malyshev
33ef5c47a5 Merge branch 'pull-request/1135' 
* pull-request/1135:
  Return void like other functions
  Use zend_parse_parameters_none()
  Implemented FR #45235 A way to clear or reset the results for error_get_last()
 2015-03-08 17:26:38 -07:00
Stanislav Malyshev
a8a77fff5c Merge branch 'PHP-5.6' 
* PHP-5.6:
  Regression tests for SplFileInfo class setters
 2015-03-08 17:13:32 -07:00
Stanislav Malyshev
dcc031470a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Regression tests for SplFileInfo class setters
 2015-03-08 17:13:25 -07:00
Stanislav Malyshev
a2a20d29a8 Merge branch 'pull-request/1134' into PHP-5.5 
* pull-request/1134:
  Regression tests for SplFileInfo class setters
 2015-03-08 17:13:02 -07:00
Stanislav Malyshev
876a9be3ee Merge branch 'pull-request/1129' 
* pull-request/1129:
  Array - make krsort FAST_ZPP compatibility
 2015-03-08 17:04:13 -07:00
Jeff Welch
1dc5bd47d8 Adjust logic in sanity checks. 
The code should return false when the provided options argument is neither an
array nor a valid filter.
 2015-03-08 15:27:41 -04:00
Anatol Belski
d5558138d7 partially revert wrong merge 2015-03-08 20:05:34 +01:00
Anatol Belski
bae44417a8 after merge fix 2015-03-08 19:56:31 +01:00
Anatol Belski
12babf59c1 updated libmagic.patch 2015-03-08 19:48:05 +01:00
Anatol Belski
316b1e0267 catching up 2015-03-08 19:48:01 +01:00
Anatol Belski
3e8a5485e2 catching up 2015-03-08 19:47:59 +01:00
Anatol Belski
eeb74b0ab8 regenerated data file 2015-03-08 19:47:53 +01:00
Anatol Belski
f54cf1ec57 more after patch fixes 2015-03-08 19:47:50 +01:00
Anatol Belski
1ebe527757 restore good patch parts 2015-03-08 19:47:48 +01:00
Anatol Belski
75a1392fb5 stat is done by php 2015-03-08 19:47:42 +01:00
Anatol Belski
49dc53722b use zend_strndup 2015-03-08 19:47:41 +01:00
Anatol Belski
1b77e51ad7 started to patch for libmagic.next 
everything is broken yet
 2015-03-08 19:47:38 +01:00
Anatol Belski
332bbfa23b fix test outputs 2015-03-08 19:47:34 +01:00
Anatol Belski
9603f16f99 catch up with the previous cve-2014-3538 patch 2015-03-08 19:47:33 +01:00
Anatol Belski
f39a8517e0 catching up 2015-03-08 19:47:31 +01:00
Anatol Belski
5892ec175a catching up 2015-03-08 19:47:30 +01:00
Anatol Belski
ca98547801 catching up 2015-03-08 19:47:28 +01:00
Anatol Belski
ef51790f61 updated the test magic file 2015-03-08 19:47:27 +01:00
Anatol Belski
7022fe80f7 add patchlevel info 2015-03-08 19:47:25 +01:00
Anatol Belski
ec84d36c9f portable off_t 2015-03-08 19:47:24 +01:00
Anatol Belski
969ce2e877 regenerated data file 2015-03-08 19:47:21 +01:00
Anatol Belski
0d410fc2d2 more after patch fixes 2015-03-08 19:47:20 +01:00
Anatol Belski
1a7798c786 restore good patch parts 2015-03-08 19:47:18 +01:00
Anatol Belski
9e3be05e32 missing prototype 2015-03-08 19:47:17 +01:00
Anatol Belski
9b1bdccb04 libmagic.patch so far 2015-03-08 19:47:15 +01:00
Anatol Belski
0dd82374d1 updated test magic file 2015-03-08 19:47:14 +01:00
Anatol Belski
2fd282a690 use right memory api 2015-03-08 19:47:12 +01:00
Anatol Belski
f3fad68efd stat is done by php 2015-03-08 19:47:11 +01:00
Anatol Belski
a1883a8523 use zend_strndup 2015-03-08 19:47:09 +01:00
Anatol Belski
2181ed2e2a started to patch for libmagic.next 
everything is broken yet
 2015-03-08 19:47:06 +01:00
Reeze Xia
609f05fc19 ZTS cleanup 2015-03-08 19:25:55 +08:00
Jakub Zelenka
0cb869d908 Merge branch 'pull-request/1151' 2015-03-08 10:47:22 +00:00
Remi Collet
02808aeca3 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix odbc build as shared
 2015-03-08 07:37:07 +01:00
Remi Collet
43da0d302b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix odbc build as shared
 2015-03-08 07:36:35 +01:00
Remi Collet
89f86119d6 Fix odbc build as shared 
Broken since a41aa46759
 2015-03-08 07:34:51 +01:00
Hugo Fonseca
baece85399 Added test for bug 69187 2015-03-07 10:53:31 +00:00
Xinchen Hui
28b408a242 Fixed bug #69198 (Compact function generate array with length but no content) 2015-03-07 16:49:07 +08:00
Anatol Belski
f1d1273f2b fix fetching wrong resource 2015-03-06 21:02:29 +01:00
Daniel Lowrey
00c35cb6a5 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #69197 (openssl_pkcs7_sign handles default value incorrectly)

Conflicts:
	ext/openssl/openssl.c
 2015-03-06 11:31:04 -07:00
Daniel Lowrey
0928bad9ac Fixed bug #69197 (openssl_pkcs7_sign handles default value incorrectly) 2015-03-06 11:29:56 -07:00
Anatol Belski
be7371f9ff fix data type 2015-03-06 16:49:08 +01:00
Dmitry Stogov
53d8e5fc63 Improved hash key manangement code 2015-03-06 16:26:40 +03:00
Tjerk Meesters
1236a30746 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #68917 (parse_url fails on some partial urls)
  Update test to run locally instead of remotely
 2015-03-06 20:59:52 +08:00
Tjerk Meesters
469b5a9584 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #68917 (parse_url fails on some partial urls)
 2015-03-06 20:58:20 +08:00
Tjerk Meesters
d7fb52ea20 Fixed bug #68917 (parse_url fails on some partial urls) 2015-03-06 20:51:22 +08:00
Dmitry Stogov
4bc7ee2eb7 Fixed conditions 2015-03-06 11:00:19 +03:00
Dmitry Stogov
8308e617f1 Revert "Fix logical-op-parentheses warning" 
This reverts commit b7408234b9.
 2015-03-06 10:56:19 +03:00
Daniel Lowrey
eef261f0e4 Update test to run locally instead of remotely 2015-03-05 22:01:15 -07:00
Daniel Lowrey
e82878a200 Update test to run locally instead of remotely 2015-03-05 22:00:38 -07:00
Reeze Xia
b7408234b9 Fix logical-op-parentheses warning 
What a condition ;-)
 2015-03-06 12:20:01 +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
Dmitry Stogov
28e42b1ded Improved hash key manangement code 2015-03-06 02:13:47 +03:00
Daniel Lowrey
ca24d19a89 Really fix zts this time 2015-03-05 14:09:25 -07:00
Daniel Lowrey
927b137c1b Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix ZTS
  Fix ZTS build

Conflicts:
	ext/openssl/openssl.c
	ext/openssl/xp_ssl.c
 2015-03-05 12:24:04 -07:00
Daniel Lowrey
c985ec737d Fix ZTS 2015-03-05 12:19:15 -07:00
Daniel Lowrey
010f17534f Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix ZTS build
 2015-03-05 12:13:33 -07:00
Daniel Lowrey
e892f5382f Fix ZTS build 2015-03-05 12:12:55 -07:00
Adam Harvey
7fa1009560 Like Shady, --with-mysql-sock is back. 
As Matteo pointed out, MySQLi and PDO_MySQL both rely on this.
 2015-03-05 19:00:02 +00:00
Daniel Lowrey
c34ee4b146 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #67403 (Add signatureType to openssl_x509_parse)
  5.5.24 now

Conflicts:
	ext/openssl/openssl.c
 2015-03-05 10:27:11 -07:00
Daniel Lowrey
5939de35a8 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #67403 (Add signatureType to openssl_x509_parse)
  5.5.24 now

Conflicts:
	configure.in
	main/php_version.h
 2015-03-05 10:21:32 -07:00
Daniel Lowrey
94140afa69 Fix bug #67403 (Add signatureType to openssl_x509_parse) 2015-03-05 10:09:06 -07:00
Dmitry Stogov
6d065a8545 Avoid repeatable strlen() calls 2015-03-05 18:18:39 +03:00
Trevor Suarez
1de1b6f927 Updating the DateTime_verify test to include the 
new method in the reflected method list
 2015-03-05 09:50:32 -05:00
Dmitry Stogov
bb91bf83f9 Minimize copying of HashTable realocation 2015-03-05 17:22:10 +03:00
Dmitry Stogov
8e3643a8fc Avoid useless op_array duplication 2015-03-05 14:23:48 +03:00
Anatol Belski
45fb8b517c fix incompatible pointer 2015-03-05 12:01:27 +01:00
Rasmus Lerdorf
eaa1b3e614 This test fails with multibyte on because it spews 
a conversion error on the bogus file
 2015-03-05 00:45:42 -08:00
Rasmus Lerdorf
d7810cc0fa This test fails with multibyte on because it spews 
a conversion error on the bogus file
 2015-03-05 00:44:47 -08:00
Trevor Suarez
d3863aeaf7 Whoops! String length.... 2015-03-05 02:57:14 -05:00
Trevor Suarez
46f22acdcd Adding a new test for the new method 2015-03-05 02:02:50 -05:00
Trevor Suarez
42660f3d6a Adding a new createFromImmutable method to the 
`DateTime` class to mirror the current `DateTime::createFromMutable()`
 2015-03-05 01:58:09 -05:00
Daniel Lowrey
73de105481 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #68265 (SAN match fails with trailing DNS dot)
 2015-03-04 23:56:36 -07:00
Daniel Lowrey
65a9a5ca12 Fixed bug #68265 (SAN match fails with trailing DNS dot) 2015-03-04 23:55:42 -07:00
Daniel Lowrey
fe29b8134c Merge branch 'PHP-5.6' 
* PHP-5.6:
  hexadecimal is case*in*sensitive

Conflicts:
	ext/openssl/xp_ssl.c
 2015-03-04 23:00:59 -07:00
Daniel Lowrey
1de1ff75f5 Merge branch 'PHP-5.6' of https://github.com/bjori/php-src into PHP-5.6 
* 'PHP-5.6' of https://github.com/bjori/php-src:
  hexadecimal is case*in*sensitive
 2015-03-04 22:55:22 -07:00
Daniel Lowrey
94a70b98a6 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #68879 (IP Address fields in subjectAltNames not used)
  Fix broken test

Conflicts:
	ext/openssl/xp_ssl.c
 2015-03-04 22:42:25 -07:00
Daniel Lowrey
5dcace058a Fixed bug #68879 (IP Address fields in subjectAltNames not used) 2015-03-04 22:39:25 -07:00
Daniel Lowrey
ca766e0787 Fix broken test 2015-03-04 22:37:07 -07:00
Xinchen Hui
792630bc50 Use strpprintf 2015-03-05 12:40:09 +08:00
Adam Harvey
592b2545b2 Merge branch 'master' into HEAD 2015-03-05 01:07:36 +00:00
Adam Harvey
10c471a60b Use a deprecated function that still exists. 2015-03-05 00:51:05 +00:00
Adam Harvey
3253168cde Remove unnecessary debug warning (that also broke tests). 2015-03-05 00:33:20 +00:00
Adam Harvey
d8b2012ab0 Explicitly depend opcache on pcre. 2015-03-05 00:27:36 +00:00
Adam Harvey
fea9a6fc77 Merge remote-tracking branch 'datibbaw/kill-ereg' 
Conflicts:
	ext/ereg/config.w32
	ext/ereg/config0.m4
	ext/ereg/ereg.c
	ext/ereg/php_ereg.h
	ext/ereg/php_regex.h
	ext/ereg/regex/engine.c
	ext/ereg/regex/main.c
	ext/ereg/regex/regcomp.c
	ext/ereg/regex/regerror.c
	ext/ereg/tests/split_error_002.phpt
	ext/ereg/tests/split_variation_003.phpt
	ext/ereg/tests/spliti_error_002.phpt
	ext/ereg/tests/spliti_variation_003.phpt
	ext/pgsql/pgsql.c
	sapi/apache/php_apache_http.h
	sapi/apache_hooks/php_apache_http.h
 2015-03-05 00:21:38 +00:00
Adam Harvey
fd1578c196 Remove the deprecated MySQL extension. 
Relevant RFC: https://wiki.php.net/rfc/remove_deprecated_functionality_in_php7
 2015-03-05 00:18:40 +00:00
Hannes Magnusson
3c2c029bfd hexadecimal is case*in*sensitive 2015-03-04 16:03:45 -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
Daniel Lowrey
5de64a29e6 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed bug #68920 (use strict peer_fingerprint input checks)

Conflicts:
	ext/openssl/xp_ssl.c
 2015-03-04 12:50:35 -07:00
Daniel Lowrey
241f3c34b8 Fixed bug #68920 (use strict peer_fingerprint input checks) 2015-03-04 12:47:46 -07:00
Daniel Lowrey
8680fc8331 Improve test to target specific issue 2015-03-04 10:23:46 -05:00
Dmitry Stogov
8ec8648c91 Improved code for class property inheritance 2015-03-04 17:41:01 +03:00
Daniel Lowrey
a39b1898fe Misc updates/cleanup 2015-03-04 09:24:27 -05:00
Xinchen Hui
ec00a4de4e Merge branch 'PHP-5.6' 2015-03-04 14:49:03 +08:00
Xinchen Hui
a29b64fc10 Fixed bug #69159 (Opcache causes problem when passing a variable variable to a function) 2015-03-04 14:48:41 +08:00
Xinchen Hui
fffd173b7a indent 2015-03-04 12:10:23 +08:00
Xinchen Hui
a6ba7966de Fixed memleak 2015-03-04 12:08:54 +08:00
Xinchen Hui
abfdf3bf52 Merge branch 'fix-compile-error' of https://github.com/zxcvdavid/php-src 2015-03-04 11:39:53 +08:00
Xinchen Hui
c7b7cc4c16 Fixed build 2015-03-04 10:49:55 +08:00
zxcvdavid
a4a85887e0 Fix compile error 2015-03-04 09:56:50 +08:00
zxcvdavid
f1de275e74 Remove the unused vars 2015-03-04 09:52:09 +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
Anatol Belski
3483cc2cf6 ensure there is no connection 2015-03-03 17:19:16 +01:00
Anatol Belski
dcb944b352 avoid skipif as this indeed should be tested 
plus do expect regex .*
 2015-03-03 17:19:14 +01:00
Xinchen Hui
4ccbb1ed33 Merge branch 'PHP-5.6' 2015-03-03 23:17:49 +08:00
Xinchen Hui
6183408031 Merge branch 'PHP-5.5' into PHP-5.6 2015-03-03 23:17:37 +08:00
nathan r. hruby
837eeefee9 Make killing a locker an ERROR event 
At least in apache, killing a locker with SIGKILL from inside opcache prevents
the child process from emitting a corresponding log event to the access or
error logs, therefore requests are termed with no record.  This makes is
incredibly difficult to debug problems espically on systems with high counts
of cache restarts.  Since INFO level is far too noisy for production use,
switch the killing to a higher level so we can see it easier.
 2015-03-03 23:16:45 +08:00
Reeze Xia
916709cf85 Return void like other functions 2015-03-03 19:13:51 +08:00
Reeze Xia
c6cebca1e3 Use zend_parse_parameters_none() 2015-03-03 18:49:49 +08:00
Reeze Xia
bc28ed6788 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  Remove wrong commit committed by accident
  Fixed bug #69167 (call_user_func does not support references anymore)
  Fixed #69166 (Assigning array_values() to array does not reset key counter)
 2015-03-03 18:38:28 +08:00
Reeze Xia
f97251adec Add missing zend_parse_parameters_none() for flush() 2015-03-03 18:37:47 +08:00