clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-03 15:56:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
69,809 Commits 494 Branches 1,367 Tags 813 MiB
39cc08c7e9
Commit Graph

2661 Commits

Author SHA1 Message Date
Nikita Popov
92aa361bfc Forgot to fix the test on 5.4 2013-03-28 18:42:01 +01:00
Xinchen Hui
ef93a93ee2 Attempt to fix SKIP 2013-03-28 23:22:20 +08:00
Xinchen Hui
ab089611e0 Fix test on Mac (\D shows up) 2013-03-28 14:34:08 +08:00
Xinchen Hui
467cd6a60f Add test for #64529 2013-03-28 13:45:42 +08: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
bb18fa448c - add reminder for checking return values 2013-03-24 13:27:00 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
Jerome Loyet
be043ab6d0 Merge branch 'fuckgit' into PHP-5.4 
* fuckgit:
  - Fixed bug #62947 (Unneccesary warnings on FPM)
  - Fixed bug #63085 (Systemd integration and daemonize)

Conflicts:
	sapi/fpm/config.m4
 2012-09-28 01:19:01 +02:00
Jerome Loyet
72f3457161 - Fixed bug #62947 (Unneccesary warnings on FPM) 2012-09-28 01:08:48 +02:00
Jerome Loyet
e31553c204 - Fixed bug #62947 (Unneccesary warnings on FPM) 2012-09-28 01:08:08 +02:00
Jerome Loyet
64a0e7cdc2 - Fixed bug #63085 (Systemd integration and daemonize) 2012-09-28 00:53:05 +02:00
Jerome Loyet
2259a8f18b - add missing php-fpm.service.in 2012-09-28 00:47:56 +02:00
Jerome Loyet
b2f4e686f0 Merge branch 'PHP-5.3' into PHP-5.4 
* PHP-5.3:
  - Fixed bug #63085 (Systemd integration and daemonize)
  - Fixed bug #62954 (startup problems fpm / php-fpm) - Fixed bug #62886 (PHP-FPM may segfault/hang on startup)

Conflicts:
	sapi/fpm/config.m4
 2012-09-28 00:39:29 +02:00
Jerome Loyet
851a04bb7b - Fixed bug #63085 (Systemd integration and daemonize) 2012-09-28 00:33:05 +02:00
Jerome Loyet
b5eb1456aa - Fixed bug #62954 (startup problems fpm / php-fpm) 
- Fixed bug #62886 (PHP-FPM may segfault/hang on startup)
 2012-09-28 00:05:48 +02:00
Jerome Loyet
75c63c5503 - Fixed bug #62954 (startup problems fpm / php-fpm) 
- Fixed bug #62886 (PHP-FPM may segfault/hang on startup)
 2012-09-27 23:54:35 +02:00
Lars Strojny
aa133ea282 Merged GitHub PR #190: Support for the HTTP PATCH method in CLI webserver 2012-09-18 22:16:51 +02:00
Niklas Lindgren
27542db4e7 Respond with 501 to unknown request methods 
Fixed typo

Moved 501 response from dispatch to event_read_request

Return return value of send_error_page
 2012-09-15 23:11:12 -07:00
Xinchen Hui
9d44ff640c Merge branch 'PHP-5.3' into PHP-5.4 
Conflicts:
	ext/interbase/interbase.rc
 2012-09-05 23:11:19 +08:00
Xinchen Hui
d64d9e3351 year++ 2012-09-05 23:08:05 +08:00
Lars Strojny
8e7081f3ac Merging PR 121 to add support for slow request counting on the PHP-FPM status page 2012-08-26 17:02:39 +02:00
Xinchen Hui
ebefbdb76d Fix test failed 2012-08-18 12:21:48 +08:00
Felipe Pena
2e1d31d123 - Fixed bug #62829 (stdint.h included on platform where HAVE_STDINT_H is not set) 2012-08-16 15:45:21 -03:00
Xinchen Hui
d1f0662e4d Fixed bug #62725 (Calling exit() in a shutdown function does not return the exit value) 
The fix is make 5.4 behavior consistent with 5.3
 2012-08-02 23:03:38 +08:00
Xinchen Hui
36100060b3 Sleep a little bit more, in some slow machine (like gcov), it will take a little more time to setup server 2012-08-01 23:54:01 +08:00