php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-21 23:18:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
72,213 Commits 549 Branches 1,484 Tags
2e6a4a286e41c02fb0eb7f1a72803dabbbf727de
Commit Graph

2877 Commits

Author SHA1 Message Date
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
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 9ed421e3d7 - Fixed bug #62947 (Unneccesary warnings on FPM) 2012-09-28 01:09:31 +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 c8b7ea0f57 - fix merge (fucking git merging system ... :( ) 2012-09-28 00:55:06 +02:00
Jerome Loyet 9e4c0b8142 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - 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)
 2012-09-28 00:53:43 +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 ace1bf9740 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #62954 (startup problems fpm / php-fpm) - Fixed bug #62886 (PHP-FPM may segfault/hang on startup)
 2012-09-28 00:08:13 +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 d0e96a5575 Merge branch 'PHP-5.4' 2012-09-18 22:17:36 +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
Stanislav Malyshev 6cc9d99dc2 Merge branch 'PHP-5.4' 
* PHP-5.4:
  Respond with 501 to unknown request methods
 2012-09-15 23:11:55 -07: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 63d9c1f40b Merge branch 'PHP-5.4' 
Conflicts:
	sapi/litespeed/lsapi_main.c
 2012-09-05 23:20:42 +08: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 e7a714b35e Merging PR 121 to add support for slow request counting on the PHP-FPM status page 2012-08-26 17:09:46 +02: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 75cf51de50 Merge branch 'PHP-5.4' 2012-08-18 12:22:47 +08:00
Xinchen Hui ebefbdb76d Fix test failed 2012-08-18 12:21:48 +08:00
Felipe Pena f84947c688 Merge branch 'PHP-5.4' 
* PHP-5.4:
  - Fixed bug #62829 (stdint.h included on platform where HAVE_STDINT_H is not set)
 2012-08-16 15:45:40 -03: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
Stanislav Malyshev c9eb64127e Merge branch 'pull-request/132' 
* pull-request/132:
  OK, bye bye JavaScript, let's just include credits before license
  Nicer (JSLint-compliant!) credits reveal JavaScript
  Removed now-unnecessary expose_php checks for logo
  Fixed small misalignment in prev commit
  Removed Logo GUIDs and replaced with Data URIs and div hidden with JS
 2012-08-05 21:15:53 -07:00
Xinchen Hui 7e4c0125da Merge branch 'PHP-5.4' 2012-08-02 23:05:09 +08: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 7e37860246 Merge branch 'PHP-5.4' 2012-08-01 23:56:44 +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
Xinchen Hui 38c38e677e Merge branch 'PHP-5.4' 2012-07-31 22:43:10 +08:00