clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-29 05:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
80,278 Commits 494 Branches 1,367 Tags 786 MiB
0b6676ef87
Commit Graph

3170 Commits

Author SHA1 Message Date
Remi Collet
39885d0819 Merge branch 'PHP-5.6' 
* PHP-5.6:
  NEWS
  NEWS
  Fixed bug #67406 built-in web-server segfaults on startup
 2014-06-10 10:39:10 +02:00
Remi Collet
e2493a3a08 fix merge from php 5.5 (already fixed, differently) 2014-06-10 10:38:39 +02:00
Remi Collet
d440bb3e68 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  NEWS
  Fixed bug #67406 built-in web-server segfaults on startup
 2014-06-10 10:32:26 +02:00
Remi Collet
58c6a08e00 Fixed bug #67406 built-in web-server segfaults on startup 
Reproduce on aarch64.

From select man page:
  "select() may update the timeout argument to indicate how much time was left."
So "const" is not ok.
 2014-06-10 10:28:34 +02:00
Bob Weinand
f0a9905759 Merge branch 'PHP-5.6' 2014-06-09 10:07:36 +02:00
Bob Weinand
6adc30028c Merge sapi/phpdbg into PHP-5.6 2014-06-09 10:06:29 +02:00
Bob Weinand
1e85b9e86b Merge branch 'PHP-5.6' 
Conflicts:
	sapi/phpdbg/phpdbg.c
 2014-06-04 02:20:35 +02:00
Bob Weinand
848df6fcbe Merge sapi/phpdbg into PHP-5.6 2014-06-04 02:18:39 +02:00
Bob Weinand
a1b0ae4247 Fixed startup segfault in non-debug builds 
Fixes issue #87
 2014-06-03 21:24:55 +00:00
Bob Weinand
241211975e PHP 5.4/5.5 compability in phpdbg_watch.c 2014-06-03 21:24:45 +00:00
Bob Weinand
466cd2aa7d Merge sapi/phpdbg into PHP-5.6 2014-06-03 21:15:02 +00:00
Bob Weinand
f66449a467 Merge branch 'PHP-5.6' 2014-05-03 11:41:33 +02:00
Bob Weinand
003ba74d99 Merge sapi/phpdbg into PHP-5.6 2014-05-03 11:40:25 +02:00
Bob Weinand
3ad8616aff Added stdion/stdout/stderr constsnts and their php:// wrappers 
Fixes issue #85
 2014-05-01 11:43:46 +02:00
Bob Weinand
191e3a0210 Merge sapi/phpdbg 2014-05-01 11:41:49 +02:00
Stanislav Malyshev
f2a3be9627 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #67060: use default mode of 660
 2014-04-29 09:17:10 -07:00
Stanislav Malyshev
c397fcc35f Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #67060: use default mode of 660
 2014-04-29 09:16:24 -07:00
Stanislav Malyshev
770fcdab90 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #67060: use default mode of 660
 2014-04-29 09:15:23 -07:00
Stanislav Malyshev
35ceea928b Fix bug #67060: use default mode of 660 2014-04-29 09:14:11 -07:00
Anatol Belski
705909aa48 Merge branch 'PHP-5.6' 
* PHP-5.6:
  C89 compat
 2014-04-27 18:02:07 +02:00
Anatol Belski
3b6bf6eec8 Merge remote-tracking branch 'phpdbg/master' into PHP-5.6 
* phpdbg/master:
  C89 compat
 2014-04-27 18:01:26 +02:00
Anatol Belski
5dbe7c98e4 Merge branch 'PHP-5.6' 
* PHP-5.6:
  removed /EHa as __try/__catch syntax is used anyway
  fix ZEND_DEBUG usage
  fix CFLAGS_PHPDBGS and some formatting
 2014-04-26 00:17:09 +02:00
Anatol Belski
a10dc3aa4f Merge remote-tracking branch 'phpdbg/master' into PHP-5.6 
* phpdbg/master:
  removed /EHa as __try/__catch syntax is used anyway
  fix ZEND_DEBUG usage
  fix CFLAGS_PHPDBGS and some formatting
 2014-04-26 00:15:32 +02:00
Anatol Belski
ceec2152a6 Merge branch 'PHP-5.6' 
* PHP-5.6:
  use a portable strndup implementation
  fixed C89 compat
  prepare config.w32
  add parser files to dist
 2014-04-24 11:07:08 +02:00
