Xinchen Hui
3994a70b91
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Fixed bug #72218 (If host name cannot be resolved then PHP 7 crashes)
fix #72143 (preg_replace uses int instead of size_t on zend_string_allocs)
fix #72206 (xml_parser_create/xml_parser_free leaks mem)
improve 7132fe19c2
fix 1bb8a7b0b8
fix #72180 (Env variables incorrectly pretty printed in config.nice, phpinfo)
Conflicts:
acinclude.m4
2016-05-16 11:21:39 +08:00
Xinchen Hui
1559fd7e48
Fixed bug #72218 (If host name cannot be resolved then PHP 7 crashes)
2016-05-16 11:19:45 +08:00
Joe Watkins
66fc5a3436
Implement #51879 stream context socket option tcp_nodelay
2016-04-29 12:11:58 +01:00
Joe Watkins
d9e4510224
remove unused params || woops
2016-03-31 12:51:00 +01:00
Joe Watkins
233115ea23
fix #71609 : Segmentation fault on ZTS with gethostbyname
2016-03-31 12:39:01 +01:00
Lior Kaplan
ed35de784f
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Happy new year (Update copyright to 2016)
2016-01-01 19:48:25 +02:00
Lior Kaplan
49493a2dcf
Happy new year (Update copyright to 2016)
2016-01-01 19:21:47 +02:00
Bob Weinand
855bb36fd0
Add support for IPV6_V6ONLY on sockets
2015-11-06 21:45:31 +01:00
Dmitry Stogov
7aa7627172
Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).
2015-06-30 13:59:27 +03:00
Stanislav Malyshev
141b14454c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Use better constant since MAXHOSTNAMELEN may mean shorter name
use right sizeof for memset
Conflicts:
ext/sockets/sockaddr_conv.c
ext/standard/dns.c
2015-01-31 21:50:08 -08:00
Stanislav Malyshev
af1f867308
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Use better constant since MAXHOSTNAMELEN may mean shorter name
use right sizeof for memset
2015-01-31 21:48:14 -08:00
Stanislav Malyshev
b30a6d6018
Use better constant since MAXHOSTNAMELEN may mean shorter name
2015-01-31 21:46:56 -08:00
Stanislav Malyshev
882a375dba
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:10:52 -08:00
Stanislav Malyshev
237128603f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:08:37 -08:00
Stanislav Malyshev
0f9c708229
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:08:13 -08:00
Stanislav Malyshev
457367e0b6
Add mitigation for CVE-2015-0235 (bug #68925 )
2015-01-31 19:04:55 -08:00
Xinchen Hui
fc33f52d8c
bump year
2015-01-15 23:27:30 +08:00
Xinchen Hui
73c1be2653
Bump year
2015-01-15 23:26:03 +08:00
Anatol Belski
e112f6a04e
second shot on removing TSRMLS_*
2014-12-14 14:07:59 +01:00
Anatol Belski
bdeb220f48
first shot remove TSRMLS_* things
2014-12-13 23:06:14 +01:00
Anatol Belski
0e6c7c6165
fix datatype mismatch and unused var warning
2014-11-11 20:16:13 +01:00
Anatol Belski
6445c4bd48
use php_socket_t instead of int
2014-10-10 19:00:19 +02:00
Johannes Schlüter
d0cb715373
s/PHP 5/PHP 7/
2014-09-19 18:33:14 +02:00
Anatol Belski
c3e3c98ec6
master renames phase 1
2014-08-25 19:24:55 +02:00
Anatol Belski
40912abf1d
Merge remote-tracking branch 'php/master'
...
Conflicts:
ext/xsl/xsltprocessor.c
2014-08-19 12:56:29 +02:00
Stanislav Malyshev
ff6b30c818
Merge branch 'PHP-5.6'
...
* PHP-5.6:
5.4.32
fix potentially missing NUL termination
Fix bug #67730 - Null byte injection possible with imagexxx functions
Fixed bug #67717 - segfault in dns_get_record
Fix bug #67716 - Segfault in cdf.c
5.4.32 RC1
2014-08-19 01:34:38 -07:00
Stanislav Malyshev
b278be894f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
5.4.32
fix potentially missing NUL termination
Fix bug #67730 - Null byte injection possible with imagexxx functions
Fixed bug #67717 - segfault in dns_get_record
Fix bug #67716 - Segfault in cdf.c
5.4.32 RC1
2014-08-19 01:34:09 -07:00
Stanislav Malyshev
2b10db8e10
fix potentially missing NUL termination
2014-08-18 23:04:24 -07:00
Anatol Belski
8ee2a4a9b5
first shot on merging the core fro the int64 branch
2014-08-16 11:16:11 +02:00
Dmitry Stogov
5a06ac88da
cleanup (use zend_string* instead of char*)
2014-08-13 14:51:48 +04:00
Dmitry Stogov
b8517e410c
cleanup
2014-08-13 12:36:10 +04:00
Dmitry Stogov
4c716e8b51
Merge branch 'master' into test
...
* master: (39 commits)
Add __debugInfo() to UPGRADING.
fix TS build
Update NEWS
Update NEWS
Update NEWS
Small tidy ups and raise visibility of GitHub PR process
Bug #41631 : Observe socket read timeouts in SSL streams
wrap int8_t and int16_t with #ifdef to avoid possible clashes
- Updated to version 2014.6 (2014f)
Removed Countable::count() change info from UPGRADE.INTERNALS too
NEWS and UPGRADING for intdiv()
Revert "Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option"
Fixed skip case for intdiv 64-bit test
Use callback structure
Add EXPECTF
Fix handling of multi-result sets with PS...used to clean not only the result set but the whole PS.
5.5.17 now
5.4.33-dev now
Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
...
Conflicts:
ext/fileinfo/libmagic/softmagic.c
main/streams/xp_socket.c
2014-08-11 11:38:41 +04:00
Daniel Lowrey
60552a8871
Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
2014-08-05 22:43:12 -04:00
Dmitry Stogov
f4cfaf36e2
Use better data structures (incomplete)
2014-02-10 10:04:30 +04:00
Xinchen Hui
c081ce628f
Bump year
2014-01-03 11:08:10 +08:00
Xinchen Hui
47c9027772
Bump year
2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
Carson McDonald
0c11cab919
Typo fix: recieved to received
2013-03-07 23:05:05 +01:00
Gustavo Lopes
e8f0e863ae
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix wrong blocking state being set
Fix tests (Windows)
Remove a Windows only warning
Move & improve PHP_SOCKET_ERROR def
Move some declarations to sockets.c
Fix overbroad skipif include
2013-02-02 15:32:03 +01:00
Gustavo Lopes
24e380f970
Remove a Windows only warning
2013-02-02 15:29:18 +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
Pierre Joye
94994104a5
- bump minimum version, no more XP/2003
2012-03-04 15:08:12 +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
Moriyoshi Koizumi
891acc30c0
- Forgot to commit these.
2011-06-20 20:30:36 +00:00
Moriyoshi Koizumi
2c6b2f64df
- Forgot to commit these.
2011-06-20 20:30:36 +00:00
Gustavo André dos Santos Lopes
0de2e61cab
- Added socket_import_stream().
...
- Fixed socket_strerror.phpt
- Made php_set_sock_blocking return FAILURE on fcntl error.
- Made socket_set_block()/socket_set_nonblock() emit warning on error.
2011-03-22 00:44:23 +00:00
Gustavo André dos Santos Lopes
c6ccc43285
- Fixed several comparisons that always result in true of false
...
due to signedness of one of the operands, either by removing
dead code or fixing it.
- Thrown some comments around in php_stream_get_record.
- See http://www.mail-archive.com/internals@lists.php.net/msg49525.html
2011-02-01 18:11:16 +00:00
Felipe Pena
0203cc3d44
- Year++
2011-01-01 02:17:06 +00:00