archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-17 22:48:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
103071 commits 526 branches 1434 tags 873 MiB
Commit graph

191 commits

Author SHA1 Message Date
Dmitry Stogov
dd1c68e67f Merge branch 'master' into phpng 
* master: (77 commits)
  NEWS entry for Fix potential segfault in dns_get_record()
  NEWS entry for "Fix potential segfault in dns_get_record()"
  NEWS entry for Fix potential segfault in dns_get_record(
  Fix potential segfault in dns_get_record()
  Revert "Add optional second arg to unserialize()"
  5.5.15 now
  update NEWS
  Fix bug #66127 (Segmentation fault with ArrayObject unset)
  5.4.31 next
  Add NEWS. This doesn't need UPGRADING (or an RFC), IMO.
  Fix broken test.
  Add a mime type map generation script and update the header.
  Move the mime type map out of php_cli_server.c for easier generation.
  Replace the CLI server's linear search for extensions with a hash table.
  fix test
  Remove unused included file
  NEWS
  NEWS
  NEWS
  Fixed Bug #67413 	fileinfo: cdf_read_property_info insufficient boundary chec
  ...

Conflicts:
	Zend/zend_closures.c
	Zend/zend_execute.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/spl/spl_array.c
	ext/standard/basic_functions.c
	ext/standard/dns.c
	ext/standard/var.c
 2014-06-12 05:07:33 +04:00
Sara Golemon
4f73394fdd Fix potential segfault in dns_get_record() 
If the remote sends us a packet with a malformed TXT record,
we could end up trying to over-consume the packet and wander
off into overruns.
 2014-06-11 13:37:04 -07:00
Dmitry Stogov
c1965f58d4 Use reference counting instead of zval duplication 2014-06-05 16:04:11 +04:00
Dmitry Stogov
6cf5e51f3e Reduced memory realocations 2014-04-15 22:43:18 +04:00
Dmitry Stogov
050d7e38ad Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
Xinchen Hui
dae6e672c2 Fixed reference arguments handling 2014-03-03 18:20:53 +08:00
Xinchen Hui
b4ccb6a9fd Refactor gethostbyname to returing zend_string 2014-03-03 18:19:16 +08:00
Dmitry Stogov
40e053e7f3 Use better data structures (incomplete) 2014-02-13 17:54:23 +04:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Xinchen Hui
c0d060f5c0 Bump year 2014-01-03 11:04:26 +08:00
Stanislav Malyshev
5e24a6e74d Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #64458 (dns_get_record result with string of length -1)
 2013-04-23 21:45:49 -07:00
Stanislav Malyshev
f87d2ab893 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #64458 (dns_get_record result with string of length -1)
 2013-04-23 21:43:55 -07:00
Stanislav Malyshev
18fdab5a09 Fix bug #64458 (dns_get_record result with string of length -1) 2013-04-23 21:43:35 -07:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Xinchen Hui
a2045ff332 Happy New Year~ 2013-01-01 16:02:16 +08:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Rasmus Lerdorf
de90c602e1 Use HOST_NAME_MAX constant here instead for the gethostname() func 2011-08-10 17:40:56 +00:00
Rasmus Lerdorf
14948624af Use HOST_NAME_MAX constant here instead for the gethostname() func 2011-08-10 17:40:56 +00:00
Ilia Alshanetsky
9fd373d8b6 Fix win32 build 2011-08-10 15:59:32 +00:00
Ilia Alshanetsky
e4a64006ab Fix win32 build 2011-08-10 15:59:32 +00:00
Ilia Alshanetsky
d091516c31 Minimize stack usage and added missing dtors 2011-08-09 13:10:57 +00:00
Ilia Alshanetsky
8c846a6f74 Minimize stack usage and added missing dtors 2011-08-09 13:10:57 +00:00
Felipe Pena
927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Gustavo André dos Santos Lopes
40c3aefafb - Removed redundant local variable in dns_get_record. 
- (5.3) Fixed bug in the Windows implementation of
  dns_get_record, where the two last parameters wouldn't be
  filled unless the type were DNS_ANY (Gustavo).
 2010-10-11 03:07:03 +00:00
Gustavo André dos Santos Lopes
17dc181117 - Removed redundant local variable in dns_get_record. 
- (5.3) Fixed bug in the Windows implementation of
  dns_get_record, where the two last parameters wouldn't be
  filled unless the type were DNS_ANY (Gustavo).
 2010-10-11 03:07:03 +00:00
Gustavo André dos Santos Lopes
91f64706c2 - [DOC] Added a 5th parameter to dns_get_record, a boolean that tells whether to activate 
"raw mode". In this mide, $type (2nd parameter) is the numeric type of the record, and
  the responses are not parsed -- the "type" element will be numeric and there will be
  a "data" element with the raw data of the response buffer, which the programmer will
  have to parse.
- Fixed bug in the Win32 implementation of dns_get_record, where the 3rd and 4th arguments
  would only be filled if the 2nd ($type) was DNS_ANY.
- [DOC] The 3rd and 4th parameters can now be NULL (changed their arginfo).
 2010-10-11 02:48:23 +00:00
Gustavo André dos Santos Lopes
b1d5cf7348 - Added numeric record type and raw data for unknown DNS 
record types.
 2010-10-08 23:02:37 +00:00
Sebastian Bergmann
de93d96de4 sed -i "s#1997-2008#1997-2010#g" **/*.c **/*.h 2010-01-07 11:02:39 +00:00
Jani Taskinen
d0a956c2b7 - Tune the fix for bug #50508 and make it work with MacOSX, bug #50541. 2009-12-21 15:22:40 +00:00
Jani Taskinen
52f83608d8 - Fixed bug #50508 (compile fails: Conflicting HEADER type declarations) 
# NEVER ever include nameser_compat.h, it's included in various ways in different OSes by nameser.h if needed
 2009-12-18 11:02:07 +00:00
Scott MacVicar
76d875278c Part fix for bug #49224 2009-10-16 02:10:52 +00:00
Scott MacVicar
050653466f Merge chanes from head to improve DNS on OSX and allow usage of bind9 stuff with the bind8 compatibility layer. 2009-08-11 22:07:35 +00:00
Scott MacVicar
af5df4c813 Change dns.h to php_dns.h, part of my dns cleanup 2009-08-05 23:20:17 +00:00
Jani Taskinen
d5455551a5 - Sync with HEAD (thanks Hannes :) 2009-05-20 12:44:19 +00:00
Jani Taskinen
9a4069529c MFH: Fix non-windows builds 2009-05-20 12:15:39 +00:00
Kalle Sommer Nielsen
31a1dbe2df MFH: Fix Windows build, dns_get_record is defined in dns_win32.c, not here 2009-05-20 08:18:48 +00:00
Jani Taskinen
e36c8c49c3 MFH: Unify macros 2009-05-19 11:12:20 +00:00
Felipe Pena
47a8643e71 - Reverted my previous commit to avoid unnecessary BC. 
[DOC] Added new entry to the array returned by dns_get_record(), 'entries', which contains the separated value from TXT value. (so 'txt' kept the concatenated version) (Pierre)
 2009-01-12 20:07:28 +00:00
Scott MacVicar
8911ba1c62 Add support for the older style bind 8 functions, this adds support for OS X to use all of the dns_* functions. 2009-01-11 23:37:16 +00:00
Felipe Pena
cc50663b56 MFH: 
- Improved fix for #47035 (win32 part by Henrique M. Decaria)
[DOC] The TXT part needs be returned as an array of strings. (dns_get_record())
 2009-01-11 18:47:17 +00:00
Felipe Pena
b5182d7aff - MFH: Fixed bug #47035 (dns_get_record returns a garbage byte at the end of a TXT record) 2009-01-08 17:19:50 +00:00
Pierre Joye
4f70499923 - fix regression introduced by the move to the new parsing api (thx Bjori) 2009-01-07 13:49:53 +00:00
Pierre Joye
4b91d9b57a - fix parameter parsing options 2009-01-07 13:46:13 +00:00
Pierre Joye
6f1a0edb11 - these ifdefs are a mess, fix build on win 2009-01-06 23:37:28 +00:00
Pierre Joye
8afdcba444 - fix build 2009-01-06 21:47:13 +00:00
Pierre Joye
3c967db4a1 - [MFH] 
- [DOC] add support for all DNS function on Windows
  - dns_check_record  (and its alias  checkdnsrr)
  - dns_get_record
   - IPV6 specific info not available yet:
     . AAAA info is available only on vista/2k8 for now
     . A6 info is not available
  - dns_get_mx (and its alias getmxrr)
 2009-01-06 20:48:21 +00:00
Antony Dovgal
85af2a05db MFH: don't use WRONG_PARAM_COUNT with new param parsing API 2008-12-31 15:48:18 +00:00
Ilia Alshanetsky
540242dc2d [DOC] 
Added gethostname() to return the current system host name.
 2008-12-31 14:30:38 +00:00