php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-07 08:02:49 +02:00
Code Issues Packages Projects Releases Wiki Activity
73,887 Commits 547 Branches 1,481 Tags
4ee7bbdd080caa81f66857b157488e9f18093aee
Commit Graph

2909 Commits

Author SHA1 Message Date
Johannes Schlüter
d900382814 Merge branch 'PHP-5.4' into PHP-5.5 2013-03-24 17:33:17 +01:00
Johannes Schlüter
6f560b0487 Document embedded server options in manpage 2013-03-24 17:32:30 +01:00
Johannes Schlüter
de71f435d8 Merge branch 'PHP-5.3' into PHP-5.4 2013-03-24 17:32:00 +01:00
Johannes Schlüter
66682f5abe It's 2013, even for a manpage 2013-03-24 17:31:29 +01:00
Pierre Joye
0179284bfb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - add reminder for checking return values
 2013-03-24 13:29:16 +01:00
Pierre Joye
bb18fa448c - add reminder for checking return values 2013-03-24 13:27:00 +01:00
Anatol Belski
ec26141f92 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  - fix x64 issues on windows with the various time types (overflow, signed and unsigned bits ops, etc.) causing crashes on start, error or log, must be done in win32/time.c for some of these functions too
 2013-03-23 22:43:58 +01:00
Pierre Joye
3af4896837 - fix x64 issues on windows with the various time types (overflow, signed and unsigned bits ops, etc.) causing crashes on start, error or log, must be done in win32/time.c for some of these functions too 
Signed-off-by: Anatol Belski <ab@php.net>
 2013-03-23 22:42:03 +01:00
Keyur Govande
a0a995cff3 Support for CLI process title (https://wiki.php.net/rfc/cli_process_title) 
A new commit into branch 5.5
 2013-03-07 18:54:34 +00:00
Stanislav Malyshev
c877fcf6ec Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Added HTTP codes as of RFC 6585
 2013-02-17 01:20:14 -08:00
Jonh Wendell
59b016192d Added HTTP codes as of RFC 6585 
Added descriptions for the new HTTP codes:

- 428 Precondition Required
- 429 Too Many Requests
- 431 Request Header Fields Too Large
- 511 Network Authentication Required
 2013-02-17 01:18:40 -08:00
Remi Collet
5d3501c7d4 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed bug #64128 buit-in web server is broken on ppc64.
 2013-02-01 19:26:11 +01:00
Remi Collet
0cea9e6843 Fixed bug #64128 buit-in web server is broken on ppc64. 
fdset management using bit operator is broken on non-x86 arch
and cause built-in server the enter an infinite loop of "select"
and never handle any request.
 2013-02-01 19:23:25 +01:00
Adam Harvey
77010bf9bf Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Update the arguments in the prototype of fpm_socket_unix_test_connect().
 2013-01-16 10:19:13 +08:00
Adam Harvey
142c40f32c Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Update the arguments in the prototype of fpm_socket_unix_test_connect().
 2013-01-16 10:18:00 +08:00
Adam Harvey
f63a9f6c11 Update the arguments in the prototype of fpm_socket_unix_test_connect(). 
Fixes bug #63999 (php with fpm fails to build on Solaris 10 or 11).
 2013-01-16 10:06:56 +08:00
Lars Strojny
785e66adb5 PR #260: Update css for 404 pages to feel more up to date and have a consistent layout across browsers 2013-01-14 20:43:14 +01:00
George Wang
9c52d09ebc 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]
 2013-01-08 11:40:13 +08:00
Stanislav Malyshev
80a9a80a52 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Bug #43177: If an eval() has a parse error, the overall exit status and return code should not be affected.
  fix NEWS

Conflicts:
	main/main.c
 2013-01-01 21:20:35 -08:00
Stanislav Malyshev
36e19c9cab Bug #43177: If an eval() has a parse error, the overall exit status and return code should not be affected. 
Without this fix, a webpage using eval() may return code 500.  That might display
fine and the 500 go unnoticed, but using AJAX or wget, the 500 will cause problems.
 2013-01-01 21:18:59 -08: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
