php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 10:43:30 +02:00
Code Issues Packages Projects Releases Wiki Activity
86,072 Commits 549 Branches 1,485 Tags
13401c8098fbb02390dbdf8d9393f937eaefd6ed
Commit Graph

3482 Commits

Author SHA1 Message Date
Remi Collet 13401c8098 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #68421 access.format='%R' doesn't log ipv6 address
 2014-11-14 19:10:43 +01:00
Remi Collet b7bc907cfd Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #68421 access.format='%R' doesn't log ipv6 address
 2014-11-14 19:10:19 +01:00
Remi Collet 5112fdd670 Fix bug #68421 access.format='%R' doesn't log ipv6 address 2014-11-14 19:09:50 +01:00
Remi Collet 871dc9febc Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #68423i PHP-FPM will no longer load all pools
 2014-11-14 17:33:14 +01:00
Remi Collet d66640a334 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #68423i PHP-FPM will no longer load all pools
 2014-11-14 17:32:46 +01:00
Remi Collet 23db119768 Fix bug #68423i PHP-FPM will no longer load all pools 
The hash need to be unique per IP + Port
Previous version have (IPv4 only)
   sprintf(key, "%u.%u.%u.%u:%u", IPQUAD(&sa_in->sin_addr), (unsigned int) ntohs(sa_in->sin_port));
 2014-11-14 17:29:31 +01:00
Anatol Belski f00cf67d1e C89 compat 2014-11-12 17:57:19 +01:00
Anatol Belski 54868c84ce fix int to void* cast on x64 2014-11-12 17:57:15 +01:00
Anatol Belski 96805364fa fix var declaration used by macro conditions 2014-11-10 23:30:15 +01:00
Anatol Belski 5ad7cad103 fix sprintf spec 2014-11-10 23:30:15 +01:00
Anatol Belski 940e69147e fix var usage only when unistd.h available 2014-11-10 23:30:14 +01:00
Anatol Belski c3471cc1c9 cleanup unused variable 2014-11-10 23:30:13 +01:00
Anatol Belski 88ba5a625c do portable socket checks 
also introduced a portable macro for that
 2014-11-10 23:30:12 +01:00
George Wang a8be707bf1 Merge branch 'master' of git.php.net:php-src 2014-11-03 11:44:35 -05:00
George Wang bba11e3255 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-11-03 11:44:13 -05:00
George Wang 79de59e862 set default response code to 200 2014-11-03 11:43:22 -05:00
George Wang 4435161456 set default response code to 200 2014-11-03 11:43:04 -05:00
George Wang 19f3f4b155 set default response code to 200 2014-11-03 11:42:45 -05:00
Bob Weinand 113f1fd6d5 Temporarily disable wait/xml protocol... 2014-10-30 23:09:57 +01:00
Ferenc Kovacs 12fba83c48 Merge branch 'PHP-5.6' 
* PHP-5.6:
  don't try to send in the test results until we restored qa.php.net
  Fix uninitialized value...
  Don't treat warnings as failures in the junit output
 2014-10-30 18:19:48 +01:00
Bob Weinand b9d1dc329f Merge phpdbg into PHP-5.6 2014-10-30 13:17:58 +01:00
Anatol Belski d77ce31763 Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix output globals importing
  export output globals
  use portable strndup implementation
  unix sockets aren't available on windows
  dll export APIs needed by phpdbg
  fix sapi/phpdbg/config.w32
  Don't treat warnings as failures in the junit output
 2014-10-29 20:04:56 +01:00
