granicus.if.org Git

]> granicus.if.org Git - php/log

projects / php / log

commit | commitdiff | tree

Anatol Belski [Thu, 17 Jul 2014 19:49:23 +0000 (21:49 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
implemented usage of the non core ext deps in phpize mode

commit | commitdiff | tree

Anatol Belski [Thu, 17 Jul 2014 19:49:08 +0000 (21:49 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
implemented usage of the non core ext deps in phpize mode

commit | commitdiff | tree

Anatol Belski [Thu, 17 Jul 2014 19:48:46 +0000 (21:48 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
implemented usage of the non core ext deps in phpize mode

commit | commitdiff | tree

Anatol Belski [Thu, 17 Jul 2014 19:47:15 +0000 (21:47 +0200)]

implemented usage of the non core ext deps in phpize mode

commit | commitdiff | tree

Anatol Belski [Thu, 17 Jul 2014 07:32:44 +0000 (09:32 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
implemented force usage of generated .h and .js deps in phpize mode

commit | commitdiff | tree

Anatol Belski [Thu, 17 Jul 2014 07:32:31 +0000 (09:32 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
implemented force usage of generated .h and .js deps in phpize mode

commit | commitdiff | tree

Anatol Belski [Thu, 17 Jul 2014 07:26:46 +0000 (09:26 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
implemented force usage of generated .h and .js deps in phpize mode

commit | commitdiff | tree

Anatol Belski [Thu, 17 Jul 2014 07:25:57 +0000 (09:25 +0200)]

implemented force usage of generated .h and .js deps in phpize mode

commit | commitdiff | tree

Anatol Belski [Wed, 16 Jul 2014 19:35:18 +0000 (21:35 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  basic routines for phpize mode to
  This test depends on expose_php being on
  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

commit | commitdiff | tree

Anatol Belski [Wed, 16 Jul 2014 19:35:04 +0000 (21:35 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  basic routines for phpize mode to
  This test depends on expose_php being on
  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

commit | commitdiff | tree

Anatol Belski [Wed, 16 Jul 2014 19:34:19 +0000 (21:34 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
basic routines for phpize mode to

commit | commitdiff | tree

Anatol Belski [Wed, 16 Jul 2014 19:33:07 +0000 (21:33 +0200)]

basic routines for phpize mode to

- generate headers for non core ext defines
- generate js deps for non core exts

commit | commitdiff | tree

Andrey Hristov [Wed, 16 Jul 2014 16:50:41 +0000 (19:50 +0300)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Andrey Hristov [Wed, 16 Jul 2014 16:50:28 +0000 (19:50 +0300)]

Easier to read

commit | commitdiff | tree

Andrey Hristov [Wed, 16 Jul 2014 16:25:31 +0000 (19:25 +0300)]

Merge branch 'PHP-5.6'

Conflicts:
NEWS

commit | commitdiff | tree

Andrey Hristov [Wed, 16 Jul 2014 16:24:39 +0000 (19:24 +0300)]

Add some trace info as well as update CLIENT_ flags

commit | commitdiff | tree

Lior Kaplan [Wed, 16 Jul 2014 14:45:23 +0000 (17:45 +0300)]

Fix my name in the given credit

commit | commitdiff | tree

Daniel Lowrey [Wed, 16 Jul 2014 04:15:05 +0000 (00:15 -0400)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Daniel Lowrey [Wed, 16 Jul 2014 03:55:30 +0000 (23:55 -0400)]

Update NEWS for PR#723 merge

commit | commitdiff | tree

Lior Kaplan [Tue, 15 Jul 2014 21:10:29 +0000 (00:10 +0300)]

Add ifdef on ecdh for single_ecdh_use

Allows build with OpenSSL < 0.9.8

commit | commitdiff | tree

Anatol Belski [Mon, 14 Jul 2014 18:28:23 +0000 (20:28 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  fix C89 compat
  This test depends on expose_php being on
  The test output is dependent on expose_php ini
  1.2 is a problematic float to print out Lower the default display precision for this test
  Test output relies on expose_php being on

commit | commitdiff | tree

Anatol Belski [Mon, 14 Jul 2014 18:27:59 +0000 (20:27 +0200)]

fix C89 compat

commit | commitdiff | tree

Rasmus Lerdorf [Mon, 14 Jul 2014 15:21:27 +0000 (08:21 -0700)]

This test depends on expose_php being on

commit | commitdiff | tree

Rasmus Lerdorf [Mon, 14 Jul 2014 15:21:27 +0000 (08:21 -0700)]

This test depends on expose_php being on

commit | commitdiff | tree

Rasmus Lerdorf [Mon, 14 Jul 2014 15:21:27 +0000 (08:21 -0700)]

This test depends on expose_php being on

commit | commitdiff | tree

Rasmus Lerdorf [Fri, 11 Jul 2014 17:59:02 +0000 (10:59 -0700)]

Test output relies on expose_php being on

commit | commitdiff | tree

Rasmus Lerdorf [Fri, 11 Jul 2014 17:29:40 +0000 (10:29 -0700)]

1.2 is a problematic float to print out
Lower the default display precision for this test

commit | commitdiff | tree

Rasmus Lerdorf [Fri, 11 Jul 2014 16:12:32 +0000 (09:12 -0700)]

The test output is dependent on expose_php ini

commit | commitdiff | tree

Rasmus Lerdorf [Fri, 11 Jul 2014 16:12:32 +0000 (09:12 -0700)]

The test output is dependent on expose_php ini

commit | commitdiff | tree

Rasmus Lerdorf [Fri, 11 Jul 2014 17:29:40 +0000 (10:29 -0700)]

1.2 is a problematic float to print out
Lower the default display precision for this test

commit | commitdiff | tree

Rasmus Lerdorf [Fri, 11 Jul 2014 17:59:02 +0000 (10:59 -0700)]

Test output relies on expose_php being on

commit | commitdiff | tree

Anatol Belski [Mon, 14 Jul 2014 07:53:47 +0000 (09:53 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
added headers install to phpize mode

commit | commitdiff | tree

Anatol Belski [Mon, 14 Jul 2014 07:53:34 +0000 (09:53 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
added headers install to phpize mode

commit | commitdiff | tree

Anatol Belski [Mon, 14 Jul 2014 07:53:16 +0000 (09:53 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
added headers install to phpize mode

commit | commitdiff | tree

Anatol Belski [Mon, 14 Jul 2014 07:52:39 +0000 (09:52 +0200)]

added headers install to phpize mode

commit | commitdiff | tree

Daniel Lowrey [Sat, 12 Jul 2014 14:56:57 +0000 (10:56 -0400)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Daniel Lowrey [Sat, 12 Jul 2014 14:49:42 +0000 (10:49 -0400)]

Bug #67609: TLS connections fail behind HTTP proxy

commit | commitdiff | tree

Tjerk Meesters [Sat, 12 Jul 2014 07:11:18 +0000 (15:11 +0800)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Tjerk Meesters [Sat, 12 Jul 2014 07:11:05 +0000 (15:11 +0800)]

Updated NEWS for #67594

commit | commitdiff | tree

Tjerk Meesters [Sat, 12 Jul 2014 07:09:47 +0000 (15:09 +0800)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Tjerk Meesters [Sat, 12 Jul 2014 07:09:32 +0000 (15:09 +0800)]

Updated NEWS for #67594

commit | commitdiff | tree

Tjerk Meesters [Sat, 12 Jul 2014 04:45:50 +0000 (12:45 +0800)]

Fix #67594 - invisible colon should be stripped off header name

commit | commitdiff | tree

Tjerk Meesters [Sat, 12 Jul 2014 03:15:03 +0000 (11:15 +0800)]

Merge branch 'PHP-5.6'

commit | commitdiff | tree

Tjerk Meesters [Sat, 12 Jul 2014 03:14:18 +0000 (11:14 +0800)]

Updated NEWS for 34407

commit | commitdiff | tree

Tjerk Meesters [Sat, 12 Jul 2014 03:10:15 +0000 (11:10 +0800)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Tjerk Meesters [Sat, 12 Jul 2014 03:09:35 +0000 (11:09 +0800)]

Updated NEWS for 34407

commit | commitdiff | tree

Tjerk Meesters [Sat, 12 Jul 2014 03:08:50 +0000 (11:08 +0800)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Tjerk Meesters [Sat, 12 Jul 2014 03:07:06 +0000 (11:07 +0800)]

Updated NEWS for 34407

commit | commitdiff | tree

Tjerk Meesters [Wed, 2 Jul 2014 14:22:11 +0000 (22:22 +0800)]

Fix for bug #34407 - ucwords and title case

Added support for ranges like trim() has

commit | commitdiff | tree

George Wang [Fri, 11 Jul 2014 19:02:02 +0000 (15:02 -0400)]

fixed broken merged code

commit | commitdiff | tree

George Wang [Fri, 11 Jul 2014 18:31:59 +0000 (14:31 -0400)]

Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.

commit | commitdiff | tree

George Wang [Fri, 11 Jul 2014 18:57:55 +0000 (14:57 -0400)]

fixed broken merged code

commit | commitdiff | tree

George Wang [Fri, 11 Jul 2014 18:40:54 +0000 (14:40 -0400)]

Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

commit | commitdiff | tree

George Wang [Fri, 11 Jul 2014 18:39:03 +0000 (14:39 -0400)]

Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

commit | commitdiff | tree

George Wang [Fri, 11 Jul 2014 18:31:59 +0000 (14:31 -0400)]

Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.

commit | commitdiff | tree

George Wang [Fri, 11 Jul 2014 18:31:59 +0000 (14:31 -0400)]

Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.

commit | commitdiff | tree

George Wang [Fri, 11 Jul 2014 18:31:59 +0000 (14:31 -0400)]

Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.

commit | commitdiff | tree

Rasmus Lerdorf [Fri, 11 Jul 2014 17:59:02 +0000 (10:59 -0700)]

Test output relies on expose_php being on

commit | commitdiff | tree

Rasmus Lerdorf [Fri, 11 Jul 2014 17:29:40 +0000 (10:29 -0700)]

1.2 is a problematic float to print out
Lower the default display precision for this test

commit | commitdiff | tree

Rasmus Lerdorf [Fri, 11 Jul 2014 16:12:32 +0000 (09:12 -0700)]

The test output is dependent on expose_php ini

commit | commitdiff | tree

Anatol Belski [Fri, 11 Jul 2014 13:07:39 +0000 (15:07 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
fix makefile in phpize mode

commit | commitdiff | tree

Anatol Belski [Fri, 11 Jul 2014 13:07:22 +0000 (15:07 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix makefile in phpize mode

commit | commitdiff | tree

Anatol Belski [Fri, 11 Jul 2014 13:06:56 +0000 (15:06 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix makefile in phpize mode

commit | commitdiff | tree

Anatol Belski [Fri, 11 Jul 2014 13:05:01 +0000 (15:05 +0200)]

fix makefile in phpize mode

- extend LDFLAGS with dynamically generated ones
- prevend dynamically generated CFLAGS to be overridden by hardcoded ones

commit | commitdiff | tree

Anatol Belski [Fri, 11 Jul 2014 07:38:59 +0000 (09:38 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
fixe output_as_table() when no ext was enabled

commit | commitdiff | tree

Anatol Belski [Fri, 11 Jul 2014 07:38:44 +0000 (09:38 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fixe output_as_table() when no ext was enabled

commit | commitdiff | tree

Anatol Belski [Fri, 11 Jul 2014 07:37:19 +0000 (09:37 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fixe output_as_table() when no ext was enabled

commit | commitdiff | tree

Anatol Belski [Fri, 11 Jul 2014 07:36:44 +0000 (09:36 +0200)]

fixe output_as_table() when no ext was enabled

commit | commitdiff | tree

Anatol Belski [Thu, 10 Jul 2014 20:35:41 +0000 (22:35 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
fix end of stream exception when generating makefile

commit | commitdiff | tree

Anatol Belski [Thu, 10 Jul 2014 20:35:23 +0000 (22:35 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix end of stream exception when generating makefile

commit | commitdiff | tree

Anatol Belski [Thu, 10 Jul 2014 20:34:55 +0000 (22:34 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix end of stream exception when generating makefile

commit | commitdiff | tree

Anatol Belski [Thu, 10 Jul 2014 20:33:55 +0000 (22:33 +0200)]

fix end of stream exception when generating makefile

commit | commitdiff | tree

Anatol Belski [Thu, 10 Jul 2014 20:17:46 +0000 (22:17 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  cleanup file headers.
  Do not kill children process in pre-fork mode when parent process quit.
  update to LSAPI 6.6

commit | commitdiff | tree

Anatol Belski [Thu, 10 Jul 2014 20:15:52 +0000 (22:15 +0200)]

Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

Conflicts:
sapi/litespeed/lsapilib.h

commit | commitdiff | tree

Anatol Belski [Thu, 10 Jul 2014 20:05:15 +0000 (22:05 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  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
  update year & copyright

Conflicts:
sapi/litespeed/lsapilib.h

commit | commitdiff | tree

Anatol Belski [Thu, 10 Jul 2014 20:03:45 +0000 (22:03 +0200)]

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

commit | commitdiff | tree

George Wang [Thu, 10 Jul 2014 19:12:43 +0000 (15:12 -0400)]

cleanup file headers.

commit | commitdiff | tree

George Wang [Thu, 10 Jul 2014 18:59:25 +0000 (14:59 -0400)]

Do not kill children process in pre-fork mode when parent process quit.

commit | commitdiff | tree

George Wang [Tue, 26 Nov 2013 23:53:35 +0000 (18:53 -0500)]

update to LSAPI 6.6

Conflicts:
sapi/litespeed/lsapi_main.c

commit | commitdiff | tree

Anatol Belski [Thu, 10 Jul 2014 19:51:32 +0000 (21:51 +0200)]

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

commit | commitdiff | tree

Anatol Belski [Thu, 10 Jul 2014 19:50:37 +0000 (21:50 +0200)]

force ext_dep.js prepend to configure.js in phpize mode

commit | commitdiff | tree

George Wang [Thu, 10 Jul 2014 19:12:43 +0000 (15:12 -0400)]

cleanup file headers.

commit | commitdiff | tree

George Wang [Thu, 10 Jul 2014 18:59:25 +0000 (14:59 -0400)]

Do not kill children process in pre-fork mode when parent process quit.

commit | commitdiff | tree

George Wang [Tue, 26 Nov 2013 23:53:35 +0000 (18:53 -0500)]

update to LSAPI 6.6

Conflicts:
sapi/litespeed/lsapi_main.c

commit | commitdiff | tree

George Wang [Tue, 5 Nov 2013 21:14:49 +0000 (16:14 -0500)]

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

commit | commitdiff | tree

George Wang [Thu, 10 Jul 2014 19:12:43 +0000 (15:12 -0400)]

cleanup file headers.

commit | commitdiff | tree

George Wang [Thu, 10 Jul 2014 18:59:25 +0000 (14:59 -0400)]

Do not kill children process in pre-fork mode when parent process quit.

commit | commitdiff | tree

George Wang [Thu, 10 Jul 2014 19:12:43 +0000 (15:12 -0400)]

cleanup file headers.

commit | commitdiff | tree

George Wang [Thu, 10 Jul 2014 18:59:25 +0000 (14:59 -0400)]

Do not kill children process in pre-fork mode when parent process quit.

commit | commitdiff | tree

George Wang [Tue, 26 Nov 2013 23:53:35 +0000 (18:53 -0500)]

update to LSAPI 6.6

Conflicts:
sapi/litespeed/lsapi_main.c

commit | commitdiff | tree

George Wang [Tue, 5 Nov 2013 21:14:49 +0000 (16:14 -0500)]

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

commit | commitdiff | tree

George Wang [Thu, 10 Jul 2014 18:14:11 +0000 (14:14 -0400)]

update year & copyright

Conflicts:
sapi/litespeed/lsapi_main.c

commit | commitdiff | tree

George Wang [Thu, 10 Jul 2014 18:14:38 +0000 (14:14 -0400)]

Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

commit | commitdiff | tree

George Wang [Thu, 10 Jul 2014 18:14:11 +0000 (14:14 -0400)]

update year & copyright

commit | commitdiff | tree

Anatol Belski [Thu, 10 Jul 2014 17:37:36 +0000 (19:37 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  turn off PGO in phpize mode
  Fixed typo in Makefile.frag
  Fixed typo in Makefile.frag