clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 14:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
89,388 Commits 494 Branches 1,367 Tags 801 MiB
d3f1abc27d
Commit Graph

52 Commits

Author SHA1 Message Date
George Wang
bb491c2de1 Fixed a bug that header value is not terminated by '\0' when accessed through getenv(). 
Conflicts:
	sapi/litespeed/lsapilib.c
 2015-02-25 11:30:33 -05:00
Stanislav Malyshev
62d6f91b3e Merge branch 'pull-request/1011' 
* pull-request/1011:
  Fix for a previous commit. i read it as size_t, notssize_t.
  Remove useless tests
 2015-02-01 00:21:47 -08:00
Joshua Rogers
d492bc8b6b Fix for a previous commit. i read it as size_t, notssize_t. 2015-02-01 19:02:25 +11:00
Stanislav Malyshev
141b14454c Merge branch 'PHP-5.6' 
* PHP-5.6:
  Use better constant since MAXHOSTNAMELEN may mean shorter name
  use right sizeof for memset

Conflicts:
	ext/sockets/sockaddr_conv.c
	ext/standard/dns.c
 2015-01-31 21:50:08 -08:00
Stanislav Malyshev
6a960b6d1b Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Use better constant since MAXHOSTNAMELEN may mean shorter name
  use right sizeof for memset
 2015-01-31 21:48:40 -08:00
Stanislav Malyshev
af1f867308 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Use better constant since MAXHOSTNAMELEN may mean shorter name
  use right sizeof for memset
 2015-01-31 21:48:14 -08:00
Stanislav Malyshev
2cdbd3537f use right sizeof for memset 2015-01-31 21:30:58 -08:00
Joshua Rogers
eba0e0348e Remove useless tests 
Respective variables are unsigned and cannot be <0.
 2015-01-21 05:23:28 +11:00
Xinchen Hui
fc33f52d8c bump year 2015-01-15 23:27:30 +08:00
Xinchen Hui
0579e8278d bump year 2015-01-15 23:26:37 +08:00
Xinchen Hui
73c1be2653 Bump year 2015-01-15 23:26:03 +08:00
Stanislav Malyshev
b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Veres Lajos
06fdf359e3 typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-23 14:52:47 -08:00
Veres Lajos
4dc994571d typo fixes - https://github.com/vlajos/misspell_fixer 
Conflicts:
	ext/ftp/ftp.h
	ext/pcre/pcrelib/pcre_printint.c
	ext/pcre/pcrelib/sljit/sljitLir.c
	ext/pcre/pcrelib/sljit/sljitLir.h
	ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
	ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
	ext/pgsql/pgsql.c
	ext/phar/func_interceptors.c
	ext/soap/soap.c
	ext/standard/image.c
 2014-11-23 14:33:43 -08:00
Johannes Schlüter
d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
George Wang
b85b78db4f Update LSAPI to 6.7, added support for 'filter_input'. 
Fixed a crash in CLI mode.
 2014-09-03 11:29:44 -04:00
George Wang
bba16dde5d Update LSAPI to 6.7, added support for 'filter_input'. 
Fixed a crash in CLI mode.
 2014-09-03 11:27:54 -04:00
George Wang
582f42b8d4 Update LSAPI to 6.7, added support for 'filter_input'. 
Fixed a crash in CLI mode.
 2014-09-03 11:24:45 -04:00
George Wang
ca8c94c917 fixed broken merged code 2014-07-11 14:57:55 -04:00
George Wang
84373a69dc Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-07-11 14:40:54 -04:00
George Wang
79d8be35f9 Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index. 2014-07-11 14:38:18 -04:00
George Wang
9f721967a3 Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index. 2014-07-11 14:37:39 -04:00
George Wang
0baaf9fade Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index. 2014-07-11 14:31:59 -04:00
Anatol Belski
fbc21af87b Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 
Conflicts:
	sapi/litespeed/lsapilib.h
 2014-07-10 22:15:52 +02:00
