clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-25 11:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,664 Commits 493 Branches 1,366 Tags 849 MiB
0c658c39f6
Commit Graph

70664 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stanislav Malyshev
0c658c39f6 Merge branch 'PHP-5.4' 
* PHP-5.4:
  fix bug #55042 - erealloc without updating pointer
 2012-05-30 22:27:54 -07:00
Stanislav Malyshev
ed6ce83101 fix bug #55042 - erealloc without updating pointer 2012-05-30 22:26:26 -07:00
Johannes Schlüter
33849c2211 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #62186 readline fails to compile
  fix unchecked emalloc (cherry picked from commit 158d8a6b08)
 2012-05-31 01:18:02 +02:00
Johannes Schlüter
303dd7f346 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fix unchecked emalloc (cherry picked from commit 158d8a6b08)
 2012-05-31 01:16:42 +02:00
Johannes Schlüter
428dddd3e8 Fix bug #62186 readline fails to compile 2012-05-31 01:15:22 +02:00
Stanislav Malyshev
fa05f038cb fix unchecked emalloc 
(cherry picked from commit 158d8a6b08)
 2012-05-30 21:37:28 +02:00
andrey
56532895a8 Merge branch 'master' of git.php.net:php-src 2012-05-30 15:25:26 +03:00
andrey
5a2578a333 small refactoring - factour out code from connection establishment. 
Add a define for the default authentication protocol - get away from
the hardcoded magic value
 2012-05-30 15:24:17 +03:00
Stanislav Malyshev
ec2029a894 Merge branch 'PHP-5.4' 
* PHP-5.4:
  fix test
  fix test
 2012-05-29 23:53:01 -07:00
Stanislav Malyshev
9b98cf7865 fix test 2012-05-29 23:52:47 -07:00
Stanislav Malyshev
abe6362716 fix test 2012-05-29 23:52:47 -07:00
Xinchen Hui
4770fe2c97 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Typofix in comment in proc_open.c
 2012-05-30 14:44:35 +08:00
Xinchen Hui
7511f972fd Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Typofix in comment in proc_open.c
 2012-05-30 14:43:55 +08:00
Jille Timmermans
a331f43f8c Typofix in comment in proc_open.c 2012-05-30 14:42:39 +08:00
Stanislav Malyshev
f428578138 Merge branch 'PHP-5.4' 
* PHP-5.4:
  fix CVE-2012-2143
 2012-05-29 23:14:09 -07:00
Stanislav Malyshev
692b3bcd88 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  fix CVE-2012-2143
 2012-05-29 23:08:04 -07:00
Stanislav Malyshev
aab49e934d fix CVE-2012-2143 2012-05-29 23:07:04 -07:00
Anatoliy Belsky
9a9362cb09 Merge branch 'PHP-5.4' 
* PHP-5.4:
  updated the libmagic patch after Felipes regex fix
 2012-05-29 17:42:35 +02:00
Anatoliy Belsky
6074da9809 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  updated the libmagic patch after Felipes regex fix
 2012-05-29 17:41:57 +02:00
Anatoliy Belsky
8d5e953a19 updated the libmagic patch after Felipes regex fix 2012-05-29 17:38:30 +02:00
Anatoliy Belsky
3a35479e59 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt
  Bug #62177 deactivate the linux test version on win
  Fix bug #62177 Test Bug - finfo_file_regex.phpt
 2012-05-29 16:43:40 +02:00
Anatoliy Belsky
c0e046a130 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt
  Bug #62177 deactivate the linux test version on win
  Fix bug #62177 Test Bug - finfo_file_regex.phpt
 2012-05-29 16:43:20 +02:00
Matt Ficken
ad0371ac7e Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt 2012-05-29 16:38:57 +02:00
Matt Ficken
b4b0aaae93 Bug #62177 deactivate the linux test version on win 2012-05-29 16:37:19 +02:00
Matt Ficken
dbc727373c Fix bug #62177 Test Bug - finfo_file_regex.phpt 2012-05-29 16:31:47 +02:00
Anatoliy Belsky
dffbc98239 Merge branch 'PHP-5.4' 
* PHP-5.4: (21 commits)
  Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phpt
  fix unchecked emalloc
  add CVE
  add bug 62146
  add bug #62082
  sync with HEAD
  sync with HEAD
  Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks)
  Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks)
  Fixed bug #61218 (FPM drops connection while receiving some binary values in FastCGI requests)
  Fixed bug #61218 (FPM drops connection while receiving some binary valuesin FastCGI requests)
  Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured)
  - Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured)
  - Fixed bug #62160 (Add process.priority to set nice(2) priorities)
  - Fixed bug #62160 (Add process.priority to set nice(2) priorities)
  - add missing headers to avoid warnings
  - add missing headers to avoid warnings
  - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors)
  - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors)
  - Fixed bug #62033 (php-fpm exits with status 0 on some failures to start)
  ...

