Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | sync vim mode lines in main | Anatol Belski | 2017-07-09 | 1 | -2/+4 |
| | |||||
* | Merge branch 'PHP-7.0' into PHP-7.1 | Jakub Zelenka | 2017-04-30 | 1 | -2/+6 |
|\ | |||||
| * | Fix compiler warnings when compiled against musl libc | Michael Heimpold | 2017-04-30 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Joe Watkins | 2017-04-20 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | * PHP-7.0: Update php_network.h | ||||
| * | Update php_network.h | Alexander Ilyin | 2017-04-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | ``` 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> ^ ``` | ||||
| * | Update copyright headers to 2017 | Sammy Kaye Powers | 2017-01-04 | 1 | -1/+1 |
| | | |||||
* | | Update copyright headers to 2017 | Sammy Kaye Powers | 2017-01-04 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'PHP-7.0' | Joe Watkins | 2016-05-29 | 1 | -0/+2 |
|\ \ | |/ | | | | | | | * PHP-7.0: This is exported at implementation site, but no forward declaration can cause compile warnings | ||||
| * | This is exported at implementation site, but no forward declaration can ↵ | Joe Watkins | 2016-05-29 | 1 | -0/+2 |
| | | | | | | | | cause compile warnings | ||||
* | | Implement #51879 stream context socket option tcp_nodelay | Joe Watkins | 2016-04-29 | 1 | -1/+4 |
|/ | |||||
* | fix #71609: Segmentation fault on ZTS with gethostbyname | Joe Watkins | 2016-03-31 | 1 | -0/+6 |
| | |||||
* | Merge branch 'PHP-5.6' into PHP-7.0 | Lior Kaplan | 2016-01-01 | 1 | -1/+1 |
|\ | | | | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016) | ||||
| * | Happy new year (Update copyright to 2016) | Lior Kaplan | 2016-01-01 | 1 | -1/+1 |
| | | |||||
* | | Add support for IPV6_V6ONLY on sockets | Bob Weinand | 2015-11-06 | 1 | -3/+5 |
| | | |||||
* | | Merge branch 'PHP-5.6' | Stanislav Malyshev | 2015-01-31 | 1 | -0/+4 |
|\ \ | |/ | | | | | | | | | | | | | | | | | * 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 | ||||
| * | Merge branch 'PHP-5.4' into PHP-5.5 | Stanislav Malyshev | 2015-01-31 | 1 | -0/+4 |
| |\ | | | | | | | | | | | | | | | | * PHP-5.4: Use better constant since MAXHOSTNAMELEN may mean shorter name use right sizeof for memset | ||||
| | * | Use better constant since MAXHOSTNAMELEN may mean shorter name | Stanislav Malyshev | 2015-01-31 | 1 | -0/+4 |
| | | | |||||
| | * | Bump year | Xinchen Hui | 2014-01-03 | 1 | -1/+1 |
| | | | |||||
| | * | Happy New Year | Xinchen Hui | 2013-01-01 | 1 | -1/+1 |
| | | | |||||
| | * | - Year++ | Felipe Pena | 2012-01-01 | 1 | -1/+1 |
| | | | |||||
| | * | - Forgot to commit these. | Moriyoshi Koizumi | 2011-06-20 | 1 | -0/+5 |
| | | | |||||
| * | | Bump year | Xinchen Hui | 2015-01-15 | 1 | -1/+1 |
| | | | |||||
| * | | Bump year | Xinchen Hui | 2014-01-03 | 1 | -1/+1 |
| | | | |||||
* | | | bump year | Xinchen Hui | 2015-01-15 | 1 | -1/+1 |
| | | | |||||
* | | | trailing whitespace removal | Stanislav Malyshev | 2015-01-10 | 1 | -3/+3 |
| | | | |||||
* | | | second shot on removing TSRMLS_* | Anatol Belski | 2014-12-14 | 1 | -6/+6 |
| | | | |||||
* | | | first shot remove TSRMLS_* things | Anatol Belski | 2014-12-13 | 1 | -9/+9 |
| | | | |||||
* | | | s/PHP 5/PHP 7/ | Johannes Schlüter | 2014-09-19 | 1 | -1/+1 |
| | | | |||||
* | | | master renames phase 1 | Anatol Belski | 2014-08-25 | 1 | -1/+1 |
| | | | |||||
* | | | first shot on merging the core fro the int64 branch | Anatol Belski | 2014-08-16 | 1 | -1/+1 |
| | | | |||||
* | | | cleanup (use zend_string* instead of char*) | Dmitry Stogov | 2014-08-13 | 1 | -9/+10 |
| | | | |||||
* | | | Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option | Daniel Lowrey | 2014-08-05 | 1 | -2/+7 |
| | | | |||||
* | | | Bump year | Xinchen Hui | 2014-01-03 | 1 | -1/+1 |
|/ / | |||||
* | | Fix non-Windows build | Gustavo Lopes | 2013-02-02 | 1 | -0/+2 |
| | | |||||
* | | Happy New Year | Xinchen Hui | 2013-01-01 | 1 | -1/+1 |
| | | |||||
* | | - Year++ | Felipe Pena | 2012-01-01 | 1 | -1/+1 |
| | | |||||
* | | - Forgot to commit these. | Moriyoshi Koizumi | 2011-06-20 | 1 | -0/+5 |
|/ | |||||
* | - Year++ | Felipe Pena | 2011-01-01 | 1 | -1/+1 |
| | |||||
* | sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php | Sebastian Bergmann | 2010-01-03 | 1 | -1/+1 |
| | |||||
* | MFT: VC10 build support | Kalle Sommer Nielsen | 2009-12-03 | 1 | -4/+10 |
| | |||||
* | MFH: | Felipe Pena | 2009-01-07 | 1 | -0/+4 |
| | | | | | | | - Added check for EWOULDBLOCK - Using EWOULDBLOCK instead of EAGAIN by portability issues (Related to #46917) | ||||
* | MFH: Bump copyright year, 3 of 3. | Sebastian Bergmann | 2008-12-31 | 1 | -1/+1 |
| | |||||
* | - MFH: | Pierre Joye | 2008-08-23 | 1 | -14/+1 |
| | | | | | | - drop bindlib usage on windows - inet_pton, inet_ntop and inet_aton are always available (VC9 uses the CRT implementation, VC6 our own) | ||||
* | MFH: Bump copyright year, 2 of 2. | Sebastian Bergmann | 2007-12-31 | 1 | -1/+1 |
| | |||||
* | Fix build on MSVC 2008 - channeling Wez | Elizabeth Marie Smith | 2007-10-09 | 1 | -0/+2 |
| | |||||
* | MFH: Bump year. | Sebastian Bergmann | 2007-01-01 | 1 | -1/+1 |
| | |||||
* | bump year and license version | foobar | 2006-01-01 | 1 | -3/+3 |
| | |||||
* | - Bumber up year | foobar | 2005-08-03 | 1 | -1/+1 |
| | |||||
* | - Fixed cacheing bug in PHP_SOCKADDR_SA_LEN macro | foobar | 2005-07-14 | 1 | -1/+1 |
| | | | | | | - Removed duplicate sa_len check from configure.in - Unified the sockaddr tests into PHP_SOCKADDR_CHECKS macro | ||||
* | Added bindto socket context option. | Ilia Alshanetsky | 2005-06-14 | 1 | -1/+1 |
| |