1
0
mirror of https://github.com/php/php-src.git synced 2026-04-23 16:08:35 +02:00
Commit Graph

48 Commits

Author SHA1 Message Date
Gabriel Caruso b895690dfa remove support for string|unicode in tests 2018-02-22 08:11:30 +01:00
Gabriel Caruso ded3d984c6 Use EXPECT instead of EXPECTF when possible
EXPECTF logic in run-tests.php is considerable, so let's avoid it.
2018-02-20 21:53:48 +01:00
Gabriel Caruso 21e3b0c70c Remove trailing whitespace in inc files 2018-02-10 19:20:23 +01:00
Dmitry Stogov 2f3c0b327f Fixed tests 2018-02-06 15:36:31 +03:00
Gabriel Caruso ce1d69a1f6 Use int instead of integer in type errors
PHP requires integer typehints to be written "int" and does not
allow "integer" as an alias. This changes type error messages to
match the actual type name and avoids confusing messages like
"must be of the type integer, integer given".
2018-02-04 19:08:23 +01:00
Gabriel Caruso 53dbc69a8d Use %d when expecting line number in tests 2018-02-02 22:35:13 +01:00
Nikita Popov 5af586bec5 Remove more PHP 6 leftovers from tests 2016-11-24 22:39:39 +01:00
Stanislav Malyshev b00f8f2a5b Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  fix #72519, possible OOB using imagegif
  fix #72512, invalid read or write for palette image when invalid transparent index is used
  Apparently some envs miss SIZE_MAX
  Fix tests
  Fix bug #72618: NULL Pointer Dereference in exif_process_user_comment
  Partial fix for bug #72613 - do not treat negative returns from bz2 as size_t
  Fix bug #72606: heap-buffer-overflow (write) simplestring_addn simplestring.c
  Fix for bug #72558, Integer overflow error within _gdContributionsAlloc()
  Fix bug #72603: Out of bound read in exif_process_IFD_in_MAKERNOTE
  Fix bug #72562 - destroy var_hash properly
  Fix bug #72533 (locale_accept_from_http out-of-bounds access)
  Fix fir bug #72520
  Fix for bug #72513
  Fix for bug #72513
  CS fix and comments with bug ID
  Fix for HTTP_PROXY issue.
  5.6.24RC1
  add tests for bug #72512
  Fixed bug #72512 gdImageTrueColorToPaletteBody allows arbitrary write/read access
  Fixed bug #72479 - same as #72434

Conflicts:
	Zend/zend_virtual_cwd.c
	ext/bz2/bz2.c
	ext/exif/exif.c
	ext/session/session.c
	ext/snmp/snmp.c
	ext/standard/basic_functions.c
	main/SAPI.c
	main/php_variables.c
2016-07-19 01:39:28 -07:00
Stanislav Malyshev 4d0565b5ba Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix #72519, possible OOB using imagegif
  fix #72512, invalid read or write for palette image when invalid transparent index is used
  Apparently some envs miss SIZE_MAX
  Fix tests
  Fix bug #72618: NULL Pointer Dereference in exif_process_user_comment
  Partial fix for bug #72613 - do not treat negative returns from bz2 as size_t
  Fix bug #72606: heap-buffer-overflow (write) simplestring_addn simplestring.c
  Fix for bug #72558, Integer overflow error within _gdContributionsAlloc()
  Fix bug #72603: Out of bound read in exif_process_IFD_in_MAKERNOTE
  Fix bug #72562 - destroy var_hash properly
  Fix bug #72533 (locale_accept_from_http out-of-bounds access)
  Fix fir bug #72520
  Fix for bug #72513
  CS fix and comments with bug ID
  Fix for HTTP_PROXY issue.
  add tests for bug #72512
  Fixed bug #72512 gdImageTrueColorToPaletteBody allows arbitrary write/read access
  Fixed bug #72479 - same as #72434

Conflicts:
	ext/bz2/bz2.c
	main/SAPI.c
	main/php_variables.c
