mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-25 01:40:50 +08:00
Code Issues Packages Projects Releases Wiki Activity
90,059 Commits 503 Branches 1,387 Tags 848 MiB
738c71aa9a
Commit Graph

122 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
1b53a99fbf Remove dead codes 2015-01-19 10:46:59 -05: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
Xinchen Hui
d805fa0d81 Fixed #68790 (Missing return) 2015-01-10 22:19:49 -05:00
Stanislav Malyshev
b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Xinchen Hui
f579ae81c9 Fixed build of litespped 2014-12-29 13:46:01 +08:00
Anatol Belski
bdeb220f48 first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01: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
Stanislav Malyshev
96cde1841a Revert "made lsapi_main.c compatible with PHP7/phpng ." 
This reverts commit 9fb816f45a.
Not a security-related fix.
 2014-11-22 00:38:04 -08:00
George Wang
dce692dfa0 made lsapi_main.c compatible with PHP7/phpng . 
Conflicts:
	sapi/litespeed/lsapi_main.c
 2014-11-20 16:54:42 -05:00
George Wang
620db04e91 made lsapi_main.c compatible with PHP7/phpng . 2014-11-20 16:50:15 -05:00
George Wang
bd3bc097b0 made lsapi_main.c compatible with PHP7/phpng . 2014-11-20 16:49:56 -05:00
George Wang
9fb816f45a made lsapi_main.c compatible with PHP7/phpng . 2014-11-20 16:49:01 -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
George Wang
1a2ec3fc60 set default response code to 200 2014-11-03 11:42:01 -05:00
George Wang
2fd7d60ea0 Merge branch 'master' of git.php.net:php-src 2014-10-03 16:43:58 -04:00
George Wang
a7d2747890 Fixed a bug that causes crash when environment variable is access while parsing php.ini 2014-10-03 16:42:42 -04:00
George Wang
5b08e56eca Fixed a bug that causes crash when environment variable is access while parsing php.ini 2014-10-03 16:42:27 -04:00
George Wang
0cc2600ec6 Fixed a bug that causes crash when environment variable is access while parsing php.ini 2014-10-03 16:42:15 -04:00
George Wang
26ff3a4c1e Fixed a bug that causes crash when environment variable is access while parsing php.ini 2014-10-03 16:41:32 -04:00
Johannes Schlüter
d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
George Wang
2470e01ab6 Fine tuned the order of adding request variables. 2014-09-09 00:01:36 -04:00
George Wang
4bdd9aabdd Fine tuned the order of adding request variables. 2014-09-09 00:01:03 -04:00
George Wang
bdac08bcdd Fine tuned the order of adding request variables. 2014-09-09 00:00:14 -04:00
George Wang
d2e1a04b10 Fine tuned the order of adding request variables. 2014-09-08 23:58:05 -04:00
Nikita Popov
00805ffb92 Merge branch 'PHP-5.6' 
Conflicts:
	ext/soap/php_http.c
 2014-09-04 21:23:11 +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
Anatol Belski
c3e3c98ec6 master renames phase 1 2014-08-25 19:24:55 +02:00
Anatol Belski
63d3f0b844 basic macro replacements, all at once 2014-08-19 08:07:31 +02:00
Dmitry Stogov
32e477c98c Merge branch 'master' into phpng 
* master: (40 commits)
  Bug #67609: TLS connections fail behind HTTP proxy
  Updated NEWS for #67594
  Updated NEWS for #67594
  Fix #67594 - invisible colon should be stripped off header name
  Updated NEWS for 34407
  Updated NEWS for 34407
  Updated NEWS for 34407
  Fix for bug #34407 - ucwords and title case
  fixed broken merged code
  Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
  fixed broken merged code
  Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
  Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
  Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
  Test output relies on expose_php being on
  1.2 is a problematic float to print out Lower the default display precision for this test
  The test output is dependent on expose_php ini
  fix makefile in phpize mode
  fixe output_as_table() when no ext was enabled
  fix end of stream exception when generating makefile
  ...

Conflicts:
	ext/standard/http_fopen_wrapper.c
	ext/standard/string.c
	sapi/cli/php_cli_server.c
 2014-07-14 11:44:53 +04:00
George Wang
e05fb6ee01 fixed broken merged code 2014-07-11 15:02:02 -04:00
George Wang
2d7625a1b8 Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index. 2014-07-11 15:00:36 -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