clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 02:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
100,188 Commits 491 Branches 1,363 Tags 841 MiB
bfb9be9bd4
Commit Graph

268 Commits

Author SHA1 Message Date
Anatol Belski
68a73ce3c4 fixed parameter order for zend_throw_exception_ex call 2013-12-14 20:43:02 +01:00
Christopher Jones
39612afc72 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.

Conflicts:
	ext/dba/libinifile/inifile.c
 2013-08-14 20:43:25 -07:00
Christopher Jones
9ad97cd489 Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings. 2013-08-14 20:36:50 -07:00
Stanislav Malyshev
02e4d7a290 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:30:59 -07:00
Stanislav Malyshev
ac40c0b562 Merge branch 'pull-request/341' 
* pull-request/341: (23 commits)
  typofixes
 2013-06-10 14:20:18 -07:00
Boris Lytochkin
eff60f993c Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  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:10:11 +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
1c8befe893 cut PHP_VERSION_ID - we know API version now 2013-05-03 19:22:21 +04:00
Boris Lytochkin
c68f9d5503 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #64159 (Truncated snmpget)
 2013-05-03 15:39:57 +04:00
Boris Lytochkin
e36adfe94a Fixed bug #64159 (Truncated snmpget) 2013-05-03 15:35:09 +04:00
Boris Lytochkin
1ce836580d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  update NEWS
  Fix bug #64765 (enclose IPv6 address into square brackets)
 2013-05-03 12:19:10 +04:00
Boris Lytochkin
3828f6227b Fix bug #64765 (enclose IPv6 address into square brackets) 2013-05-03 12:13:50 +04:00
Boris Lytochkin
5d0826e9c3 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #61981
 2013-03-17 20:02:34 +04:00
Boris Lytochkin
b32405053f Fix bug #61981 2013-03-17 20:00:37 +04:00
Boris Lytochkin
6c5c04888d Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix bug #64124 (IPv6 malformed)
 2013-02-07 14:49:45 +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
Johannes Schlüter
9c821ec7a1 Merge branch 'PHP-5.4' into PHP-5.5 2013-02-01 12:32:00 +01:00
Johannes Schlüter
b09f5a4f56 Fix typo in error message 2013-02-01 12:31:07 +01:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08: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
Boris Lytochkin
583292ab22 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)
Fixed ipv6 test skipto if IPv6 support is disabled
 2012-01-13 18:34:21 +00:00
Felipe Pena
8775a37559 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +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
a183c17b07 remove extra white space 2011-09-02 10:07:01 +00:00
Boris Lytochkin
d077fc3211 added SNMPException class, enabling ability to throw exceptions 
when a known SNMP error has occured
FR #55542
 2011-09-02 10:04:19 +00:00
Boris Lytochkin
8c5fa2ba56 merge from trunk: 
remove php_snmp_get_ce()
 2011-09-02 08:09:23 +00:00
Boris Lytochkin
538d8a3f52 remove php_snmp_get_ce() 2011-09-02 08:07:58 +00:00
Boris Lytochkin
86b563ea0f tune text align 2011-08-31 20:16:56 +00:00
Boris Lytochkin
2c5c7a2ef3 tune text align 2011-08-31 20:15:32 +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
b448bb5e01 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:28:13 +00:00
Boris Lytochkin
1c88dcf39f merge from trunk: 
set ERRNO_OID_PARSING_ERROR on OID parse error
 2011-08-30 14:24:00 +00:00
Boris Lytochkin
5ab9e7b5db export ERRNO_OID_PARSING_ERROR constant: 
raise it evry time OID parsing has failed
 2011-08-27 08:16:32 +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
1464da9073 reformat OID parsing procedure, 
fail whole SNMP query on single OID parsing failure
 2011-08-27 07:24:44 +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
