WASHINGTON — Congressional negotiators resolved policy disputes to reach a deal for a $1.1 trillion spending bill on Tuesday but still expected to need a stopgap extension to avoid a U.S. government shutdown at midnight on Thursday.

House of Representatives Republicans were preparing to pass a short-term funding extension of one to two days to allow the Senate more time to clear procedural hurdles that could drag final passage past the deadline.

The snags added some drama to a spending bill that appeared to be cruising toward passage, despite demands from conservative Republicans to withhold spending from President Barack Obama’s immigration order, which would allow millions of undocumented immigrants to stay and work in the U.S.

Final hurdles on the massive bill were cleared when some controversial financial services provisions were removed to be dealt with separately.

The measure aims to fund all government agencies through September 2015, except for the Department of Homeland Security, which would be extended only through late February, providing Republicans leverage over the agency implementing Obama’s immigration order.

A bipartisan provision aimed at shoring up distressed multi-employer pension plans and the government fund that guarantees them was taken out of the bill and proposed as an amendment that would get a separate vote. It would raise insurance premiums for these plans and allow them to reduce benefits for non-disabled beneficiaries under age 75, among other changes.

Full details of the bill were expected to be published on Tuesday evening.

Senate Democratic leader Harry Reid said he believed it would be difficult for lawmakers to keep out proposed language restricting the District of Columbia’s new marijuana legalization law.

The “omnibus” funding bill will keep domestic spending largely flat with last year and provide $112 million emergency funds to fight the Ebola outbreak in West Africa. Current government spending authority expires at 12:01 a.m. on Friday.

A summary of the bill said the base appropriation for the Pentagon would be $490.2 billion, with $64 billion in additional war funding.

The bill does provide $554.2 billion in funding for the U.S. military in fiscal year 2015, including $1.46 billion for 15 EA-18G electronic attack jets built by Boeing Co .

Boeing lobbied hard for funding to extend its St. Louis production line for EA-18G Growlers, which had been due to end at the end of 2016. The added funding, which was included in both the House and Senate appropriations bills, will keep the line running through 2017, company officials have said.

The measure also includes $224 million for two additional Lockheed Martin Corp F-35 fighter jets for the U.S. Air Force and $255 million for two additional F-35s for the U.S. Navy, the summary said. The measure funds a total of 38 F-35 fighters, nine more than in fiscal 2014

A six-year extension for a federal terrorism insurance backstop that was created after the Sept. 11, 2001, attacks was also excluded from the funding bill and is being dealt with separately.

Democrats had been battling over the past two days to try to exclude a Republican-authored provision to prevent new restrictions on derivatives trading by large banks from taking effect. The language would give banks a reprieve from rules that would require them to move derivatives trading away from units that benefit from federal deposit insurance and Federal Reserve loans.