2016-07-19 00:53:08 -07:00
Stanislav Malyshev cab1c3b370 Fixed bug #72479 - same as #72434 2016-06-26 18:02:58 -07:00
Stanislav Malyshev 6a4803026d Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Remove wrong argument $session from SNMP::setSecurity()
  Fix SNMP::setSecurity() arginfo (Fixes bug #70476)
2015-10-18 14:51:13 -07:00
jubianchi 718445b096 Remove wrong argument $session from SNMP::setSecurity() 2015-10-18 14:48:39 -07:00
jubianchi 39a2514643 Fix SNMP::setSecurity() arginfo (Fixes bug #70476) 2015-10-18 14:48:25 -07:00
Dmitry Stogov 91588a98be Fixed test (system error messages may be different). 2015-10-07 03:25:12 +03:00
Aaron Piotrowski 64b167d201 Updated tests to reflect exception class changes. 2015-05-16 16:49:14 -05:00
Dmitry Stogov 1cfc9db0d6 Fixed test 2015-04-06 22:07:18 +03:00
Andrea Faulds e5eb9530ab Use "float" and "integer" in typehint and zpp errors 2014-12-21 13:23:02 +00:00
Boris Lytochkin 7457867ba8 fix typo in test 2013-06-16 00:09:18 +04:00
Boris Lytochkin 8c3b8f39aa remove OS-specific OIDs from
'WALK multiple on single OID with OID suffix as keys' test part
2013-05-04 00:04:52 +04:00
Boris Lytochkin c34274acb8 re-work walkaround for net-snmp BUGid 2027834, no need to detect it anymore
add test for Bug #64159
bump default buffer size for values(32->512): do not reallocate buffers in 99% cases
2013-05-03 23:06:34 +04:00
Boris Lytochkin 85d9d85ce2 more test coverage: missing square bracket error message 2013-03-17 20:40:15 +04:00
Boris Lytochkin b32405053f Fix bug #61981 2013-03-17 20:00:37 +04:00
Boris Lytochkin ed6763420c fix bug #64124 (IPv6 malformed)
hostname returned from zend_parse_parameters() was modified in
netsnmp_session_init() that caused imput parameter modification along with
unpredictable changes when parameter is a constant sctring.

One typo in comment was fixed.
2013-02-07 14:48:28 +04:00
Boris Lytochkin 4c414c12a3 merge from trunk:
Fixed bug #60585 (php build fails with USE flag snmp when IPv6 support is disabled
Fixed bug #60749 (SNMP module should not strip non-standard SNMP port from hostname
2012-01-13 18:46:56 +00:00
Felipe Pena f6408176f6 - Fix test 2011-09-10 13:02:00 +00:00
Boris Lytochkin bc3d5d668f merge from trunk
added SNMPException class, enabling ability to throw exceptions
when a known SNMP error has occured
FR #55542
2011-09-02 10:13:30 +00:00
Boris Lytochkin d38cb4aa1e test coverage for SNMP::ERRNO_MULTIPLE_SET_QUERIES 2011-08-31 19:45:45 +00:00
Boris Lytochkin 3aa6f31abd more tuning based on discussion in FR #40816:
* parse all OIDs earlier, detect all wrong OIDs before any query
   is made (GET-operations)
 * introduce ERRNO_MULTIPLE_SET_QUERIES:
    warn if request contains more OIDs than max_oids and SET operation
    (and type&value checks) will be done in chunks.
fix set method when request contains more OIDs than max_oids (2nd and
 subsequent chunk were ignored)
2011-08-31 08:36:22 +00:00
Boris Lytochkin d28ae7654d merge from trunk:
export ERRNO_OID_PARSING_ERROR constant:
raise it evry time OID parsing has failed
2011-08-27 08:29:19 +00:00
Boris Lytochkin 4f1005035a merge from trunk:
reformat OID parsing procedure,
fail whole SNMP query on single OID parsing failure
2011-08-27 07:33:27 +00:00
Boris Lytochkin d7d90c403f tune test's README more per FR #55474 2011-08-25 06:00:11 +00:00
Boris Lytochkin 1cd8b8c80b apply docs fixes suggested in BR #55474 2011-08-23 19:15:58 +00:00
Boris Lytochkin cbcf729a30 merge from trunk two commits:
Adding IPv6 support (FR #42918)
more code coverage
2011-08-20 16:10:48 +00:00
Boris Lytochkin 02bf16db03 s/noOIDIncreasingCheck/oid_increasing_check/ 2011-07-21 12:48:47 +00:00
Boris Lytochkin 85edf25143 new propery noOIDIncreasingCheck allowing to skip
OID increasing check (userful for bogus SNMP agents)
2011-07-17 19:47:24 +00:00
Boris Lytochkin 06c20347ae swap non_repeaters and max_repetitions in walk query, max_repetitions whould be used more frequently 2011-07-17 18:14:38 +00:00
Boris Lytochkin cf7724d5a3 fix FR #54502: allow user to change OID value output mode when SNMP_VALUE_OBJECT is used. 2011-07-17 17:18:31 +00:00
Boris Lytochkin 2b8026cfff merging from trunk (r312088...r312092):
move SNMP VERSION constants into SNMP class itself
fix typo in comment
no more method open
fix method names in header
2011-06-12 12:10:01 +00:00
Boris Lytochkin dbed284039 fixed typos in tests
ucd-snmp epoch is over, drop legacy memory allocation (non e*)
tune 'buggy snmp_snprint_value' detection on some systems
2011-05-10 20:04:26 +00:00
Boris Lytochkin 97930e9170 method renaming:
SNMP::get_errno() -> SNMP::getErrno()
SNMP::get_error() -> SNMP::getError()
2011-05-10 11:48:10 +00:00
Boris Lytochkin ee0d7f3207 * new option for SNMP::get: force keys of return array be as in request array
* new option for SNMP::walk: use suffix of OID for keys in return array, not full OID
2011-05-08 13:58:37 +00:00
Boris Lytochkin 14eaa5ac58 follow CS:
- method set_security should be named as setSecurity
 - SNMP_VERSION_2C constant
2011-03-20 20:07:33 +00:00
Boris Lytochkin 8e600b817e * tune snmp2_walk.phpt
* more net-snmp v5.3 compatibility (OPAQUE_SPECIAL_TYPES)
2011-03-04 19:23:25 +00:00
Boris Lytochkin 3c0f1d5b95 * fix warning about redefining REGISTER_PDO_CLASS_CONST_LONG (damn copy'n'paste)
* tuned two unit test that failed at gcov.php.net/PHP_HEAD
2011-03-04 18:58:01 +00:00
Boris Lytochkin 1c65920819 * new methods get_errno, get_error to get errno and error string
of last SNMP-related error
* formatting markup
* some fixes in max_oids logic: NULL will set it to default value,
    do not allow non-positive user-supplied values
* unit tests for changes
2011-02-26 08:27:26 +00:00
Boris Lytochkin f69e1100ce added r/o info property with basic session info,
fix crash in _get_properties in trunk
2011-02-05 00:29:31 +00:00
Boris Lytochkin dc781e2520 - Improved SNMP extension:
. Allow ~infinite OIDs in GET/GETNEXT/SET queries. Autochunk them to max_oids
    upon request.
2011-02-01 07:45:30 +00:00
Boris Lytochkin 5e82e334dd Improved SNMP extension. FR #53594 2011-01-31 11:41:33 +00:00