8c99efcdf0 Adding IPv6 support (FR #42918) 2011-08-20 15:53:44 +00:00
Felipe Pena
4b30846b50 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Felipe Pena
da376383e8 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Boris Lytochkin
1ed2f1cf5d provide backwards compatibility for 'p' in zend_parse_parameters() 2011-07-23 07:40:40 +00:00
Boris Lytochkin
02bf16db03 s/noOIDIncreasingCheck/oid_increasing_check/ 2011-07-21 12:48:47 +00:00
Boris Lytochkin
96c45c85ad s/noOIDIncreasingCheck/oid_increasing_check/ 2011-07-21 12:47:07 +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
5c110b9a76 new propery noOIDIncreasingCheck allowing to skip 
OID increasing check (userful for bogus SNMP agents)
 2011-07-17 19:45:05 +00:00
Boris Lytochkin
e1d4676065 swap non_repeaters and max_repetitions in walk query, max_repetitions whould be used more frequently 2011-07-17 18:17:43 +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
a80c2ee19b fix FR #54502: allow user to change OID value output mode when SNMP_VALUE_OBJECT is used. 2011-07-17 17:27:00 +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
cc1ccefc0d backport r313324 2011-07-17 14:06:05 +00:00
Boris Lytochkin
281d0eade4 update ARG_INFO_EX for walk and get methods, fix comments 2011-07-17 13:57:28 +00:00
Boris Lytochkin
7a0bd8b967 remove PHP_VERSION_ID ifdef's, limiting to 5.4 branch 2011-06-12 12:26:51 +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
edd80c571d move SNMP VERSION constants into SNMP class itself 2011-06-12 11:58:49 +00:00
Boris Lytochkin
0db6d3b16c fix typo in comment 2011-06-12 11:25:20 +00:00
Felipe Pena
32b5f8a1a3 - Added new parameter parsing option (p - for valid path (string without null byte in the middle)) 
# The tests will be fixed in the next commits
 2011-06-06 21:28:16 +00:00
Felipe Pena
4737910b69 - Added new parameter parsing option (p - for valid path (string without null byte in the middle)) 
# The tests will be fixed in the next commits
 2011-06-06 21:28:16 +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
9d2f7c1e3e remove method open, __construct is enough 2011-05-09 19:34:07 +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
1dc02ac2de fix error reporting on OID not increasing 
calling arguments markup
 2011-05-08 09:20:58 +00:00
Boris Lytochkin
bbb4f679ae * Net-SNMP version detection and proper processing 
* more UCD-SNMP-related code removal
 2011-04-06 06:58:25 +00:00
Boris Lytochkin
cab643f615 * added detection and walkaround for net-snmp library bug (net-snmp BUGid 2027834) 
* drop UCD-SNMP support, R.I.P.
 2011-04-05 12:20:35 +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
5d0c948296 revert r309111 (name_len was not a typo) 2011-03-19 20:50:39 +00:00
Boris Lytochkin
d890ece3fc fix typo in SNMP_SNPRINT_VALUE usage: use val_len, not name_length 2011-03-11 07:21:13 +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
661b552938 fix warnings mentioned in 'Parameter Parsing Report' 2011-03-02 22:12:02 +00:00
Boris Lytochkin
e9920cce1c remove compiler warnings 
fix various memory leaks seen with --enable-debug
 2011-02-26 19:08:55 +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
3ab69c4cff fix parse errors for non_repeaters & max_repetitions: aligment errors 2011-02-25 19:22:15 +00:00
Boris Lytochkin
430af9a0ab push most of SNMP query options into objid_query structure 2011-02-19 11:13:10 +00:00
Boris Lytochkin
73f5ee551c enable HAVE_SHUTDOWN_SNMP_LOGGING 2011-02-17 12:12:22 +00:00
Boris Lytochkin
6b81a9ac2e * Fix memory leak on concurrent new, open 
* change comments to ANSI-C style
* added compatibility with net-snmp prior 5.4
 2011-02-17 12:02:16 +00:00
Felipe Pena
b58c6f5ede - Fixed crash on unserialize(serialize(new SNMP)) 2011-02-15 00:07:26 +00:00
Felipe Pena
aef9557333 - Fixed memory leak on serialize(new SNMP) 2011-02-14 23:58:52 +00:00
Felipe Pena
be2bfd1bcf - Fixed memory leak 2011-02-14 23:43:22 +00:00
Boris Lytochkin
c50b3d7add fix crash caused by incorrect offset altering 2011-02-05 13:22:38 +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
Pierre Joye
fefe9fc5c7 - fix build, wrong version id 2011-02-01 13:57:06 +00:00
Boris Lytochkin
2bc31f8027 preprocessed changes made in rev.307894: 
keeping ext/snmp backwards compatible
 2011-02-01 08:20:13 +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
Felipe Pena
ca9b3511f8 - Fixed build 2011-02-01 01:02:00 +00:00
Boris Lytochkin
5e82e334dd Improved SNMP extension. FR #53594 2011-01-31 11:41:33 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Sebastian Bergmann
22f4ef45fe sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Jani Taskinen
64389f1b31 - Fixed bug #49990 (SNMP3 warning message about security level printed twice). 2009-10-25 20:17:04 +00:00
Stanislav Malyshev
60cbce382b fix parameter parsing for SNMP 2009-08-17 22:15:18 +00:00
Ilia Alshanetsky
5904ee8f8e MFB: Fixed bug #48273 (snmp*_real_walk() returns SNMP errors as values). 2009-06-01 13:11:09 +00:00
Ilia Alshanetsky
a1df5c8cb3 MFB: Fixed bug #48359 (Script hangs on snmprealwalk if OID is not 
increasing)
 2009-05-31 14:11:14 +00:00
Jani Taskinen
abda62eace - Revert bad patch (which caused bug #48133) 2009-05-02 21:13:39 +00:00
Marcus Boerger
d4f5b3f0a9 - This is PHP 6 - if this ... ever gets out 2009-03-10 23:40:06 +00:00
Sebastian Bergmann
7f4dc8702a Bump copyright year, 3 of 3. 2008-12-31 11:12:40 +00:00
Felipe Pena
43791516db - Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro (again!) 2008-11-17 11:26:25 +00:00
Felipe Pena
e006a89e71 - Revert ZEND_BEGIN_ARG_INFO change 2008-11-02 21:10:13 +00:00
Felipe Pena
7eb2715464 - Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-10-24 14:34:17 +00:00
Alexey Zakhlestin
22693d1c46 MFB: Fixed bug #45405 (snmp extension memory leak) 2008-09-06 07:58:09 +00:00