Xinchen Hui
a2045ff332 Happy New Year~ 2013-01-01 16:02:16 +08:00
Lars Strojny
aaa5e42177 Merge branch 'PHP-5.4' into PHP-5.5 2012-12-14 14:56:25 +01:00
pascalc
d813af0618 update test for supported Mime Types checking 2012-12-14 13:59:06 +01:00
pascalc
e5b1ebc082 update list of common Mime Types in PHP development server to support Web audio/video formats (Webm ,and Ogg containers) + have jpeg mime types listed together 2012-12-14 13:59:01 +01:00
Remi Collet
bc7f2b5f41 Merge branch 'PHP-5.3' into PHP-5.5 
* PHP-5.3:
  Fixed Bug #63581 Possible buffer overflow
  Fixed Bug #63581 Possible null dereference
 2012-11-28 10:38:37 +01:00
Remi Collet
487b7c7f32 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed Bug #63581 Possible buffer overflow
  Fixed Bug #63581 Possible null dereference
 2012-11-28 10:38:13 +01:00
Remi Collet
bc492007da Fixed Bug #63581 Possible buffer overflow 
In fpm-log, possible buffer overflow. Check for length is done at
the beginning of the loop, so is not done when overflow occurs
on the last loop (len = 1024 or 1025). (ack from fat).

This issue where found from by static code analysis tool and, so,
I can't provide any reproducer.
 2012-11-28 10:35:04 +01:00
Remi Collet
f08060a48f Fixed Bug #63581 Possible null dereference 
Possible NULL dereference when trying to delete the single item
of a list (ack from fat).

This issues where found from by static code analysis tool and,
so, I can't provide any reproducer.
 2012-11-28 10:28:18 +01:00
Anatoliy Belsky
01f1894194 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed test sapi/cli/tests/006.phpt
 2012-11-14 16:23:36 +01:00
Anatoliy Belsky
3d82f16c7d Fixed test sapi/cli/tests/006.phpt 
Third param in preg_match_all() is optional for a while )
 2012-11-14 16:20:59 +01:00
Anatoliy Belsky
64d7297506 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Enabled apache 2.4 handler build option
 2012-11-13 19:48:34 +01:00
Anatoliy Belsky
117d2dd688 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Enabled apache 2.4 handler build option

Conflicts:
	sapi/apache2handler/config.w32
 2012-11-13 19:40:22 +01:00
Pierre Joye
019bdff395 Enabled apache 2.4 handler build option 2012-11-13 19:34:00 +01:00
Xinchen Hui
7e2c87bf2b Add missed file 2012-10-24 10:34:44 +08:00
Xinchen Hui
610c7fbe7b Remove executable permission on phpt 2012-10-10 10:27:49 +08:00
Xinchen Hui
ea441bd08d Implemented FR #63242 (Default error page in PHP built-in web server uses outdated html/css) 2012-10-10 17:23:30 +08:00
Xinchen Hui
e081c55fb5 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:31:31 +08:00
George Wang
1407b4a080 Merge branch '5.4' 
* 5.4:
  sapi/litespeed/lsapi_main.c: Fix bug #63228
 2012-10-12 13:29:37 -04:00
George Wang
68e528a6bc Merge branch '5.3' into 5.4 
* 5.3:
  sapi/litespeed/lsapi_main.c: Fix bug #63228
 2012-10-12 13:09:53 -04:00
George Wang
22611b8d37 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]
 2012-10-12 13:04:22 -04:00
Xinchen Hui
7a7b2a0642 Merge branch 'PHP-5.4' 2012-10-10 17:24:40 +08:00
Xinchen Hui
4b152e5470 Merge branch 'PHP-5.4' 2012-10-10 10:32:38 +08:00
Jerome Loyet
284ea56d4d Merge branch 'PHP-5.4' 
* PHP-5.4:
  Add missing NEWS entry
  Fixed bug #62216
 2012-09-28 11:22:59 +02:00
Jerome Loyet
b530f53c67 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  Fixed bug #62216
 2012-09-28 11:21:12 +02:00
Jerome Loyet
bb02fd5772 Fixed bug #62216 
Add PID to php-fpm init.d script
 2012-09-28 11:18:08 +02:00
Jerome Loyet
68eb608f3c - Fixed bug #62887 (Only /status?plain&full gives "last request cpu") 2012-09-28 01:26:20 +02:00
Jerome Loyet
9ef925b351 - Fixed bug #62887 (Only /status?plain&full gives "last request cpu") 2012-09-28 01:25:51 +02:00
Jerome Loyet
151b16cf7f - Fixed bug #62887 (Only /status?plain&full gives "last request cpu") 2012-09-28 01:24:52 +02:00