Peter Kokot
8d3f8ca12a
Remove unused Git attributes ident
...
The $Id$ keywords were used in Subversion where they can be substituted
with filename, last revision number change, last changed date, and last
user who changed it.
In Git this functionality is different and can be done with Git attribute
ident. These need to be defined manually for each file in the
.gitattributes file and are afterwards replaced with 40-character
hexadecimal blob object name which is based only on the particular file
contents.
This patch simplifies handling of $Id$ keywords by removing them since
they are not used anymore.
2018-07-25 00:53:25 +02:00
Xinchen Hui
a6519d0514
year++
2018-01-02 12:57:58 +08:00
Dmitry Stogov
83e495e0fd
Move constants into read-only data segment
2017-12-14 22:14:36 +03:00
Anatol Belski
384f0f8a4c
sync vim mode lines in main
2017-07-09 15:07:23 +02:00
Jakub Zelenka
9622a3be43
Merge branch 'PHP-7.0' into PHP-7.1
2017-04-30 20:27:39 +01:00
Michael Heimpold
d9dfac90bf
Fix compiler warnings when compiled against musl libc
...
musl libc is complaining when <sys/poll.h> is used instead of <poll.h>
so change this.
This issue was reported for OpenWrt/LEDE where musl libc is the standard
C library instead of e.g. glibc, see the following link for the original PR:
https://github.com/openwrt/packages/pull/4263
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com >
Signed-off-by: Michael Heimpold <mhei@heimpold.de >
--
v3: refined checks/fallback paths as suggested by @bukka
v2: rebased to resolve merge conflict in main/php_network.h
v1: initial PR
2017-04-30 20:24:56 +01:00
Joe Watkins
242bdf7e8b
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Update php_network.h
2017-04-20 06:39:26 +01:00
Alexander Ilyin
464742bd2a
Update php_network.h
...
```
In file included from /usr/local/include/php/main/php_network.h:124:0,
from /var/www/html/php-ext-handlersocketi-0.0.1/hs_response.c:3:
/usr/include/sys/poll.h:1:2: warning: #warning redirecting incorrect #include <sys/poll.h> to <poll.h> [-Wcpp]
#warning redirecting incorrect #include <sys/poll.h> to <poll.h>
^
```
2017-04-20 06:39:14 +01:00
Sammy Kaye Powers
dac6c639bb
Update copyright headers to 2017
2017-01-04 11:23:42 -06:00
Sammy Kaye Powers
478f119ab9
Update copyright headers to 2017
2017-01-04 11:14:55 -06:00
Joe Watkins
2a0261d712
Merge branch 'PHP-7.0'
...
* PHP-7.0:
This is exported at implementation site, but no forward declaration can cause compile warnings
2016-05-29 06:03:33 +01:00
Joe Watkins
0c5bd4d445
This is exported at implementation site, but no forward declaration can cause compile warnings
2016-05-29 06:02:38 +01:00
Joe Watkins
66fc5a3436
Implement #51879 stream context socket option tcp_nodelay
2016-04-29 12:11:58 +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
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
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
Stanislav Malyshev
b7a7b1a624
trailing whitespace removal
2015-01-10 15:07:38 -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
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
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
Daniel Lowrey
60552a8871
Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option
2014-08-05 22:43:12 -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
Gustavo Lopes
608254fa57
Fix non-Windows build
2013-02-02 16:38:09 +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
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
Felipe Pena
0203cc3d44
- Year++
2011-01-01 02:17:06 +00:00
Sebastian Bergmann
9ba1e81665
sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php
2010-01-03 09:23:27 +00:00
Kalle Sommer Nielsen
1063c8346b
MFT: VC10 build support
2009-12-03 11:50:32 +00:00
Felipe Pena
7c989115c2
MFH:
...
- Added check for EWOULDBLOCK
- Using EWOULDBLOCK instead of EAGAIN by portability issues
(Related to #46917 )
2009-01-07 20:21:46 +00:00
Sebastian Bergmann
08659c2dcd
MFH: Bump copyright year, 3 of 3.
2008-12-31 11:15:49 +00:00
Pierre Joye
2620304003
- MFH:
...
- drop bindlib usage on windows
- inet_pton, inet_ntop and inet_aton are always available (VC9 uses the CRT implementation, VC6 our own)
2008-08-23 19:22:10 +00:00
Sebastian Bergmann
d1dded8751
MFH: Bump copyright year, 2 of 2.
2007-12-31 07:17:19 +00:00
Elizabeth Marie Smith
4e339842fc
Fix build on MSVC 2008 - channeling Wez
2007-10-09 21:53:44 +00:00
Sebastian Bergmann
4223aa4d5e
MFH: Bump year.
2007-01-01 09:36:18 +00:00
foobar
5bd93221a8
bump year and license version
2006-01-01 12:51:34 +00:00