Anatol Belski fc904569ea fix output globals importing 2014-10-29 20:03:28 +01:00
Anatol Belski 4b8f411d31 use portable strndup implementation 2014-10-29 19:49:20 +01:00
Anatol Belski f842b8f4be unix sockets aren't available on windows 2014-10-29 19:39:46 +01:00
Anatol Belski 79a4339f1b fix sapi/phpdbg/config.w32 2014-10-29 19:28:21 +01:00
Bob Weinand 3e9138e6b5 Merge remote-tracking branch 'origin/PHP-5.6' 2014-10-29 11:44:46 +01:00
Bob Weinand 68b5dd2ba9 Merge phpdbg into PHP-5.6 2014-10-29 11:43:01 +01:00
Remi Collet 770473a648 Merge branch 'PHP-5.6' 
* PHP-5.6:
  cleanup uneeded json
 2014-10-29 07:26:58 +01:00
Remi Collet 7dd871438f cleanup uneeded json 2014-10-29 07:26:41 +01:00
Bob Weinand 4fec48d1b0 Merge remote-tracking branch 'origin/PHP-5.6' 2014-10-28 23:07:46 +01:00
Bob Weinand 47fd168fed Move missing zend_hash_* macros from phpdbg.h to zend_hash.h 2014-10-28 23:07:36 +01:00
Bob Weinand a5415456d4 Merge phpdbg into PHP-5.6 2014-10-28 23:06:50 +01:00
Bob Weinand 66aead4b5f Merge remote-tracking branch 'origin/PHP-5.6' 
Conflicts:
	sapi/phpdbg/phpdbg_wait.c
	sapi/phpdbg/phpdbg_webdata_transfer.c
 2014-10-28 23:00:10 +01:00
Bob Weinand be5d389768 Merge phpdbg into PHP-5.6 2014-10-28 22:44:29 +01:00
Bob Weinand 6150d9342c Merge ../phpdbg into PHP-5.6 
Conflicts:
	sapi/phpdbg/config.m4
 2014-10-28 22:15:05 +01:00
Remi Collet 9afb17868c Merge branch 'PHP-5.6' 
* PHP-5.6:
  fix phpdbg build when src tree != build tree
 2014-10-28 19:13:27 +01:00
Remi Collet 9028846c63 fix phpdbg build when src tree != build tree 2014-10-28 19:12:41 +01:00
Bob Weinand ec53351447 Merge remote-tracking branch 'origin/PHP-5.6' 
Conflicts:
	configure.in
	main/php_version.h
	sapi/phpdbg/phpdbg.c
	sapi/phpdbg/phpdbg_bp.c
	sapi/phpdbg/phpdbg_prompt.c
 2014-10-28 17:40:27 +01:00
Bob Weinand 297baa0c18 Remove the ugly hack via a temp file to store breakpoints 2014-10-28 17:25:48 +01:00
Bob Weinand fd8a70b1ee Typo (notfoundc => notfound) 2014-10-28 17:25:46 +01:00
Bob Weinand 76bd799eb7 Fix quitting on a second run 2014-10-28 17:25:46 +01:00
Bob Weinand c34fd92466 Fix wrong exec length on relative paths 2014-10-28 17:25:45 +01:00
Bob Weinand cc3587f4a3 Fix possibly unclosed <stream> tags 2014-10-28 17:25:45 +01:00
Bob Weinand 79c66e7cd2 Fix potential segfaults and unresolved breaks 2014-10-28 17:25:43 +01:00
Bob Weinand fe5f5d40f2 *Always* clean up and run destructors 2014-10-28 17:25:43 +01:00
Bob Weinand baba4254ce Merge remote-tracking branch 'origin/PHP-5.6' 
Conflicts:
	sapi/phpdbg/phpdbg_bp.c
 2014-10-27 14:32:58 +01:00
Bob Weinand 0ede82d466 Merge phpdbg into PHP-5.6 2014-10-27 14:07:26 +01:00
Bob Weinand a3ae401524 Merge remote-tracking branch 'origin/PHP-5.6' 2014-10-27 13:19:33 +01:00
Bob Weinand 6eab2b9101 Merge phpdbg into PHP-5.6 
Conflicts:
	sapi/phpdbg/phpdbg.c
	sapi/phpdbg/phpdbg_prompt.c
 2014-10-27 13:11:13 +01:00