Commit graph

556 commits

Author SHA1 Message Date
Anatol Belski
02b661ecfc fix end of stream exception when generating makefile 2014-07-10 22:33:55 +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
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
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
Anatol Belski
655f2973eb Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix disabling PGO for extensions, rel bug #65715
2014-03-25 06:46:06 +01:00
Anatol Belski
7477f5b387 fix disabling PGO for extensions, rel bug #65715 2014-03-25 06:44:54 +01:00
Anatol Belski
59dcf9879b Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  more fixes related to bug #65715
2014-03-24 19:19:06 +01:00
Anatol Belski
6612e1ba6a more fixes related to bug #65715 2014-03-24 19:15:02 +01:00
Anatol Belski
13e8486550 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  updated NEWS
  updated NEWS
  Fixed bug #65715 php5embed.lib isn't provided anymore
2014-03-24 10:30:05 +01:00
Anatol Belski
17a57ad980 Fixed bug #65715 php5embed.lib isn't provided anymore 2014-03-24 10:24:37 +01:00
Anatol Belski
9d4adf4fe1 turn off some false positives 2014-03-02 12:49:30 +01:00
Anatol Belski
cf90bd92bf support for static analyzers other than visual studio 2014-03-01 20:15:10 +01:00
Anatol Belski
0bbacd8678 fix wording 2014-03-01 13:28:02 +01:00
Anatol Belski
7c60a09cae reveal more info on the configure options 2014-03-01 13:11:35 +01:00
Anatol Belski
379f4c0ceb support for Visual C+ 2013 2014-01-20 10:04:20 +01:00
Pierre Joye
9b54901ffb add vc12 (2013) 2013-11-04 22:19:02 +01:00
unknown
cea7f09043 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  -enable VC11 (vc2012)
2012-09-08 18:47:32 +02:00
unknown
dabe89c6f3 -enable VC11 (vc2012) 2012-09-08 18:46:33 +02:00
Johannes Schlüter
6ecac26972 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Rename README.SVN-RULES to README.GIT-RULES, here, too
2012-04-14 00:31:00 +02:00
Johannes Schlüter
21d314a767 Rename README.SVN-RULES to README.GIT-RULES, here, too 2012-04-14 00:29:55 +02:00
Pierre Joye
92120997c9 - add new build type, optional. has been used for the last 2 RCs 2012-01-11 15:46:45 +00:00
Pierre Joye
92894b3a81 - debug code-- 2011-01-09 15:19:03 +00:00
Pierre Joye
7c6310852e - let try to fix pecl header install so we can do the same than unix, install them in ext/<extname> instead of pecl<extname> 2011-01-09 14:01:21 +00:00
Pierre Joye
fb6778c241 - let try to fix pecl header install so we can do the same than unix, install them in ext/<extname> instead of pecl<extname> 2011-01-09 14:01:21 +00:00
Pierre Joye
55077a81f5 - define the php*.lib/dll names 2011-01-07 15:51:36 +00:00
Pierre Joye
cc6bb66dcd - define the php*.lib/dll names 2011-01-07 15:51:36 +00:00
Pierre Joye
84b854a603 - revert rev. 307044 2011-01-05 00:59:31 +00:00
Pierre Joye
09d73b67e2 - revert rev. 307044 2011-01-05 00:59:31 +00:00
Kalle Sommer Nielsen
ec040e9657 Fixed linking of extensions that would use a static .lib file (libname_a.lib rather than libname.lib)
# This fixes `configure --with-mcrypt=shared' to properly find and 
# link against libmcrypt.lib rather than libmcrypt_a.lib
2011-01-03 23:08:47 +00:00
Kalle Sommer Nielsen
79b997d7ba Fixed linking of extensions that would use a static .lib file (libname_a.lib rather than libname.lib)
# This fixes `configure --with-mcrypt=shared' to properly find and 
# link against libmcrypt.lib rather than libmcrypt_a.lib
2011-01-03 23:08:47 +00:00
Pierre Joye
bfb9b6d06e - use the ext deps list for phpize's ADD_EXTENSION_DEP function 2011-01-02 18:29:56 +00:00
Pierre Joye
17d05d0d57 - use the ext deps list for phpize's ADD_EXTENSION_DEP function 2011-01-02 18:29:56 +00:00
Pierre Joye
ec3003ade1 - typo, and remove undesired committed part 2011-01-02 18:14:50 +00:00
Pierre Joye
5bd1fd410f - typo 2011-01-02 18:13:20 +00:00
Pierre Joye
163780af56 - generate a list of ext and how they are built, should be updated by phpize'd make (un)install as well, later 2011-01-02 18:03:00 +00:00
Pierre Joye
f62ca3e4bf - generate a list of ext and how they are built, should be updated by phpize'd make (un)install as well, later 2011-01-02 18:03:00 +00:00
Pierre Joye
b25ded66ea - sync with 5.3 2010-12-14 23:21:53 +00:00
Pierre Joye
f7b5a73383 - fix build with out of src obj dir 2010-12-14 23:09:31 +00:00
Pierre Joye
e2ea0f5d98 - we just reached the tiny cmd lenght limit, let reduce the size of dirs 2010-12-14 18:49:15 +00:00
Pierre Joye
e79ed6359d - add nmake install-sdk (create the devel package) and related sub rules 2010-12-14 02:55:26 +00:00
Pierre Joye
d14417f8ea - add nmake install-sdk (create the devel package) and related sub rules 2010-12-14 02:55:26 +00:00
Pierre Joye
12a3e339f4 - MFH trailing slashes detection 2010-12-13 20:57:06 +00:00
Pierre Joye
31f97e2440 - no need to diplay that 2010-12-13 20:56:44 +00:00
Pierre Joye
4df03c1ded - phpize support merge from 5.3 2010-12-13 20:55:13 +00:00
Kalle Sommer Nielsen
15ee70e8e0 * Don't print the shared headers table after enabling each extension (cleaner configure output)
* Fix double slashes for directory targets in PHP_INSTALL_HEADERS()
2010-12-13 20:46:57 +00:00
Pierre Joye
aea6771d19 - add phpize support for windows, need a nmake install for now (nmake devel-pkg version is coming), works exactly the same as on unix, or should :) 2010-12-13 18:43:10 +00:00
Pierre Joye
a7ffa09e18 - add PHP_INSTALL_HEADERS to all parts (core&exts) exposing headers, generate the install-headers cmd 2010-12-11 22:18:10 +00:00