18feaf9416
Merge branch 'PHP-5.5' into PHP-5.6
2014-07-12 11:10:15 +08:00
377750cd8f
Updated NEWS for 34407
2014-07-12 11:09:35 +08:00
8757e2cab8
Merge branch 'PHP-5.4' into PHP-5.5
2014-07-12 11:08:50 +08:00
f25ff02b54
Updated NEWS for 34407
2014-07-12 11:07:06 +08:00
4fc0d46ae7
Fix for bug #34407 - ucwords and title case
...
Added support for ranges like trim() has
2014-07-12 10:44:11 +08:00
ca8c94c917
fixed broken merged code
2014-07-11 14:57:55 -04:00
84373a69dc
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
2014-07-11 14:40:54 -04:00
a5f2b002b4
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
2014-07-11 14:39:03 -04:00
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
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
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
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
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
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
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
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
9f5cf7d41a
fixe output_as_table() when no ext was enabled
2014-07-11 09:36:44 +02:00
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
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
02b661ecfc
fix end of stream exception when generating makefile
2014-07-10 22:33:55 +02:00
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
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
7f41a34c23
cleanup file headers.
2014-07-10 15:53:47 -04:00
ad7eae7512
Do not kill children process in pre-fork mode when parent process quit.
2014-07-10 15:53:20 -04:00
f0b7db6c4e
update to LSAPI 6.6
...
Conflicts:
sapi/litespeed/lsapi_main.c
2014-07-10 15:52:45 -04:00
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
1f90dd3359
force ext_dep.js prepend to configure.js in phpize mode
2014-07-10 21:50:37 +02:00
40d11cc822
cleanup file headers.
2014-07-10 15:34:09 -04:00
caceba5973
Do not kill children process in pre-fork mode when parent process quit.
2014-07-10 15:33:48 -04:00
ee0c8f8d6f
update to LSAPI 6.6
...
Conflicts:
sapi/litespeed/lsapi_main.c
2014-07-10 15:33:14 -04:00
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
e7f36ba693
cleanup file headers.
2014-07-10 15:14:30 -04:00
01a1c3067c
Do not kill children process in pre-fork mode when parent process quit.
2014-07-10 15:14:06 -04:00
1f46bec9ce
update to LSAPI 6.6
...
Conflicts:
sapi/litespeed/lsapi_main.c
2014-07-10 14:46:43 -04:00
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
232661bf88
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
2014-07-10 14:14:38 -04:00
72e14bfb40
update year & copyright
2014-07-10 14:14:11 -04:00
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
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
e2b0d97950
turn off PGO in phpize mode
2014-07-10 19:35:26 +02:00
eb7bf5d30a
Fixed typo in Makefile.frag
2014-07-10 12:22:56 -04:00
a34288fa1a
Fixed typo in Makefile.frag
2014-07-10 12:21:23 -04:00
a8076b9312
explicitly PHP_ANALYZER=no when no known keyword was passed
2014-07-10 15:20:34 +02:00
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
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
b93ea59665
5.4.31
2014-07-08 21:26:39 -07:00
0ba74fccff
update NEWS
2014-07-08 15:05:05 -07:00
cd1130751d
fix unstable test
2014-07-08 15:04:09 -07:00
0211185548
5.5.16 now
2014-07-08 23:54:19 +02:00
062f1482c3
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix unstable test
2014-07-08 14:32:27 -07:00
Tjerk Meesters