Conflicts:
	NEWS
 2012-05-29 12:25:25 +02:00
Anatoliy Belsky
c4f9b01422 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phpt
  sync with HEAD
  Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks)
  Fixed bug #61218 (FPM drops connection while receiving some binary valuesin FastCGI requests)
  - Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured)
  - Fixed bug #62160 (Add process.priority to set nice(2) priorities)
  - add missing headers to avoid warnings
  - Fixed bug #62153 (when using unix sockets, multiples FPM instances can be launched without errors)
  - Fixed bug #62033 (php-fpm exits with status 0 on some failures to start)

Conflicts:
	NEWS
	sapi/fpm/fpm/fpm_main.c
 2012-05-29 12:19:20 +02:00
Matt Ficken
4054890b26 Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phpt 2012-05-29 11:41:44 +02:00
Stanislav Malyshev
158d8a6b08 fix unchecked emalloc 2012-05-28 18:54:15 -07:00
Stanislav Malyshev
213119c83f add CVE 2012-05-28 18:54:02 -07:00
Stanislav Malyshev
0a90643e53 add bug 62146 2012-05-28 17:43:36 -07:00
Stanislav Malyshev
4b04bf8793 add bug #62082 2012-05-28 17:38:33 -07:00
Pierrick Charron
fde8762e90 Added support for CURLOPT_MAIL_AUTH 
pull-request/92:
  Added support for CURLOPT_MAIL_AUTH for libcurl >= 7.25.0
 2012-05-27 23:43:52 -04:00
Nuno Lopes
339508d6ac sync with HEAD 2012-05-27 20:14:31 -04:00
Nuno Lopes
72911237b5 sync with HEAD 2012-05-27 20:13:09 -04:00
Nuno Lopes
77b086f3f0 128 MB is enough for everyone (TM) 
this is an initial tentative to avoid some testcases go crazy and consume 16 GB of memory. Additional measures will have to be taken if the problem persists.
Please patch individual tests that really require more than 128MB of memory
 2012-05-27 20:03:58 -04:00
Nuno Lopes
c5d054d3a5 Merge branch 'master' of https://git.php.net/push/php-src 2012-05-27 19:58:00 -04:00
Nuno Lopes
af2d6a63bf remove remaining traces of unicode.* ini settings 2012-05-27 19:57:34 -04:00
Your Name
60c4728594 VIM uses spaces as tabs and that doesn't comply with the coding 
standard. I think I'd fixed it so it's using real tabs now.
 2012-05-27 15:39:45 -07:00
Your Name
0667da8cb4 Removed syslog.h. That should never have been commited. 2012-05-27 01:50:29 -07:00
Your Name
d41fb16a52 Fixed the libcurl version checking for CURLOPT_MAIL_AUTH 2012-05-27 00:21:08 -07:00
Your Name
f75c1ed201 Added support for CURLOPT_MAIL_AUTH 2012-05-27 00:02:53 -07:00
Jerome Loyet
e7a7f533e3 Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks) 2012-05-26 19:37:24 +02:00
Jerome Loyet
773e85a788 Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks) 2012-05-26 19:37:09 +02:00
Jerome Loyet
2f7bd57f93 Fixed bug #61218 (the previous patch was not enough restritive on fcgi name string checks) 2012-05-26 19:36:01 +02:00
Jerome Loyet
78de6eb03d Fixed bug #61218 (FPM drops connection while receiving some binary values in FastCGI requests) 2012-05-26 19:29:01 +02:00
Jerome Loyet
60cca8b9c9 Fixed bug #61218 (FPM drops connection while receiving some binary values in FastCGI requests) 2012-05-26 19:27:45 +02:00
Jerome Loyet
e7ff3e839b Fixed bug #61218 (FPM drops connection while receiving some binary valuesin FastCGI requests) 2012-05-26 19:27:02 +02:00
Jerome Loyet
0225300b70 Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured) 2012-05-26 18:48:56 +02:00
Jerome Loyet
e052da3a6b Fixed bug #62033 (USR2 signal was sent even if not catch when daemonize and an error occured) 2012-05-26 18:48:40 +02:00