clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 23:06:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
79,886 Commits 494 Branches 1,367 Tags 802 MiB
bad5502ca9
Commit Graph

79886 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
c79a6a0613 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix makefile in phpize mode
 2014-07-11 15:07:22 +02:00
Anatol Belski
b10ed89dac Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix makefile in phpize mode
 2014-07-11 15:06:56 +02:00
Anatol Belski
ae313b6037 fix makefile in phpize mode 
- extend LDFLAGS with dynamically generated ones
- prevend dynamically generated CFLAGS to be overridden by hardcoded ones
 2014-07-11 15:05:01 +02:00
Anatol Belski
e0d6ed6b21 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fixe output_as_table() when no ext was enabled
 2014-07-11 09:38:44 +02:00
Anatol Belski
f3d565f6ac Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fixe output_as_table() when no ext was enabled
 2014-07-11 09:37:19 +02:00
Anatol Belski
9f5cf7d41a fixe output_as_table() when no ext was enabled 2014-07-11 09:36:44 +02:00
Anatol Belski
63abaa6d69 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix end of stream exception when generating makefile
 2014-07-10 22:35:23 +02:00
Anatol Belski
efcc789ef8 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix end of stream exception when generating makefile
 2014-07-10 22:34:55 +02:00
Anatol Belski
02b661ecfc fix end of stream exception when generating makefile 2014-07-10 22:33:55 +02: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
Anatol Belski
cc67cf6322 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  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
 2014-07-10 21:51:32 +02:00
Anatol Belski
1f90dd3359 force ext_dep.js prepend to configure.js in phpize mode 2014-07-10 21:50:37 +02: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
232661bf88 Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-07-10 14:14:38 -04:00
George Wang
72e14bfb40 update year & copyright 2014-07-10 14:14:11 -04:00
Anatol Belski
71f4b1e4d9 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  turn off PGO in phpize mode
  Fixed typo in Makefile.frag
  Fixed typo in Makefile.frag
 2014-07-10 19:37:12 +02:00
Anatol Belski
ec6b367722 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  turn off PGO in phpize mode
  Fixed typo in Makefile.frag
 2014-07-10 19:36:04 +02:00
Anatol Belski
e2b0d97950 turn off PGO in phpize mode 2014-07-10 19:35:26 +02:00
George Wang
eb7bf5d30a Fixed typo in Makefile.frag 2014-07-10 12:22:56 -04:00
George Wang
a34288fa1a Fixed typo in Makefile.frag 2014-07-10 12:21:23 -04:00
Anatol Belski
a8076b9312 explicitly PHP_ANALYZER=no when no known keyword was passed 2014-07-10 15:20:34 +02:00
Stanislav Malyshev
f0f6d24bc8 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  5.4.31
  fix unstable test
  5.5.16 now
 2014-07-08 21:42:20 -07:00
Stanislav Malyshev
393bf0e4bb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  5.4.31
  fix unstable test

Conflicts:
	configure.in
	main/php_version.h
 2014-07-08 21:41:06 -07:00
Stanislav Malyshev
b93ea59665 5.4.31 2014-07-08 21:26:39 -07:00
Stanislav Malyshev
0ba74fccff update NEWS 2014-07-08 15:05:05 -07:00
Stanislav Malyshev
cd1130751d fix unstable test 2014-07-08 15:04:09 -07:00
Julien Pauli
0211185548 5.5.16 now 2014-07-08 23:54:19 +02:00
Stanislav Malyshev
062f1482c3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix unstable test
 2014-07-08 14:32:27 -07:00
Stanislav Malyshev
f559976be6 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  fix unstable test
 2014-07-08 14:31:40 -07:00
Stanislav Malyshev
64e4261c9b fix unstable test 2014-07-08 14:13:46 -07:00
Stanislav Malyshev
35259e1d53 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #67587: Redirection loop on nginx with FPM
 2014-07-08 12:55:02 -07:00
Christian Weiske
e65e013e15 Fix bug #67587: Redirection loop on nginx with FPM 
Redirection will work correctly as long as PATH_INFO is available,
e.g. via the following nginx configuration:

    set $path_info $fastcgi_path_info;
    fastcgi_param PATH_INFO $path_info;
 2014-07-08 12:54:57 -07:00
Stanislav Malyshev
5312c39cfb Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fix bug #67587: Redirection loop on nginx with FPM
 2014-07-08 12:54:20 -07:00
Christian Weiske
0bf50a8302 Fix bug #67587: Redirection loop on nginx with FPM 
Redirection will work correctly as long as PATH_INFO is available,
e.g. via the following nginx configuration:

    set $path_info $fastcgi_path_info;
    fastcgi_param PATH_INFO $path_info;
 2014-07-08 12:53:45 -07:00
Anatol Belski
b9ead7c67d Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  updated NEWS
  updated NEWS
 2014-07-08 10:08:24 +02:00
Anatol Belski
0d80e6cba0 updated NEWS 2014-07-08 10:08:10 +02:00