Anatol Belski
552cfcc578 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  force ext_dep.js prepend to configure.js in phpize mode
  cleanup file headers.
  Do not kill children process in pre-fork mode when parent process quit.
  update to LSAPI 6.6
  Update LiteSpeed SAPI code to V6.4
  cleanup file headers.
  Do not kill children process in pre-fork mode when parent process quit.
  update to LSAPI 6.6
  Update LiteSpeed SAPI code to V6.4

Conflicts:
	sapi/litespeed/lsapi_main.c
	sapi/litespeed/lsapilib.c
 2014-07-10 22:03:45 +02:00
George Wang
7f41a34c23 cleanup file headers. 2014-07-10 15:53:47 -04:00
George Wang
ad7eae7512 Do not kill children process in pre-fork mode when parent process quit. 2014-07-10 15:53:20 -04:00
George Wang
f0b7db6c4e update to LSAPI 6.6 
Conflicts:
	sapi/litespeed/lsapi_main.c
 2014-07-10 15:52:45 -04:00
George Wang
40d11cc822 cleanup file headers. 2014-07-10 15:34:09 -04:00
George Wang
caceba5973 Do not kill children process in pre-fork mode when parent process quit. 2014-07-10 15:33:48 -04:00
George Wang
ee0c8f8d6f update to LSAPI 6.6 
Conflicts:
	sapi/litespeed/lsapi_main.c
 2014-07-10 15:33:14 -04:00
George Wang
0285720570 Update LiteSpeed SAPI code to V6.4 
Conflicts:
	sapi/litespeed/lsapi_main.c
	sapi/litespeed/lsapidef.h
	sapi/litespeed/lsapilib.c
	sapi/litespeed/lsapilib.h

Conflicts:
	sapi/litespeed/lsapi_main.c
	sapi/litespeed/lsapilib.c
	sapi/litespeed/lsapilib.h
 2014-07-10 15:32:51 -04:00
George Wang
e7f36ba693 cleanup file headers. 2014-07-10 15:14:30 -04:00
George Wang
01a1c3067c Do not kill children process in pre-fork mode when parent process quit. 2014-07-10 15:14:06 -04:00
George Wang
1f46bec9ce update to LSAPI 6.6 
Conflicts:
	sapi/litespeed/lsapi_main.c
 2014-07-10 14:46:43 -04:00
George Wang
e3df0c5f60 Update LiteSpeed SAPI code to V6.4 
Conflicts:
	sapi/litespeed/lsapi_main.c
	sapi/litespeed/lsapidef.h
	sapi/litespeed/lsapilib.c
	sapi/litespeed/lsapilib.h
 2014-07-10 14:42:05 -04:00
George Wang
72e14bfb40 update year & copyright 2014-07-10 14:14:11 -04:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0 Bump year 2014-01-03 11:04:26 +08:00
George Wang
01bc13212e Update LiteSpeed SAPI code to V6.4 2013-11-05 16:14:49 -05: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
63d9c1f40b Merge branch 'PHP-5.4' 
Conflicts:
	sapi/litespeed/lsapi_main.c
 2012-09-05 23:20:42 +08:00
Xinchen Hui
d64d9e3351 year++ 2012-09-05 23:08:05 +08:00
Stanislav Malyshev
23ad275e24 MF53 2011-07-12 04:58:55 +00:00
George Wang
0bcbaa1750 fix socket address parsing code 2011-06-08 16:51:59 +00:00
George Wang
cccba0fa4d fixed keyLen validation point 2010-12-10 22:51:08 +00:00
George Wang
22badf88b0 make STDOUT function as STDERR, in case any module call print() 2009-02-27 23:33:01 +00:00
George Wang
ffe4bd566f *** empty log message *** 2008-09-21 02:38:32 +00:00
George Wang
0f4f00e3ae disable core dump by default 2008-09-21 02:34:08 +00:00