Anatol Belski
cd2641973c Merge remote-tracking branch 'phpdbg/master' into PHP-5.6 2014-04-24 11:05:52 +02:00
Felipe Pena
fd96831f68 Merge branch 'PHP-5.6' 
* PHP-5.6:
  sapi/litespeed/lsapi_main.c: Fix bug #63228
 2014-04-22 10:49:18 -03:00
George Wang
742f4704a9 sapi/litespeed/lsapi_main.c: Fix bug #63228 
Fix compiling error at line 606 (error: format not a string
literal and no format arguments [-Werror=format-security]
 2014-04-22 10:48:14 -03:00
Bob Weinand
823ddab3f3 Merge branch 'PHP-5.6' 2014-04-21 23:32:57 +02:00
Bob Weinand
708af5fd8e Merge sapi/phpdbg into PHP-5.6 2014-04-21 23:30:08 +02:00
Stanislav Malyshev
185e5c0327 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix #66908: php-fpm reload leaks epoll_create() file descriptor
 2014-04-20 16:25:25 -07:00
Stanislav Malyshev
0df431482f Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix #66908: php-fpm reload leaks epoll_create() file descriptor
 2014-04-20 16:25:03 -07:00
Stanislav Malyshev
6bad228b4e Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix #66908: php-fpm reload leaks epoll_create() file descriptor
 2014-04-20 16:23:43 -07:00
Julio Pintos
49341e992a Fix #66908: php-fpm reload leaks epoll_create() file descriptor 
This patch fixes descriptor leak which could lead to DoS once Max open files is reached
 2014-04-20 16:21:49 -07:00
Anatol Belski
0ffdcfe756 Merge branch 'PHP-5.6' 
* PHP-5.6:
  updated NEWS
  Fixed bug #67079 Missing MIME types for XML/XSL files
 2014-04-16 09:50:24 +02:00
Anatol Belski
b4c238c8cf Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed bug #67079 Missing MIME types for XML/XSL files
 2014-04-16 09:48:31 +02:00
Anatol Belski
9eb726b3ab Fixed bug #67079 Missing MIME types for XML/XSL files 2014-04-16 09:47:49 +02:00
Stanislav Malyshev
d3b433bb15 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in php-fpm.conf
 2014-04-13 17:33:02 -07:00
Stanislav Malyshev
c1d5937f7f Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in php-fpm.conf
 2014-04-13 17:32:42 -07:00
Stanislav Malyshev
5811610d71 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in php-fpm.conf
 2014-04-13 17:31:44 -07:00
itxx00
636adf251c Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in php-fpm.conf 2014-04-13 17:30:50 -07:00
Stanislav Malyshev
9fb92eed83 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix apr_psprintf format string from e0df4e3dba
  Fixed bug #67024 - getimagesize should recognize BMP files with negative height
 2014-04-13 15:40:21 -07:00
Stanislav Malyshev
1be29a404a Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix apr_psprintf format string from e0df4e3dba
 2014-04-13 15:39:32 -07:00
Stanislav Malyshev
c5275b4a92 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix apr_psprintf format string from e0df4e3dba
 2014-04-13 15:37:55 -07:00
Jeff Trawick
442264ffd6 fix apr_psprintf format string from e0df4e3dba 2014-04-13 15:36:43 -07:00
Bob Weinand
ccf863c8ce Merge branch 'PHP-5.6' 2014-04-11 19:35:11 +02:00
Bob Weinand
99d1a1bb3f Shut up, my lovely compiler; I do not like your warnings 2014-04-11 19:33:56 +02:00
Ferenc Kovacs
a6e56586c6 Merge branch 'PHP-5.6' 
* PHP-5.6:
  add missing skip to the output, so we actually skip this test
 2014-04-07 16:59:27 +02:00
Ferenc Kovacs
7446766dab add missing skip to the output, so we actually skip this test 2014-04-07 16:57:52 +02:00
Michael Wallner
8b9d12dd47 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix some warnings
  PHP-5.6 compatibility for apache2 filter SAPI

Fixes bug #66595
 2014-03-24 17:53:08 +01:00
Michael Wallner
caba0203e8 fix some warnings 2014-03-24 17:51:50 +01:00